summaryrefslogtreecommitdiff
path: root/navit/maptool
diff options
context:
space:
mode:
authorStefan Wildemann <metalstrolch@users.noreply.github.com>2020-04-30 12:23:18 +0200
committerGitHub <noreply@github.com>2020-04-30 12:23:18 +0200
commitc556f7962672d894fa9170b055fcd9ea2e0ce741 (patch)
tree62a9fa69b383cfcc2b3a745cd153e5e5506b62b6 /navit/maptool
parent54fd092de942f12133b67bc0118ba6de879d39d7 (diff)
downloadnavit-c556f7962672d894fa9170b055fcd9ea2e0ce741.tar.gz
Add:Core:Add mapfeatures (#990)
* map:osm add caves, cliffs and dams * Add rail_narrow_gauge to car layout * Add:map: use descriprion if no name tag
Diffstat (limited to 'navit/maptool')
-rw-r--r--navit/maptool/osm.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index ddf4e99a1..ef6e90a71 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -543,7 +543,7 @@ static char *attrmap= {
"? shop=photo poi_shop_photo\n"
"? shop=shoes poi_shop_shoes\n"
"? shop=supermarket poi_shopping\n"
- "? shop=mall poi_mall\n"
+ "? shop=mall poi_mall\n"
"? sport=10pin poi_bowling\n"
"? sport=baseball poi_baseball\n"
"? sport=basketball poi_basketball\n"
@@ -568,6 +568,7 @@ static char *attrmap= {
"? tourism=theme_park poi_resort\n"
"? tourism=viewpoint poi_viewpoint\n"
"? tourism=zoo poi_zoo\n"
+ "n natural=cave_entrance poi_cave\n"
"n traffic_sign=city_limit traffic_sign_city_limit\n"
"n highway=speed_camera tec_common\n"
"w *=* street_unkn\n"
@@ -743,6 +744,7 @@ static char *attrmap= {
"w natural=water poly_water\n"
"w natural=wetland poly_mud\n"
"w natural=wood poly_wood\n"
+ "w natural=cliff cliff\n"
"w piste:type=downhill,piste:difficulty=advanced piste_downhill_advanced\n"
"w piste:type=downhill,piste:difficulty=easy piste_downhill_easy\n"
"w piste:type=downhill,piste:difficulty=expert piste_downhill_expert\n"
@@ -784,6 +786,7 @@ static char *attrmap= {
"w waterway=river water_river\n"
"w waterway=riverbank poly_water\n"
"w waterway=stream water_stream\n"
+ "w waterway=dam poly_dam\n"
"w barrier=ditch ditch\n"
"w barrier=hedge hedge\n"
"w barrier=fence fence\n"
@@ -1161,6 +1164,10 @@ void osm_add_tag(char *k, char *v) {
if (! g_strcmp0(k,"name")) {
attr_strings_save(attr_string_label, v);
level=5;
+ } else if (! g_strcmp0(k,"description")) {
+ /* try description if no name is there */
+ attr_strings_save(attr_string_label, v);
+ level=5;
}
if (! g_strcmp0(k,"addr:email")) {
attr_strings_save(attr_string_email, v);