added 6 hiking trail types according to osm sac_scales. Due to

current build problems, please be polite if I have broken
anything :) .

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@1260 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/item_def.h b/navit/item_def.h
index 215e463..704abb2 100644 (file)
--- a/navit/item_def.h
+++ b/navit/item_def.h
@@ -345,6 +345,12 @@ ITEM(water_canal)
 ITEM(water_stream)
 ITEM(water_drain)
 ITEM(path)
+ITEM(hiking)
+ITEM(hiking_mountain)
+ITEM(hiking_mountain_demanding)
+ITEM(hiking_alpine)
+ITEM(hiking_alpine_demanding)
+ITEM(hiking_alpine_difficult)
 /* Area */
 ITEM2(0xc0000000,area)
 ITEM2(0xc0000001,area_unspecified)

diff --git a/navit/osm2navit.c b/navit/osm2navit.c
index b358891..bc27bec 100644 (file)
--- a/navit/osm2navit.c
+++ b/navit/osm2navit.c
@@ -154,7 +154,7 @@ static char *attrmap={
        "w      highway=path,bicycle=designated cycleway\n"
        "w      highway=footway         footway\n"
        "w      piste:type=nordic       piste_nordic\n"
-       "w      route=ski               piste_nordic\n"
+       "w      route=ski       piste_nordic\n"
        "w      piste:type=downhill,piste:difficulty=novice     piste_downhill_novice\n"
        "w      piste:type=downhill,piste:difficulty=easy       piste_downhill_easy\n"
        "w      piste:type=downhill,piste:difficulty=intermediate       piste_downhill_intermediate\n"
@@ -162,8 +162,14 @@ static char *attrmap={
        "w      piste:type=downhill,piste:difficulty=expert     piste_downhill_expert\n"
        "w      piste:type=downhill,piste:difficulty=freeride   piste_downhill_freeride\n"
        "w      highway=path,foot=designated    footway\n"
-       "w      highway=steps           steps\n"
-       "w      highway=path            path\n"
+       "w      highway=steps   steps\n"
+       "w      highway=path    path\n"
+       "w      highway=path,sac_scale=hiking   hiking\n"
+       "w      highway=path,sac_scale=mountain_hiking  hiking_mountain\n"
+       "w      highway=path,sac_scale=demanding_mountain_hiking        hiking_mountain_demanding\n"
+       "w      highway=path,sac_scale=alpine_hiking    hiking_alpine\n"
+       "w      highway=path,sac_scale=demanding_alpine_hiking  hiking_alpine_demanding\n"
+       "w      highway=path,sac_scale=difficult_alpine_hiking  hiking_alpine_difficult\n"
        "w      highway=unsurfaced      track_gravelled\n"
        "w      highway=track           track_gravelled\n"
        "w      highway=track,tracktype=grade1          track_paved\n"