NODE_TOURISM_CARAVAN_SITE=281,
NODE_TOURISM_PICNIC_SITE=282,
+ NODE_AMENITY_RESTAURANT=300,
NODE_AMENITY_FOOD=301,
NODE_AMENITY_PUB=302,
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,
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,
NODE_POI_END=999,
/* Places */
NODE_PLACE_START=1000,
- NODE_PLACE_SUBURB=1001,
+ NODE_PLACE_SUBURB=1001, /* http://wiki.openstreetmap.org/index.php/Proposed_features/Suburb */
+ NODE_PLACE_LOCALITY=1002, /* http://wiki.openstreetmap.org/index.php/Proposed_features/Locality */
NODE_PLACE_HAMLET=1049,
NODE_PLACE_VILLAGE=1050,
NODE_PLACE_ISLAND=1051,
guint32 id;
node_type_t type;
gchar *name;
- gint lat;
- gint lon;
+ gint32 lat;
+ gint32 lon;
gdouble dist;
- guint32 isin;
+ guint32 isin_p;
+ guint32 isin_c;
};
/* Way node */
typedef struct _osm_way_node osm_way_node;
struct _osm_way_node {
- guint id;
- guint flags;
- gint lat;
- gint lon;
+ guint32 id;
+ guint32 flags;
+ gint32 lat;
+ gint32 lon;
};
/* Way */
typedef struct _osm_way osm_way;
struct _osm_way {
guint32 id;
- guint type;
- guint flags;
- guint nodecnt;
- guint32 isin;
- guint node_num;
- guint f;
- guint t;
+ guint32 isin_c;
+ guint32 isin_p;
+ gint16 type;
+ guint32 flags;
+ guint16 nodecnt;
+ guint32 f;
+ guint32 t;
+ gint8 speed;
gdouble dist;
gdouble distance;
gchar *name;
gchar *int_ref;
osm_way_node *node_f;
osm_way_node *node_t;
- gshort direction;
+ gint8 direction;
GList *nodes;
};
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;
};