Added zaxl patches for libgarmin

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

diff --git a/navit/configure.in b/navit/configure.in
index c2fbab2..b940b62 100644 (file)
--- a/navit/configure.in
+++ b/navit/configure.in
@@ -142,6 +142,12 @@ AC_SUBST(GPSD_CFLAGS)
 AC_SUBST(GPSD_LIBS)
 AM_CONDITIONAL(VEHICLE_GPSD, [test "x$gpsd" = "xyes"])
 
+# check for libgarmin
+PKG_CHECK_MODULES(LIBGARMIN, libgarmin, use_libgarmin=yes, use_libgarmin=no)
+AC_SUBST(LIBGARMIN_CFLAGS)
+AC_SUBST(LIBGARMIN_LIBS)
+AM_CONDITIONAL(HAVELIBGARMIN, [test "x$use_libgarmin" = "xyes"])
+
 AC_ARG_ENABLE(binding-python, [  --disable-binding-python             don't create binding python ], MODULE_BINDING_PYTHON=$enableval, MODULE_BINDING_PYTHON=yes)
 if test "$cross_compiling" = no; then
        if test "x$MODULE_BINDING_PYTHON" = "xyes"; then
@@ -245,7 +251,7 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/binding/Makefile
@@ -279,6 +285,15 @@ src/xpm/Makefile
 intl/Makefile
 po/Makefile
 ])
+
+if test -d src/data/garmin; then
+      if test "x$use_libgarmin" = "xyes"; then
+              AC_CONFIG_FILES([src/data/garmin/Makefile])
+      fi
+fi
+AC_OUTPUT
+
+
 echo ""
 echo ""
 echo "Summary of your installation :"
@@ -306,6 +321,12 @@ if test x"$speechd" = xyes
        else
        echo "SPEECHD     : DISABLED"
 fi
+if test "x$use_libgarmin" = "xyes"
+       then
+       echo "Garmin IMG  : ENABLED"
+       else
+       echo "Garmin IMG  : DISABLED (you don't have libgarmin)"
+fi
 if  [ test x"$gtk2_pkgconfig" != xyes ] && [ test x"$sdl" != xyes ]
        then
        echo ""

diff --git a/navit/src/data/Makefile.am b/navit/src/data/Makefile.am
index 6649e06..c88594b 100644 (file)
--- a/navit/src/data/Makefile.am
+++ b/navit/src/data/Makefile.am
@@ -1 +1,5 @@
 SUBDIRS=mg textfile garmin_img poi_geodownload binfile
+if HAVELIBGARMIN
+SUBDIRS+=garmin
+endif
+

diff --git a/navit/src/item_def.h b/navit/src/item_def.h
index 5643610..8d4f30a 100644 (file)
--- a/navit/src/item_def.h
+++ b/navit/src/item_def.h
@@ -94,6 +94,106 @@ ITEM(poi_burgerking)
 ITEM(poi_kfc)
 ITEM(poi_mcdonalds)
 ITEM(poi_wienerwald)
+ITEM(poi_dining)
+ITEM(poi_fastfood)
+ITEM(poi_police)
+ITEM(poi_auto_club)
+ITEM(poi_autoservice)
+ITEM(poi_bank)
+ITEM(poi_bay)
+ITEM(poi_bend)
+ITEM(poi_boat_ramp)
+ITEM(poi_border_station)
+ITEM(poi_bowling)
+ITEM(poi_bus_station)
+ITEM(poi_bus_stop)
+ITEM(poi_bussines_service)
+ITEM(poi_car_rent)
+ITEM(poi_car_wash)
+ITEM(poi_casino)
+ITEM(poi_cemetery)
+ITEM(poi_church)
+ITEM(poi_cinema)
+ITEM(poi_civil)
+ITEM(poi_communication)
+ITEM(poi_concert)
+ITEM(poi_cove)
+ITEM(poi_crossing)
+ITEM(poi_dam)
+ITEM(poi_danger_area)
+ITEM(poi_dangerous)
+ITEM(poi_daymark)
+ITEM(poi_diving)
+ITEM(poi_drinking_water)
+ITEM(poi_emergency)
+ITEM(poi_fair)
+ITEM(poi_firebrigade)
+ITEM(poi_fish)
+ITEM(poi_forbiden_area)
+ITEM(poi_garmin)
+ITEM(poi_golf)
+ITEM(poi_goverment_building)
+ITEM(poi_height)
+ITEM(poi_heliport)
+ITEM(poi_hotspring)
+ITEM(poi_icesport)
+ITEM(poi_information)
+ITEM(poi_justice)
+ITEM(poi_landmark)
+ITEM(poi_levee)
+ITEM(poi_library)
+ITEM(poi_locale)
+ITEM(poi_loudspeaker)
+ITEM(poi_mall)
+ITEM(poi_manmade_feature)
+ITEM(poi_marine)
+ITEM(poi_marine_type)
+ITEM(poi_mark)
+ITEM(poi_military)
+ITEM(poi_mine)
+ITEM(poi_nondangerous)
+ITEM(poi_oil_field)
+ITEM(poi_personal_service)
+ITEM(poi_pharmacy)
+ITEM(poi_post)
+ITEM(poi_public_office)
+ITEM(poi_repair_service)
+ITEM(poi_resort)
+ITEM(poi_rest_room)
+ITEM(poi_restaurant)
+ITEM(poi_restricted_area)
+ITEM(poi_restroom)
+ITEM(poi_sailing)
+ITEM(poi_scenic_area)
+ITEM(poi_school)
+ITEM(poi_service)
+ITEM(poi_shop_apparel)
+ITEM(poi_shop_computer)
+ITEM(poi_shop_department)
+ITEM(poi_shop_furnish)
+ITEM(poi_shop_grocery)
+ITEM(poi_shop_handg)
+ITEM(poi_shop_merchandise)
+ITEM(poi_shop_retail)
+ITEM(poi_shower)
+ITEM(poi_skiing)
+ITEM(poi_social_service)
+ITEM(poi_sounding)
+ITEM(poi_sport)
+ITEM(poi_stadium)
+ITEM(poi_subdivision)
+ITEM(poi_swimming)
+ITEM(poi_telephone)
+ITEM(poi_theater)
+ITEM(poi_tide)
+ITEM(poi_tower)
+ITEM(poi_trail)
+ITEM(poi_truck_stop)
+ITEM(poi_tunnel)
+ITEM(poi_wine)
+ITEM(poi_worship)
+ITEM(poi_wrecker)
+ITEM(poi_zoo)
 ITEM2(0x80000000,line)
 ITEM2(0x80000001,line_unspecified)
 /* Line */
@@ -122,6 +222,17 @@ ITEM(street_route)
 ITEM(height_line_1)
 ITEM(height_line_2)
 ITEM(track)
+ITEM(height_line_3)
+ITEM(depth_line_1)
+ITEM(depth_line_2)
+ITEM(depth_line_3)
+ITEM(powerline)
+ITEM(pipeline)
+ITEM(time_zone)
+ITEM(marine_boundary)
+ITEM(marine_hazard)
+ITEM(roundabout)
+
 /* Area */
 ITEM2(0xc0000000,area)
 ITEM2(0xc0000001,area_unspecified)
@@ -143,3 +254,9 @@ ITEM(golf_course)
 ITEM(university)
 ITEM(national_park)
 ITEM(nature_park)
+ITEM(flats)
+ITEM(scrub)
+ITEM(military_zone)
+ITEM(marine_poly)
+ITEM(plantation)
+ITEM(tundra)