Add school/college and generic amenity

diff --git a/src/osm.h b/src/osm.h
index 747ee15a42028baf003fab4d97a65157ffc62f37..9fd8dd7d9d5451b3bd86571c1ca5eb740c148b3d 100644 (file)
--- a/src/osm.h
+++ b/src/osm.h
@@ -1,6 +1,5 @@
-/* #define VERBOSE */
-#define FILE_BUFFER 8192
-#define OSM_DB_FILE "osm-planet.db"
+#ifndef _OSM_H
+#define _OSM_H
 
 /* Flags */
 #define W_ONEWAY       (1 << 1)
@@ -18,6 +17,7 @@ typedef enum {
        NODE_PLAIN=0,
        /* Amenities */
        NODE_POI_START=1,
+
        NODE_AMENITY_PARKING=100,
        NODE_AMENITY_FUEL=101,
        NODE_AMENITY_HOSPITAL=120,
@@ -41,12 +41,17 @@ typedef enum {
        NODE_AMENITY_THEATRE=304,
        NODE_AMENITY_SHOP=305,
        NODE_AMENITY_POW=310,
+       NODE_AMENITY_COLLEGE=320,
+       NODE_AMENITY_SCHOOL=321,
+       NODE_AMENITY_GENERIC=900,
        /* */
        NODE_POI_END=999,
        /* Places */
        NODE_PLACE_START=1000,
        NODE_PLACE_SUBURB=1001,
+       NODE_PLACE_HAMLET=1049,
        NODE_PLACE_VILLAGE=1050,
+       NODE_PLACE_TOWN=1099,
        NODE_PLACE_CITY=1100,
        NODE_PLACE_END=1500,
 
@@ -56,6 +61,8 @@ typedef enum {
        NODE_TYPE_MAX=9000
 } node_type_t;
 
+
+
 typedef enum {
        WAY_UNWAYED=0,
        WAY_MOTORWAY,
@@ -78,3 +85,5 @@ typedef enum {
        WAY_WATER_CANAL,
        WAY_OTHER
 } way_type_t;
+
+#endif