added landuse=vineyard as poly_farm (same as landuse=farm) and

the newly introduced
highway=road as street_1_city (same as unclassified)

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

diff --git a/navit/navit/osm2navit.c b/navit/navit/osm2navit.c
index ace6735..a9f098e 100644 (file)
--- a/navit/navit/osm2navit.c
+++ b/navit/navit/osm2navit.c
@@ -154,6 +154,7 @@ static char *attrmap={
        "w      highway=residential     street_1_city\n"
        "w      highway=living_street           living_street\n"
        "w      highway=unclassified    street_1_city\n"
+       "w      highway=road    street_1_city\n"
        "w      highway=minor           street_1_land\n"
        "w      highway=tertiary        street_2_city\n"
        "w      highway=secondary       street_3_city\n"
@@ -204,6 +205,7 @@ static char *attrmap={
        "w      landuse=basin   poly_basin\n"
        "w      landuse=reservoir       poly_reservoir\n"
        "w      landuse=farm    poly_farm\n"
+       "w      landuse=vineyard        poly_farm\n"
        "w      leisure=park            poly_park\n"
        "w      landuse=village_green           poly_village_green\n"
        "w      landuse=recreation_ground               poly_recreation_ground\n"