From: Kaj-Michael Lang <milang@angel.tal.org>
Date: Tue, 23 Oct 2007 17:50:18 +0000 (+0300)
Subject: More sport POIs
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4163defcd6387e1b19877b31b997cea250f236f0;p=mapper

More sport POIs
---

diff --git a/src/osm.c b/src/osm.c
index 207dec0..49a54a0 100644
--- a/src/osm.c
+++ b/src/osm.c
@@ -145,9 +145,12 @@ struct _nodeinfo {
 	{ "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"  , "baskteball",	NODE_SPORT_BASKETBALL },
 	{ "sport"  , "rugby",		NODE_SPORT_RUGBY },
+	{ "sport"  , "skating",		NODE_SPORT_SKATING },
+	{ "sport"  , "hockey",		NODE_SPORT_HOCKEY },
+	{ "sport"  , "skateboard",	NODE_SPORT_SKATEBOARD },
 	{ "sport"  , "bowling",		NODE_SPORT_BOWLING },
 	{ "sport"  , "10pin",		NODE_SPORT_BOWLING },
 	{ "sport"  , "motor",		NODE_SPORT_MOTOR },
@@ -156,22 +159,34 @@ struct _nodeinfo {
 	{ "sport"  , "horse_racing",NODE_SPORT_HORSES },
 	{ "sport"  , "horse",		NODE_SPORT_HORSES },
 	{ "sport"  , "horses",		NODE_SPORT_HORSES },
+	{ "sport"  , "dog_racing",	NODE_SPORT_DOG },
+	{ "sport"  , "pelota",		NODE_SPORT_PELOTA },
+	{ "sport"  , "racquet",		NODE_SPORT_RACQUET },
+	{ "sport"  , "equestrian",	NODE_SPORT_HORSES },
+	{ "sport"  , "baseball",	NODE_SPORT_BASEBALL },
+	{ "sport"  , "cricket",		NODE_SPORT_CRICKET },
+	{ "sport"  , "croquet",		NODE_SPORT_CROQUET },
+	{ "sport"  , "cycling",		NODE_SPORT_CYCLING },
+	{ "sport"  , "bowls",		NODE_SPORT_BOWLS },
+	{ "sport"  , "athletics",	NODE_SPORT_ATHLETICS },
+	{ "sport"  , "gymnastics",	NODE_SPORT_GYMNASTICS },
+	{ "sport"  , "multi",		NODE_SPORT_OTHER },
 	{ "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 },
-	{ "tourism", "picnic_site",	NODE_AMENITY_PICNIC_SITE },
-	{ "tourism", "theme_park",	NODE_AMENITY_THEME_PARK },
-	{ "tourism", "hotel",		NODE_AMENITY_HOTEL },
-	{ "tourism", "motel",		NODE_AMENITY_MOTEL },
-	{ "tourism", "hostel",		NODE_AMENITY_HOSTEL },
-	{ "tourism", "attraction",	NODE_AMENITY_ATTRACTION },
+	{ "tourism", "information",	NODE_TOURISM_INFO },
+	{ "tourism", "camp_site",	NODE_TOURISM_CAMP_SITE },
+	{ "tourism", "caravan_site",NODE_TOURISM_CARAVAN_SITE },
+	{ "tourism", "picnic_site",	NODE_TOURISM_PICNIC_SITE },
+	{ "tourism", "theme_park",	NODE_TOURISM_THEME_PARK },
+	{ "tourism", "hotel",		NODE_TOURISM_HOTEL },
+	{ "tourism", "motel",		NODE_TOURISM_MOTEL },
+	{ "tourism", "hostel",		NODE_TOURISM_HOSTEL },
+	{ "tourism", "attraction",	NODE_TOURISM_ATTRACTION },
 
-	{ "railway", "station",		NODE_AMENITY_RAILWAY_STATION },
-	{ "railway", "halt",		NODE_AMENITY_RAILWAY_HALT },
+	{ "railway", "station",		NODE_RAILWAY_STATION },
+	{ "railway", "halt",		NODE_RAILWAY_HALT },
 
-	{ "aeroway", "terminal",	NODE_AMENITY_AIRPORT },
+	{ "aeroway", "terminal",	NODE_AIRPORT_TERMINAL },
 	
 	{ "place", "city",			NODE_PLACE_CITY },
 	{ "place", "town",			NODE_PLACE_TOWN },
diff --git a/src/osm.h b/src/osm.h
index ef23a08..08b5815 100644
--- a/src/osm.h
+++ b/src/osm.h
@@ -51,9 +51,9 @@ typedef enum {
 	NODE_AMENITY_PHARMACY=121,
 	NODE_AMENITY_POLICE=130,
 
-	NODE_AMENITY_HOTEL=200,
-	NODE_AMENITY_HOSTEL=201,
-	NODE_AMENITY_MOTEL=202,
+	NODE_TOURISM_HOTEL=200,
+	NODE_TOURISM_HOSTEL=201,
+	NODE_TOURISM_MOTEL=202,
 
 	NODE_AMENITY_ATM=205,
 	NODE_AMENITY_BANK=206,
@@ -61,18 +61,18 @@ typedef enum {
 	NODE_AMENITY_POST=210,
 	NODE_AMENITY_POST_BOX=211,
 
-	NODE_AMENITY_TOURISM_INFO=219,
+	NODE_TOURISM_INFO=219,
 
 	NODE_AMENITY_TAXI=220,
-	NODE_AMENITY_RAILWAY_STATION=230,
-	NODE_AMENITY_RAILWAY_HALT=231,
+	NODE_RAILWAY_STATION=230,
+	NODE_RAILWAY_HALT=231,
 	NODE_AMENITY_BUS_STATION=236,
 	NODE_AMENITY_BOAT=240,
-	NODE_AMENITY_AIRPORT=250,
+	NODE_AIRPORT_TERMINAL=250,
 
-	NODE_AMENITY_CAMP_SITE=280,
-	NODE_AMENITY_CARAVAN_SITE=281,
-	NODE_AMENITY_PICNIC_SITE=282,
+	NODE_TOURISM_CAMP_SITE=280,
+	NODE_TOURISM_CARAVAN_SITE=281,
+	NODE_TOURISM_PICNIC_SITE=282,
 
 	NODE_AMENITY_FOOD=301,
 	NODE_AMENITY_PUB=302,
@@ -82,11 +82,11 @@ typedef enum {
 	NODE_AMENITY_CAFE=306,
 	NODE_AMENITY_TELEPHONE=307,
 	NODE_AMENITY_WC=308,
-	NODE_AMENITY_THEME_PARK=309,
+	NODE_TOURISM_THEME_PARK=309,
 	NODE_AMENITY_POW=310,
 	NODE_AMENITY_COLLEGE=320,
 	NODE_AMENITY_SCHOOL=321,
-	NODE_AMENITY_ATTRACTION=330,
+	NODE_TOURISM_ATTRACTION=330,
 
 	/* Sport */
 	NODE_SPORT_CENTER=400,
@@ -102,13 +102,25 @@ typedef enum {
 	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_BASEBALL=416,
+	NODE_SPORT_SKATING=417,
+	NODE_SPORT_SKATEBOARD=418,
+	NODE_SPORT_RACQUET=419,
 	NODE_SPORT_CROQUET=420,
 	NODE_SPORT_CRICKET=421,
+	NODE_SPORT_PELOTA=422,
+	NODE_SPORT_TABLE_TENNIS=423,
+	NODE_SPORT_GYMNASTICS=424,
+	NODE_SPORT_CYCLING=425,
+	NODE_SPORT_BOWLS=426,
+	NODE_SPORT_ATHLETICS=427,
 	NODE_SPORT_SHOOTING=430,
 	NODE_SPORT_PAINTBALL=431,
+	NODE_SPORT_DOG=435,
+	NODE_SPORT_HORSES=436,
+	NODE_SPORT_OTHER=450,
 
 	NODE_AMENITY_GENERIC=900,
 	/* */