Parse more OSM POIs

diff --git a/src/osm.c b/src/osm.c
index caa464ef457b2ff51a9e736659ef4589df5aec52..207dec06ff3dcf958a0f62279644b4194f336aa5 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -141,6 +141,23 @@ struct _nodeinfo {
        { "amenity", "college",         NODE_AMENITY_COLLEGE },
        { "amenity", "university",      NODE_AMENITY_COLLEGE },
 
+       { "sport"  , "swimming",        NODE_SPORT_SWIMMING },
+       { "sport"  , "golf",            NODE_SPORT_GOLF },
+       { "sport"  , "tennis",          NODE_SPORT_TENNIS },
+       { "sport"  , "football",        NODE_SPORT_FOOTBALL },
+       { "sport"  , "baskteball",      NODE_SPORT_BASKETBALL },
+       { "sport"  , "soccer",          NODE_SPORT_SOCCER },
+       { "sport"  , "rugby",           NODE_SPORT_RUGBY },
+       { "sport"  , "bowling",         NODE_SPORT_BOWLING },
+       { "sport"  , "10pin",           NODE_SPORT_BOWLING },
+       { "sport"  , "motor",           NODE_SPORT_MOTOR },
+       { "sport"  , "shooting_range",NODE_SPORT_SHOOTING },
+       { "sport"  , "paintball",       NODE_SPORT_PAINTBALL },
+       { "sport"  , "horse_racing",NODE_SPORT_HORSES },
+       { "sport"  , "horse",           NODE_SPORT_HORSES },
+       { "sport"  , "horses",          NODE_SPORT_HORSES },
+       { "leisure", "sport_centre",NODE_SPORT_CENTER },
+
        { "tourism", "information",     NODE_AMENITY_TOURISM_INFO },
        { "tourism", "camp_site",       NODE_AMENITY_CAMP_SITE },
        { "tourism", "caravan_site",NODE_AMENITY_CARAVAN_SITE },

diff --git a/src/osm.h b/src/osm.h
index a62d7c706f45c8783c926278587546f5476990d1..ef23a0825619fd621069f57f01a03afd5a86cd42 100644 (file)
--- a/src/osm.h
+++ b/src/osm.h
@@ -46,26 +46,34 @@ typedef enum {
        NODE_AMENITY_PARKING=100,
        NODE_AMENITY_FUEL=101,
        NODE_AMENITY_SPEEDCAM=102,
+
        NODE_AMENITY_HOSPITAL=120,
        NODE_AMENITY_PHARMACY=121,
        NODE_AMENITY_POLICE=130,
+
        NODE_AMENITY_HOTEL=200,
        NODE_AMENITY_HOSTEL=201,
        NODE_AMENITY_MOTEL=202,
+
        NODE_AMENITY_ATM=205,
        NODE_AMENITY_BANK=206,
+
        NODE_AMENITY_POST=210,
        NODE_AMENITY_POST_BOX=211,
+
        NODE_AMENITY_TOURISM_INFO=219,
+
        NODE_AMENITY_TAXI=220,
        NODE_AMENITY_RAILWAY_STATION=230,
        NODE_AMENITY_RAILWAY_HALT=231,
        NODE_AMENITY_BUS_STATION=236,
        NODE_AMENITY_BOAT=240,
        NODE_AMENITY_AIRPORT=250,
+
        NODE_AMENITY_CAMP_SITE=280,
        NODE_AMENITY_CARAVAN_SITE=281,
        NODE_AMENITY_PICNIC_SITE=282,
+
        NODE_AMENITY_FOOD=301,
        NODE_AMENITY_PUB=302,
        NODE_AMENITY_CINEMA=303,
@@ -79,6 +87,29 @@ typedef enum {
        NODE_AMENITY_COLLEGE=320,
        NODE_AMENITY_SCHOOL=321,
        NODE_AMENITY_ATTRACTION=330,
+
+       /* Sport */
+       NODE_SPORT_CENTER=400,
+       NODE_SPORT_STADIUM=401,
+       NODE_SPORT_SKIING=402,
+       NODE_SPORT_SWIMMING=403,
+       NODE_SPORT_FOOTBALL=404,
+       NODE_SPORT_SOCCER=405,
+       NODE_SPORT_GOLF=406,
+       NODE_SPORT_TENNIS=407,
+       NODE_SPORT_BOWLING=408,
+       NODE_SPORT_RUGBY=409,   
+       NODE_SPORT_CLIMBING=410,
+       NODE_SPORT_MOTOR=411,
+       NODE_SPORT_HOCKEY=412,
+       NODE_SPORT_HORSES=413,
+       NODE_SPORT_BASKETBALL=414,
+       NODE_SPORT_CANOE=415,
+       NODE_SPORT_CROQUET=420,
+       NODE_SPORT_CRICKET=421,
+       NODE_SPORT_SHOOTING=430,
+       NODE_SPORT_PAINTBALL=431,
+
        NODE_AMENITY_GENERIC=900,
        /* */
        NODE_POI_END=999,