GpsBluez: cleanups

[mapper] / src / osm.h

diff --git a/src/osm.h b/src/osm.h
index c416ad9bc4aa7cace7eb064c445fa4ce0ac36720..bce160ea7a1388263abc8ef88ed173b739a9acee 100644 (file)
--- a/src/osm.h
+++ b/src/osm.h
@@ -74,6 +74,7 @@ typedef enum {
        NODE_TOURISM_CARAVAN_SITE=281,
        NODE_TOURISM_PICNIC_SITE=282,
 
+       NODE_AMENITY_RESTAURANT=300,
        NODE_AMENITY_FOOD=301,
        NODE_AMENITY_PUB=302,
 
@@ -86,6 +87,8 @@ typedef enum {
        NODE_TOURISM_THEME_PARK=309,
        NODE_AMENITY_POW=310,
        NODE_AMENITY_LIBRARY=311,
+       NODE_AMENITY_NIGHTCLUB=312,
+       NODE_AMENITY_SHOP_ADULT=313,
        NODE_AMENITY_COLLEGE=320,
        NODE_AMENITY_SCHOOL=321,
        NODE_AMENITY_TOWNHALL=325,
@@ -94,6 +97,12 @@ typedef enum {
        NODE_HISTORIC_MUSEUM=340,
        NODE_HISTORIC_CASTLE=341,
 
+       NODE_AMENITY_SHOP_SUPERMARKET=350,
+       NODE_AMENITY_SHOPPING_CENTER=351,
+       NODE_AMENITY_SHOP_ALCOHOL=352,
+       NODE_AMENITY_SHOP_FLOWERS=353,
+       NODE_AMENITY_SHOP_BAKERY=354,
+
        /* Sport */
        NODE_SPORT_CENTER=400,
        NODE_SPORT_STADIUM=401,
@@ -195,8 +204,8 @@ struct _osm_place {
        guint32 id;
        node_type_t type;
        gchar *name;
-       gint lat;
-       gint lon;
+       gint32 lat;
+       gint32 lon;
        gdouble dist;
        guint32 isin_p;
        guint32 isin_c;
@@ -207,8 +216,8 @@ typedef struct _osm_way_node osm_way_node;
 struct _osm_way_node {
        guint32 id;
        guint32 flags;
-       gint lat;
-       gint lon;
+       gint32 lat;
+       gint32 lon;
 };
 
 /* Way */
@@ -250,10 +259,12 @@ struct _osm_location {
        osm_place *secondary;
        gboolean changed;
        gboolean valid;
-       gint lat;
-       gint lon;
+       gint32 lat;
+       gint32 lon;
        gfloat heading;
        gfloat speed;
+
+       time_t last_valid;
        gint nfcnt;
 };