From: Sarah Hoffmann Date: Mon, 9 Jul 2018 21:20:46 +0000 (+0200) Subject: move ClassTypes into own namespace X-Git-Tag: v3.2.0~49^2~3 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/320d488627b1a5674458cbef644c6731882b2a23 move ClassTypes into own namespace Also adds some convenience functions for lookups. --- diff --git a/lib/ClassTypes.php b/lib/ClassTypes.php new file mode 100644 index 00000000..be5577d7 --- /dev/null +++ b/lib/ClassTypes.php @@ -0,0 +1,374 @@ + 'address'.$aPlace['rank_address']); +} + +function getProperty($aPlace, $sProp, $mDefault = false) +{ + $aClassType = getList(); + + if (isset($aPlace['admin_level'])) { + $sName = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']; + if (isset($aClassType[$sName]) && isset($aClassType[$sName][$sProp])) { + return $aClassType[$sName][$sProp]; + } + } + + $sName = $aPlace['class'].':'.$aPlace['type']; + if (isset($aClassType[$sName]) && isset($aClassType[$sName][$sProp])) { + return $aClassType[$sName][$sProp]; + } + + return $mDefault; +} + +function getListWithImportance() +{ + static $aOrders = null; + if ($aOrders === null) { + $aOrders = getList(); + $i = 1; + foreach ($aOrders as $sID => $a) { + $aOrders[$sID]['importance'] = $i++; + } + } + + return $aOrders; +} + +function getList() +{ + return array( + 'boundary:administrative:1' => array('label' => 'Continent', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'boundary:administrative:2' => array('label' => 'Country', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'place:country' => array('label' => 'Country', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defzoom' => 6, 'defdiameter' => 15), + 'boundary:administrative:3' => array('label' => 'State', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'boundary:administrative:4' => array('label' => 'State', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'place:state' => array('label' => 'State', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defzoom' => 8, 'defdiameter' => 5.12), + 'boundary:administrative:5' => array('label' => 'State District', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'boundary:administrative:6' => array('label' => 'County', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'boundary:administrative:7' => array('label' => 'County', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'place:county' => array('label' => 'County', 'frequency' => 108, 'icon' => 'poi_boundary_administrative', 'defzoom' => 10, 'defdiameter' => 1.28), + 'boundary:administrative:8' => array('label' => 'City', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'place:city' => array('label' => 'City', 'frequency' => 66, 'icon' => 'poi_place_city', 'defzoom' => 12, 'defdiameter' => 0.32), + 'boundary:administrative:9' => array('label' => 'City District', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'boundary:administrative:10' => array('label' => 'Suburb', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'boundary:administrative:11' => array('label' => 'Neighbourhood', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'place:region' => array('label' => 'Region', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defzoom' => 8, 'defdiameter' => 0.04), + 'place:island' => array('label' => 'Island', 'frequency' => 288, 'icon' => '', 'defzoom' => 11, 'defdiameter' => 0.64), + 'boundary:administrative' => array('label' => 'Administrative', 'frequency' => 413, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'boundary:postal_code' => array('label' => 'Postcode', 'frequency' => 413, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), + 'place:town' => array('label' => 'Town', 'frequency' => 1497, 'icon' => 'poi_place_town', 'defzoom' => 14, 'defdiameter' => 0.08), + 'place:village' => array('label' => 'Village', 'frequency' => 11230, 'icon' => 'poi_place_village', 'defzoom' => 15, 'defdiameter' => 0.04), + 'place:hamlet' => array('label' => 'Hamlet', 'frequency' => 7075, 'icon' => 'poi_place_village', 'defzoom' => 15, 'defdiameter' => 0.04), + 'place:suburb' => array('label' => 'Suburb', 'frequency' => 2528, 'icon' => 'poi_place_village', 'defdiameter' => 0.04), + 'place:locality' => array('label' => 'Locality', 'frequency' => 4113, 'icon' => 'poi_place_village', 'defdiameter' => 0.02), + 'landuse:farm' => array('label' => 'Farm', 'frequency' => 1201, 'icon' => '', 'defdiameter' => 0.02), + 'place:farm' => array('label' => 'Farm', 'frequency' => 1162, 'icon' => '', 'defdiameter' => 0.02), + + 'highway:motorway_junction' => array('label' => 'Motorway Junction', 'frequency' => 1126, 'icon' => '', 'simplelabel' => 'Junction'), + 'highway:motorway' => array('label' => 'Motorway', 'frequency' => 4627, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:trunk' => array('label' => 'Trunk', 'frequency' => 23084, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:primary' => array('label' => 'Primary', 'frequency' => 32138, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:secondary' => array('label' => 'Secondary', 'frequency' => 25807, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:tertiary' => array('label' => 'Tertiary', 'frequency' => 29829, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:residential' => array('label' => 'Residential', 'frequency' => 361498, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:unclassified' => array('label' => 'Unclassified', 'frequency' => 66441, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:living_street' => array('label' => 'Living Street', 'frequency' => 710, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:service' => array('label' => 'Service', 'frequency' => 9963, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:track' => array('label' => 'Track', 'frequency' => 2565, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:road' => array('label' => 'Road', 'frequency' => 591, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:byway' => array('label' => 'Byway', 'frequency' => 346, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:bridleway' => array('label' => 'Bridleway', 'frequency' => 1556, 'icon' => ''), + 'highway:cycleway' => array('label' => 'Cycleway', 'frequency' => 2419, 'icon' => ''), + 'highway:pedestrian' => array('label' => 'Pedestrian', 'frequency' => 2757, 'icon' => ''), + 'highway:footway' => array('label' => 'Footway', 'frequency' => 15008, 'icon' => ''), + 'highway:steps' => array('label' => 'Steps', 'frequency' => 444, 'icon' => '', 'simplelabel' => 'Footway'), + 'highway:motorway_link' => array('label' => 'Motorway Link', 'frequency' => 795, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:trunk_link' => array('label' => 'Trunk Link', 'frequency' => 1258, 'icon' => '', 'simplelabel' => 'Road'), + 'highway:primary_link' => array('label' => 'Primary Link', 'frequency' => 313, 'icon' => '', 'simplelabel' => 'Road'), + + 'landuse:industrial' => array('label' => 'Industrial', 'frequency' => 1062, 'icon' => ''), + 'landuse:residential' => array('label' => 'Residential', 'frequency' => 886, 'icon' => ''), + 'landuse:retail' => array('label' => 'Retail', 'frequency' => 754, 'icon' => ''), + 'landuse:commercial' => array('label' => 'Commercial', 'frequency' => 657, 'icon' => ''), + + 'place:airport' => array('label' => 'Airport', 'frequency' => 36, 'icon' => 'transport_airport2', 'defdiameter' => 0.03), + 'aeroway:aerodrome' => array('label' => 'Aerodrome', 'frequency' => 36, 'icon' => 'transport_airport2', 'defdiameter' => 0.03), + 'aeroway' => array('label' => 'Aeroway', 'frequency' => 36, 'icon' => 'transport_airport2', 'defdiameter' => 0.03), + 'railway:station' => array('label' => 'Station', 'frequency' => 3431, 'icon' => 'transport_train_station2', 'defdiameter' => 0.01), + 'amenity:place_of_worship' => array('label' => 'Place Of Worship', 'frequency' => 9049, 'icon' => 'place_of_worship_unknown3'), + 'amenity:pub' => array('label' => 'Pub', 'frequency' => 18969, 'icon' => 'food_pub'), + 'amenity:bar' => array('label' => 'Bar', 'frequency' => 164, 'icon' => 'food_bar'), + 'amenity:university' => array('label' => 'University', 'frequency' => 607, 'icon' => 'education_university'), + 'tourism:museum' => array('label' => 'Museum', 'frequency' => 543, 'icon' => 'tourist_museum'), + 'amenity:arts_centre' => array('label' => 'Arts Centre', 'frequency' => 136, 'icon' => 'tourist_art_gallery2'), + 'tourism:zoo' => array('label' => 'Zoo', 'frequency' => 47, 'icon' => 'tourist_zoo'), + 'tourism:theme_park' => array('label' => 'Theme Park', 'frequency' => 24, 'icon' => 'poi_point_of_interest'), + 'tourism:attraction' => array('label' => 'Attraction', 'frequency' => 1463, 'icon' => 'poi_point_of_interest'), + 'leisure:golf_course' => array('label' => 'Golf Course', 'frequency' => 712, 'icon' => 'sport_golf'), + 'historic:castle' => array('label' => 'Castle', 'frequency' => 316, 'icon' => 'tourist_castle'), + 'amenity:hospital' => array('label' => 'Hospital', 'frequency' => 879, 'icon' => 'health_hospital'), + 'amenity:school' => array('label' => 'School', 'frequency' => 8192, 'icon' => 'education_school'), + 'amenity:theatre' => array('label' => 'Theatre', 'frequency' => 371, 'icon' => 'tourist_theatre'), + 'amenity:public_building' => array('label' => 'Public Building', 'frequency' => 985, 'icon' => ''), + 'amenity:library' => array('label' => 'Library', 'frequency' => 794, 'icon' => 'amenity_library'), + 'amenity:townhall' => array('label' => 'Townhall', 'frequency' => 242, 'icon' => ''), + 'amenity:community_centre' => array('label' => 'Community Centre', 'frequency' => 157, 'icon' => ''), + 'amenity:fire_station' => array('label' => 'Fire Station', 'frequency' => 221, 'icon' => 'amenity_firestation3'), + 'amenity:police' => array('label' => 'Police', 'frequency' => 334, 'icon' => 'amenity_police2'), + 'amenity:bank' => array('label' => 'Bank', 'frequency' => 1248, 'icon' => 'money_bank2'), + 'amenity:post_office' => array('label' => 'Post Office', 'frequency' => 859, 'icon' => 'amenity_post_office'), + 'leisure:park' => array('label' => 'Park', 'frequency' => 2378, 'icon' => ''), + 'amenity:park' => array('label' => 'Park', 'frequency' => 53, 'icon' => ''), + 'landuse:park' => array('label' => 'Park', 'frequency' => 50, 'icon' => ''), + 'landuse:recreation_ground' => array('label' => 'Recreation Ground', 'frequency' => 517, 'icon' => ''), + 'tourism:hotel' => array('label' => 'Hotel', 'frequency' => 2150, 'icon' => 'accommodation_hotel2'), + 'tourism:motel' => array('label' => 'Motel', 'frequency' => 43, 'icon' => ''), + 'amenity:cinema' => array('label' => 'Cinema', 'frequency' => 277, 'icon' => 'tourist_cinema'), + 'tourism:artwork' => array('label' => 'Artwork', 'frequency' => 171, 'icon' => 'tourist_art_gallery2'), + 'historic:archaeological_site' => array('label' => 'Archaeological Site', 'frequency' => 407, 'icon' => 'tourist_archaeological2'), + 'amenity:doctors' => array('label' => 'Doctors', 'frequency' => 581, 'icon' => 'health_doctors'), + 'leisure:sports_centre' => array('label' => 'Sports Centre', 'frequency' => 767, 'icon' => 'sport_leisure_centre'), + 'leisure:swimming_pool' => array('label' => 'Swimming Pool', 'frequency' => 24, 'icon' => 'sport_swimming_outdoor'), + 'shop:supermarket' => array('label' => 'Supermarket', 'frequency' => 2673, 'icon' => 'shopping_supermarket'), + 'shop:convenience' => array('label' => 'Convenience', 'frequency' => 1469, 'icon' => 'shopping_convenience'), + 'amenity:restaurant' => array('label' => 'Restaurant', 'frequency' => 3179, 'icon' => 'food_restaurant'), + 'amenity:fast_food' => array('label' => 'Fast Food', 'frequency' => 2289, 'icon' => 'food_fastfood'), + 'amenity:cafe' => array('label' => 'Cafe', 'frequency' => 1780, 'icon' => 'food_cafe'), + 'tourism:guest_house' => array('label' => 'Guest House', 'frequency' => 223, 'icon' => 'accommodation_bed_and_breakfast'), + 'amenity:pharmacy' => array('label' => 'Pharmacy', 'frequency' => 733, 'icon' => 'health_pharmacy_dispensing'), + 'amenity:fuel' => array('label' => 'Fuel', 'frequency' => 1308, 'icon' => 'transport_fuel'), + 'natural:peak' => array('label' => 'Peak', 'frequency' => 3212, 'icon' => 'poi_peak'), + 'waterway:waterfall' => array('label' => 'Waterfall', 'frequency' => 24, 'icon' => ''), + 'natural:wood' => array('label' => 'Wood', 'frequency' => 1845, 'icon' => 'landuse_coniferous_and_deciduous'), + 'natural:water' => array('label' => 'Water', 'frequency' => 1790, 'icon' => ''), + 'landuse:forest' => array('label' => 'Forest', 'frequency' => 467, 'icon' => ''), + 'landuse:cemetery' => array('label' => 'Cemetery', 'frequency' => 463, 'icon' => ''), + 'landuse:allotments' => array('label' => 'Allotments', 'frequency' => 408, 'icon' => ''), + 'landuse:farmyard' => array('label' => 'Farmyard', 'frequency' => 397, 'icon' => ''), + 'railway:rail' => array('label' => 'Rail', 'frequency' => 4894, 'icon' => ''), + 'waterway:canal' => array('label' => 'Canal', 'frequency' => 1723, 'icon' => ''), + 'waterway:river' => array('label' => 'River', 'frequency' => 4089, 'icon' => ''), + 'waterway:stream' => array('label' => 'Stream', 'frequency' => 2684, 'icon' => ''), + 'shop:bicycle' => array('label' => 'Bicycle', 'frequency' => 349, 'icon' => 'shopping_bicycle'), + 'shop:clothes' => array('label' => 'Clothes', 'frequency' => 315, 'icon' => 'shopping_clothes'), + 'shop:hairdresser' => array('label' => 'Hairdresser', 'frequency' => 312, 'icon' => 'shopping_hairdresser'), + 'shop:doityourself' => array('label' => 'Doityourself', 'frequency' => 247, 'icon' => 'shopping_diy'), + 'shop:estate_agent' => array('label' => 'Estate Agent', 'frequency' => 162, 'icon' => 'shopping_estateagent2'), + 'shop:car' => array('label' => 'Car', 'frequency' => 159, 'icon' => 'shopping_car'), + 'shop:garden_centre' => array('label' => 'Garden Centre', 'frequency' => 143, 'icon' => 'shopping_garden_centre'), + 'shop:car_repair' => array('label' => 'Car Repair', 'frequency' => 141, 'icon' => 'shopping_car_repair'), + 'shop:newsagent' => array('label' => 'Newsagent', 'frequency' => 132, 'icon' => ''), + 'shop:bakery' => array('label' => 'Bakery', 'frequency' => 129, 'icon' => 'shopping_bakery'), + 'shop:furniture' => array('label' => 'Furniture', 'frequency' => 124, 'icon' => ''), + 'shop:butcher' => array('label' => 'Butcher', 'frequency' => 105, 'icon' => 'shopping_butcher'), + 'shop:apparel' => array('label' => 'Apparel', 'frequency' => 98, 'icon' => 'shopping_clothes'), + 'shop:electronics' => array('label' => 'Electronics', 'frequency' => 96, 'icon' => ''), + 'shop:department_store' => array('label' => 'Department Store', 'frequency' => 86, 'icon' => ''), + 'shop:books' => array('label' => 'Books', 'frequency' => 85, 'icon' => ''), + 'shop:yes' => array('label' => 'Shop', 'frequency' => 68, 'icon' => ''), + 'shop:outdoor' => array('label' => 'Outdoor', 'frequency' => 67, 'icon' => ''), + 'shop:mall' => array('label' => 'Mall', 'frequency' => 63, 'icon' => ''), + 'shop:florist' => array('label' => 'Florist', 'frequency' => 61, 'icon' => ''), + 'shop:charity' => array('label' => 'Charity', 'frequency' => 60, 'icon' => ''), + 'shop:hardware' => array('label' => 'Hardware', 'frequency' => 59, 'icon' => ''), + 'shop:laundry' => array('label' => 'Laundry', 'frequency' => 51, 'icon' => 'shopping_laundrette'), + 'shop:shoes' => array('label' => 'Shoes', 'frequency' => 49, 'icon' => ''), + 'shop:beverages' => array('label' => 'Beverages', 'frequency' => 48, 'icon' => 'shopping_alcohol'), + 'shop:dry_cleaning' => array('label' => 'Dry Cleaning', 'frequency' => 46, 'icon' => ''), + 'shop:carpet' => array('label' => 'Carpet', 'frequency' => 45, 'icon' => ''), + 'shop:computer' => array('label' => 'Computer', 'frequency' => 44, 'icon' => ''), + 'shop:alcohol' => array('label' => 'Alcohol', 'frequency' => 44, 'icon' => 'shopping_alcohol'), + 'shop:optician' => array('label' => 'Optician', 'frequency' => 55, 'icon' => 'health_opticians'), + 'shop:chemist' => array('label' => 'Chemist', 'frequency' => 42, 'icon' => 'health_pharmacy'), + 'shop:gallery' => array('label' => 'Gallery', 'frequency' => 38, 'icon' => 'tourist_art_gallery2'), + 'shop:mobile_phone' => array('label' => 'Mobile Phone', 'frequency' => 37, 'icon' => ''), + 'shop:sports' => array('label' => 'Sports', 'frequency' => 37, 'icon' => ''), + 'shop:jewelry' => array('label' => 'Jewelry', 'frequency' => 32, 'icon' => 'shopping_jewelry'), + 'shop:pet' => array('label' => 'Pet', 'frequency' => 29, 'icon' => ''), + 'shop:beauty' => array('label' => 'Beauty', 'frequency' => 28, 'icon' => ''), + 'shop:stationery' => array('label' => 'Stationery', 'frequency' => 25, 'icon' => ''), + 'shop:shopping_centre' => array('label' => 'Shopping Centre', 'frequency' => 25, 'icon' => ''), + 'shop:general' => array('label' => 'General', 'frequency' => 25, 'icon' => ''), + 'shop:electrical' => array('label' => 'Electrical', 'frequency' => 25, 'icon' => ''), + 'shop:toys' => array('label' => 'Toys', 'frequency' => 23, 'icon' => ''), + 'shop:jeweller' => array('label' => 'Jeweller', 'frequency' => 23, 'icon' => ''), + 'shop:betting' => array('label' => 'Betting', 'frequency' => 23, 'icon' => ''), + 'shop:household' => array('label' => 'Household', 'frequency' => 21, 'icon' => ''), + 'shop:travel_agency' => array('label' => 'Travel Agency', 'frequency' => 21, 'icon' => ''), + 'shop:hifi' => array('label' => 'Hifi', 'frequency' => 21, 'icon' => ''), + 'amenity:shop' => array('label' => 'Shop', 'frequency' => 61, 'icon' => ''), + 'tourism:information' => array('label' => 'Information', 'frequency' => 224, 'icon' => 'amenity_information'), + + 'place:house' => array('label' => 'House', 'frequency' => 2086, 'icon' => '', 'defzoom' => 18), + 'place:house_name' => array('label' => 'House', 'frequency' => 2086, 'icon' => '', 'defzoom' => 18), + 'place:house_number' => array('label' => 'House Number', 'frequency' => 2086, 'icon' => '', 'defzoom' => 18), + 'place:country_code' => array('label' => 'Country Code', 'frequency' => 2086, 'icon' => '', 'defzoom' => 18), + + // + + 'leisure:pitch' => array('label' => 'Pitch', 'frequency' => 762, 'icon' => ''), + 'highway:unsurfaced' => array('label' => 'Unsurfaced', 'frequency' => 492, 'icon' => ''), + 'historic:ruins' => array('label' => 'Ruins', 'frequency' => 483, 'icon' => 'tourist_ruin'), + 'amenity:college' => array('label' => 'College', 'frequency' => 473, 'icon' => 'education_school'), + 'historic:monument' => array('label' => 'Monument', 'frequency' => 470, 'icon' => 'tourist_monument'), + 'railway:subway' => array('label' => 'Subway', 'frequency' => 385, 'icon' => ''), + 'historic:memorial' => array('label' => 'Memorial', 'frequency' => 382, 'icon' => 'tourist_monument'), + 'leisure:nature_reserve' => array('label' => 'Nature Reserve', 'frequency' => 342, 'icon' => ''), + 'leisure:common' => array('label' => 'Common', 'frequency' => 322, 'icon' => ''), + 'waterway:lock_gate' => array('label' => 'Lock Gate', 'frequency' => 321, 'icon' => ''), + 'natural:fell' => array('label' => 'Fell', 'frequency' => 308, 'icon' => ''), + 'amenity:nightclub' => array('label' => 'Nightclub', 'frequency' => 292, 'icon' => ''), + 'highway:path' => array('label' => 'Path', 'frequency' => 287, 'icon' => ''), + 'leisure:garden' => array('label' => 'Garden', 'frequency' => 285, 'icon' => ''), + 'landuse:reservoir' => array('label' => 'Reservoir', 'frequency' => 276, 'icon' => ''), + 'leisure:playground' => array('label' => 'Playground', 'frequency' => 264, 'icon' => ''), + 'leisure:stadium' => array('label' => 'Stadium', 'frequency' => 212, 'icon' => ''), + 'historic:mine' => array('label' => 'Mine', 'frequency' => 193, 'icon' => 'poi_mine'), + 'natural:cliff' => array('label' => 'Cliff', 'frequency' => 193, 'icon' => ''), + 'tourism:caravan_site' => array('label' => 'Caravan Site', 'frequency' => 183, 'icon' => 'accommodation_caravan_park'), + 'amenity:bus_station' => array('label' => 'Bus Station', 'frequency' => 181, 'icon' => 'transport_bus_station'), + 'amenity:kindergarten' => array('label' => 'Kindergarten', 'frequency' => 179, 'icon' => ''), + 'highway:construction' => array('label' => 'Construction', 'frequency' => 176, 'icon' => ''), + 'amenity:atm' => array('label' => 'Atm', 'frequency' => 172, 'icon' => 'money_atm2'), + 'amenity:emergency_phone' => array('label' => 'Emergency Phone', 'frequency' => 164, 'icon' => ''), + 'waterway:lock' => array('label' => 'Lock', 'frequency' => 146, 'icon' => ''), + 'waterway:riverbank' => array('label' => 'Riverbank', 'frequency' => 143, 'icon' => ''), + 'natural:coastline' => array('label' => 'Coastline', 'frequency' => 142, 'icon' => ''), + 'tourism:viewpoint' => array('label' => 'Viewpoint', 'frequency' => 140, 'icon' => 'tourist_view_point'), + 'tourism:hostel' => array('label' => 'Hostel', 'frequency' => 140, 'icon' => ''), + 'tourism:bed_and_breakfast' => array('label' => 'Bed And Breakfast', 'frequency' => 140, 'icon' => 'accommodation_bed_and_breakfast'), + 'railway:halt' => array('label' => 'Halt', 'frequency' => 135, 'icon' => ''), + 'railway:platform' => array('label' => 'Platform', 'frequency' => 134, 'icon' => ''), + 'railway:tram' => array('label' => 'Tram', 'frequency' => 130, 'icon' => 'transport_tram_stop'), + 'amenity:courthouse' => array('label' => 'Courthouse', 'frequency' => 129, 'icon' => 'amenity_court'), + 'amenity:recycling' => array('label' => 'Recycling', 'frequency' => 126, 'icon' => 'amenity_recycling'), + 'amenity:dentist' => array('label' => 'Dentist', 'frequency' => 124, 'icon' => 'health_dentist'), + 'natural:beach' => array('label' => 'Beach', 'frequency' => 121, 'icon' => 'tourist_beach'), + 'place:moor' => array('label' => 'Moor', 'frequency' => 118, 'icon' => ''), + 'amenity:grave_yard' => array('label' => 'Grave Yard', 'frequency' => 110, 'icon' => ''), + 'waterway:drain' => array('label' => 'Drain', 'frequency' => 108, 'icon' => ''), + 'landuse:grass' => array('label' => 'Grass', 'frequency' => 106, 'icon' => ''), + 'landuse:village_green' => array('label' => 'Village Green', 'frequency' => 106, 'icon' => ''), + 'natural:bay' => array('label' => 'Bay', 'frequency' => 102, 'icon' => ''), + 'railway:tram_stop' => array('label' => 'Tram Stop', 'frequency' => 101, 'icon' => 'transport_tram_stop'), + 'leisure:marina' => array('label' => 'Marina', 'frequency' => 98, 'icon' => ''), + 'highway:stile' => array('label' => 'Stile', 'frequency' => 97, 'icon' => ''), + 'natural:moor' => array('label' => 'Moor', 'frequency' => 95, 'icon' => ''), + 'railway:light_rail' => array('label' => 'Light Rail', 'frequency' => 91, 'icon' => ''), + 'railway:narrow_gauge' => array('label' => 'Narrow Gauge', 'frequency' => 90, 'icon' => ''), + 'natural:land' => array('label' => 'Land', 'frequency' => 86, 'icon' => ''), + 'amenity:village_hall' => array('label' => 'Village Hall', 'frequency' => 82, 'icon' => ''), + 'waterway:dock' => array('label' => 'Dock', 'frequency' => 80, 'icon' => ''), + 'amenity:veterinary' => array('label' => 'Veterinary', 'frequency' => 79, 'icon' => ''), + 'landuse:brownfield' => array('label' => 'Brownfield', 'frequency' => 77, 'icon' => ''), + 'leisure:track' => array('label' => 'Track', 'frequency' => 76, 'icon' => ''), + 'railway:historic_station' => array('label' => 'Historic Station', 'frequency' => 74, 'icon' => ''), + 'landuse:construction' => array('label' => 'Construction', 'frequency' => 72, 'icon' => ''), + 'amenity:prison' => array('label' => 'Prison', 'frequency' => 71, 'icon' => 'amenity_prison'), + 'landuse:quarry' => array('label' => 'Quarry', 'frequency' => 71, 'icon' => ''), + 'amenity:telephone' => array('label' => 'Telephone', 'frequency' => 70, 'icon' => ''), + 'highway:traffic_signals' => array('label' => 'Traffic Signals', 'frequency' => 66, 'icon' => ''), + 'natural:heath' => array('label' => 'Heath', 'frequency' => 62, 'icon' => ''), + 'historic:house' => array('label' => 'House', 'frequency' => 61, 'icon' => ''), + 'amenity:social_club' => array('label' => 'Social Club', 'frequency' => 61, 'icon' => ''), + 'landuse:military' => array('label' => 'Military', 'frequency' => 61, 'icon' => ''), + 'amenity:health_centre' => array('label' => 'Health Centre', 'frequency' => 59, 'icon' => ''), + 'historic:building' => array('label' => 'Building', 'frequency' => 58, 'icon' => ''), + 'amenity:clinic' => array('label' => 'Clinic', 'frequency' => 57, 'icon' => ''), + 'highway:services' => array('label' => 'Services', 'frequency' => 56, 'icon' => ''), + 'amenity:ferry_terminal' => array('label' => 'Ferry Terminal', 'frequency' => 55, 'icon' => ''), + 'natural:marsh' => array('label' => 'Marsh', 'frequency' => 55, 'icon' => ''), + 'natural:hill' => array('label' => 'Hill', 'frequency' => 54, 'icon' => ''), + 'highway:raceway' => array('label' => 'Raceway', 'frequency' => 53, 'icon' => ''), + 'amenity:taxi' => array('label' => 'Taxi', 'frequency' => 47, 'icon' => ''), + 'amenity:take_away' => array('label' => 'Take Away', 'frequency' => 45, 'icon' => ''), + 'amenity:car_rental' => array('label' => 'Car Rental', 'frequency' => 44, 'icon' => ''), + 'place:islet' => array('label' => 'Islet', 'frequency' => 44, 'icon' => ''), + 'amenity:nursery' => array('label' => 'Nursery', 'frequency' => 44, 'icon' => ''), + 'amenity:nursing_home' => array('label' => 'Nursing Home', 'frequency' => 43, 'icon' => ''), + 'amenity:toilets' => array('label' => 'Toilets', 'frequency' => 38, 'icon' => ''), + 'amenity:hall' => array('label' => 'Hall', 'frequency' => 38, 'icon' => ''), + 'waterway:boatyard' => array('label' => 'Boatyard', 'frequency' => 36, 'icon' => ''), + 'highway:mini_roundabout' => array('label' => 'Mini Roundabout', 'frequency' => 35, 'icon' => ''), + 'historic:manor' => array('label' => 'Manor', 'frequency' => 35, 'icon' => ''), + 'tourism:chalet' => array('label' => 'Chalet', 'frequency' => 34, 'icon' => ''), + 'amenity:bicycle_parking' => array('label' => 'Bicycle Parking', 'frequency' => 34, 'icon' => ''), + 'amenity:hotel' => array('label' => 'Hotel', 'frequency' => 34, 'icon' => ''), + 'waterway:weir' => array('label' => 'Weir', 'frequency' => 33, 'icon' => ''), + 'natural:wetland' => array('label' => 'Wetland', 'frequency' => 33, 'icon' => ''), + 'natural:cave_entrance' => array('label' => 'Cave Entrance', 'frequency' => 32, 'icon' => ''), + 'amenity:crematorium' => array('label' => 'Crematorium', 'frequency' => 31, 'icon' => ''), + 'tourism:picnic_site' => array('label' => 'Picnic Site', 'frequency' => 31, 'icon' => ''), + 'landuse:wood' => array('label' => 'Wood', 'frequency' => 30, 'icon' => ''), + 'landuse:basin' => array('label' => 'Basin', 'frequency' => 30, 'icon' => ''), + 'natural:tree' => array('label' => 'Tree', 'frequency' => 30, 'icon' => ''), + 'leisure:slipway' => array('label' => 'Slipway', 'frequency' => 29, 'icon' => ''), + 'landuse:meadow' => array('label' => 'Meadow', 'frequency' => 29, 'icon' => ''), + 'landuse:piste' => array('label' => 'Piste', 'frequency' => 28, 'icon' => ''), + 'amenity:care_home' => array('label' => 'Care Home', 'frequency' => 28, 'icon' => ''), + 'amenity:club' => array('label' => 'Club', 'frequency' => 28, 'icon' => ''), + 'amenity:medical_centre' => array('label' => 'Medical Centre', 'frequency' => 27, 'icon' => ''), + 'historic:roman_road' => array('label' => 'Roman Road', 'frequency' => 27, 'icon' => ''), + 'historic:fort' => array('label' => 'Fort', 'frequency' => 26, 'icon' => ''), + 'railway:subway_entrance' => array('label' => 'Subway Entrance', 'frequency' => 26, 'icon' => ''), + 'historic:yes' => array('label' => 'Historic', 'frequency' => 25, 'icon' => ''), + 'highway:gate' => array('label' => 'Gate', 'frequency' => 25, 'icon' => ''), + 'leisure:fishing' => array('label' => 'Fishing', 'frequency' => 24, 'icon' => ''), + 'historic:museum' => array('label' => 'Museum', 'frequency' => 24, 'icon' => ''), + 'amenity:car_wash' => array('label' => 'Car Wash', 'frequency' => 24, 'icon' => ''), + 'railway:level_crossing' => array('label' => 'Level Crossing', 'frequency' => 23, 'icon' => ''), + 'leisure:bird_hide' => array('label' => 'Bird Hide', 'frequency' => 23, 'icon' => ''), + 'natural:headland' => array('label' => 'Headland', 'frequency' => 21, 'icon' => ''), + 'tourism:apartments' => array('label' => 'Apartments', 'frequency' => 21, 'icon' => ''), + 'amenity:shopping' => array('label' => 'Shopping', 'frequency' => 21, 'icon' => ''), + 'natural:scrub' => array('label' => 'Scrub', 'frequency' => 20, 'icon' => ''), + 'natural:fen' => array('label' => 'Fen', 'frequency' => 20, 'icon' => ''), + 'building:yes' => array('label' => 'Building', 'frequency' => 200, 'icon' => ''), + 'mountain_pass:yes' => array('label' => 'Mountain Pass', 'frequency' => 200, 'icon' => ''), + + 'amenity:parking' => array('label' => 'Parking', 'frequency' => 3157, 'icon' => ''), + 'highway:bus_stop' => array('label' => 'Bus Stop', 'frequency' => 35777, 'icon' => 'transport_bus_stop2'), + 'place:postcode' => array('label' => 'Postcode', 'frequency' => 27267, 'icon' => ''), + 'amenity:post_box' => array('label' => 'Post Box', 'frequency' => 9613, 'icon' => ''), + + 'place:houses' => array('label' => 'Houses', 'frequency' => 85, 'icon' => ''), + 'railway:preserved' => array('label' => 'Preserved', 'frequency' => 227, 'icon' => ''), + 'waterway:derelict_canal' => array('label' => 'Derelict Canal', 'frequency' => 21, 'icon' => ''), + 'amenity:dead_pub' => array('label' => 'Dead Pub', 'frequency' => 20, 'icon' => ''), + 'railway:disused_station' => array('label' => 'Disused Station', 'frequency' => 114, 'icon' => ''), + 'railway:abandoned' => array('label' => 'Abandoned', 'frequency' => 641, 'icon' => ''), + 'railway:disused' => array('label' => 'Disused', 'frequency' => 72, 'icon' => ''), + ); +} diff --git a/lib/Geocode.php b/lib/Geocode.php index a991914e..684e7adb 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -868,7 +868,7 @@ class Geocode $aSearchResults = $this->oPlaceLookup->lookup($aResults); - $aClassType = getClassTypesWithImportance(); + $aClassType = ClassTypes\getListWithImportance(); $aRecheckWords = preg_split('/\b[\s,\\-]*/u', $sQuery); foreach ($aRecheckWords as $i => $sWord) { if (!preg_match('/[\pL\pN]/', $sWord)) unset($aRecheckWords[$i]); @@ -878,7 +878,7 @@ class Geocode foreach ($aSearchResults as $iIdx => $aResult) { // Default - $fDiameter = getResultDiameter($aResult); + $fDiameter = ClassTypes\getProperty($aResult, 'defdiameter', 0.0001); $aOutlineResult = $this->oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2); if ($aOutlineResult) { @@ -892,20 +892,16 @@ class Geocode } // Is there an icon set for this type of result? - if (isset($aClassType[$aResult['class'].':'.$aResult['type']]['icon']) - && $aClassType[$aResult['class'].':'.$aResult['type']]['icon'] - ) { - $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassType[$aResult['class'].':'.$aResult['type']]['icon'].'.p.20.png'; - } + $aClassInfo = ClassTypes\getInfo($aResult); - if (isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label']) - && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label'] - ) { - $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['label']; - } elseif (isset($aClassType[$aResult['class'].':'.$aResult['type']]['label']) - && $aClassType[$aResult['class'].':'.$aResult['type']]['label'] - ) { - $aResult['label'] = $aClassType[$aResult['class'].':'.$aResult['type']]['label']; + if ($aClassInfo) { + if (isset($aClassInfo['icon'])) { + $aResult['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aClassInfo['icon'].'.p.20.png'; + } + + if (isset($aClassInfo['label'])) { + $aResult['label'] = $aClassInfo['label']; + } } // if tag '&addressdetails=1' is set in query if ($this->bIncludeAddressDetails) { diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index c94121f8..6753a0fa 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -429,7 +429,6 @@ class PlaceLookup Debug::printSQL($sSQL); $aPlaces = chksql($this->oDB->getAll($sSQL), 'Could not lookup place'); - $aClassType = getClassTypes(); foreach ($aPlaces as &$aPlace) { if ($this->bAddressDetails) { // to get addressdetails for tiger data, the housenumber is needed @@ -462,18 +461,11 @@ class PlaceLookup } } - $sAddressType = ''; - $sClassType = $aPlace['class'].':'.$aPlace['type'].':'.$aPlace['admin_level']; - if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel'])) { - $sAddressType = $aClassType[$aClassType]['simplelabel']; - } else { - $sClassType = $aPlace['class'].':'.$aPlace['type']; - if (isset($aClassType[$sClassType]) && isset($aClassType[$sClassType]['simplelabel'])) - $sAddressType = $aClassType[$sClassType]['simplelabel']; - else $sAddressType = $aPlace['class']; - } - - $aPlace['addresstype'] = $sAddressType; + $aPlace['addresstype'] = ClassTypes\getProperty( + $aPlace, + 'simplelabel', + $aPlace['class'] + ); } Debug::printVar('Places', $aPlaces); @@ -504,22 +496,16 @@ class PlaceLookup $aAddress = array(); $aFallback = array(); - $aClassType = getClassTypes(); foreach ($aAddressLines as $aLine) { $bFallback = false; - $aTypeLabel = false; - if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) { - $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']]; - } elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) { - $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']]; - } elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))])) { - $aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))]; - $bFallback = true; - } else { - $aTypeLabel = array('simplelabel' => 'address'.$aLine['rank_address']); + $aTypeLabel = ClassTypes\getInfo($aLine); + + if ($aTypeLabel === false) { + $aTypeLabel = ClassTypes\getFallbackInfo($aLine); $bFallback = true; } - if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber']))) { + + if ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber'])) { $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']); $sTypeLabel = str_replace(' ', '_', $sTypeLabel); if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place') { diff --git a/lib/lib.php b/lib/lib.php index 0b939da4..39bc90d7 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -1,5 +1,6 @@ array('label' => 'Continent', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'boundary:administrative:2' => array('label' => 'Country', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'place:country' => array('label' => 'Country', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defzoom' => 6, 'defdiameter' => 15), - 'boundary:administrative:3' => array('label' => 'State', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'boundary:administrative:4' => array('label' => 'State', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'place:state' => array('label' => 'State', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defzoom' => 8, 'defdiameter' => 5.12), - 'boundary:administrative:5' => array('label' => 'State District', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'boundary:administrative:6' => array('label' => 'County', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'boundary:administrative:7' => array('label' => 'County', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'place:county' => array('label' => 'County', 'frequency' => 108, 'icon' => 'poi_boundary_administrative', 'defzoom' => 10, 'defdiameter' => 1.28), - 'boundary:administrative:8' => array('label' => 'City', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'place:city' => array('label' => 'City', 'frequency' => 66, 'icon' => 'poi_place_city', 'defzoom' => 12, 'defdiameter' => 0.32), - 'boundary:administrative:9' => array('label' => 'City District', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'boundary:administrative:10' => array('label' => 'Suburb', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'boundary:administrative:11' => array('label' => 'Neighbourhood', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'place:region' => array('label' => 'Region', 'frequency' => 0, 'icon' => 'poi_boundary_administrative', 'defzoom' => 8, 'defdiameter' => 0.04), - 'place:island' => array('label' => 'Island', 'frequency' => 288, 'icon' => '', 'defzoom' => 11, 'defdiameter' => 0.64), - 'boundary:administrative' => array('label' => 'Administrative', 'frequency' => 413, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'boundary:postal_code' => array('label' => 'Postcode', 'frequency' => 413, 'icon' => 'poi_boundary_administrative', 'defdiameter' => 0.32), - 'place:town' => array('label' => 'Town', 'frequency' => 1497, 'icon' => 'poi_place_town', 'defzoom' => 14, 'defdiameter' => 0.08), - 'place:village' => array('label' => 'Village', 'frequency' => 11230, 'icon' => 'poi_place_village', 'defzoom' => 15, 'defdiameter' => 0.04), - 'place:hamlet' => array('label' => 'Hamlet', 'frequency' => 7075, 'icon' => 'poi_place_village', 'defzoom' => 15, 'defdiameter' => 0.04), - 'place:suburb' => array('label' => 'Suburb', 'frequency' => 2528, 'icon' => 'poi_place_village', 'defdiameter' => 0.04), - 'place:locality' => array('label' => 'Locality', 'frequency' => 4113, 'icon' => 'poi_place_village', 'defdiameter' => 0.02), - 'landuse:farm' => array('label' => 'Farm', 'frequency' => 1201, 'icon' => '', 'defdiameter' => 0.02), - 'place:farm' => array('label' => 'Farm', 'frequency' => 1162, 'icon' => '', 'defdiameter' => 0.02), - - 'highway:motorway_junction' => array('label' => 'Motorway Junction', 'frequency' => 1126, 'icon' => '', 'simplelabel' => 'Junction'), - 'highway:motorway' => array('label' => 'Motorway', 'frequency' => 4627, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:trunk' => array('label' => 'Trunk', 'frequency' => 23084, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:primary' => array('label' => 'Primary', 'frequency' => 32138, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:secondary' => array('label' => 'Secondary', 'frequency' => 25807, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:tertiary' => array('label' => 'Tertiary', 'frequency' => 29829, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:residential' => array('label' => 'Residential', 'frequency' => 361498, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:unclassified' => array('label' => 'Unclassified', 'frequency' => 66441, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:living_street' => array('label' => 'Living Street', 'frequency' => 710, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:service' => array('label' => 'Service', 'frequency' => 9963, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:track' => array('label' => 'Track', 'frequency' => 2565, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:road' => array('label' => 'Road', 'frequency' => 591, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:byway' => array('label' => 'Byway', 'frequency' => 346, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:bridleway' => array('label' => 'Bridleway', 'frequency' => 1556, 'icon' => ''), - 'highway:cycleway' => array('label' => 'Cycleway', 'frequency' => 2419, 'icon' => ''), - 'highway:pedestrian' => array('label' => 'Pedestrian', 'frequency' => 2757, 'icon' => ''), - 'highway:footway' => array('label' => 'Footway', 'frequency' => 15008, 'icon' => ''), - 'highway:steps' => array('label' => 'Steps', 'frequency' => 444, 'icon' => '', 'simplelabel' => 'Footway'), - 'highway:motorway_link' => array('label' => 'Motorway Link', 'frequency' => 795, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:trunk_link' => array('label' => 'Trunk Link', 'frequency' => 1258, 'icon' => '', 'simplelabel' => 'Road'), - 'highway:primary_link' => array('label' => 'Primary Link', 'frequency' => 313, 'icon' => '', 'simplelabel' => 'Road'), - - 'landuse:industrial' => array('label' => 'Industrial', 'frequency' => 1062, 'icon' => ''), - 'landuse:residential' => array('label' => 'Residential', 'frequency' => 886, 'icon' => ''), - 'landuse:retail' => array('label' => 'Retail', 'frequency' => 754, 'icon' => ''), - 'landuse:commercial' => array('label' => 'Commercial', 'frequency' => 657, 'icon' => ''), - - 'place:airport' => array('label' => 'Airport', 'frequency' => 36, 'icon' => 'transport_airport2', 'defdiameter' => 0.03), - 'aeroway:aerodrome' => array('label' => 'Aerodrome', 'frequency' => 36, 'icon' => 'transport_airport2', 'defdiameter' => 0.03), - 'aeroway' => array('label' => 'Aeroway', 'frequency' => 36, 'icon' => 'transport_airport2', 'defdiameter' => 0.03), - 'railway:station' => array('label' => 'Station', 'frequency' => 3431, 'icon' => 'transport_train_station2', 'defdiameter' => 0.01), - 'amenity:place_of_worship' => array('label' => 'Place Of Worship', 'frequency' => 9049, 'icon' => 'place_of_worship_unknown3'), - 'amenity:pub' => array('label' => 'Pub', 'frequency' => 18969, 'icon' => 'food_pub'), - 'amenity:bar' => array('label' => 'Bar', 'frequency' => 164, 'icon' => 'food_bar'), - 'amenity:university' => array('label' => 'University', 'frequency' => 607, 'icon' => 'education_university'), - 'tourism:museum' => array('label' => 'Museum', 'frequency' => 543, 'icon' => 'tourist_museum'), - 'amenity:arts_centre' => array('label' => 'Arts Centre', 'frequency' => 136, 'icon' => 'tourist_art_gallery2'), - 'tourism:zoo' => array('label' => 'Zoo', 'frequency' => 47, 'icon' => 'tourist_zoo'), - 'tourism:theme_park' => array('label' => 'Theme Park', 'frequency' => 24, 'icon' => 'poi_point_of_interest'), - 'tourism:attraction' => array('label' => 'Attraction', 'frequency' => 1463, 'icon' => 'poi_point_of_interest'), - 'leisure:golf_course' => array('label' => 'Golf Course', 'frequency' => 712, 'icon' => 'sport_golf'), - 'historic:castle' => array('label' => 'Castle', 'frequency' => 316, 'icon' => 'tourist_castle'), - 'amenity:hospital' => array('label' => 'Hospital', 'frequency' => 879, 'icon' => 'health_hospital'), - 'amenity:school' => array('label' => 'School', 'frequency' => 8192, 'icon' => 'education_school'), - 'amenity:theatre' => array('label' => 'Theatre', 'frequency' => 371, 'icon' => 'tourist_theatre'), - 'amenity:public_building' => array('label' => 'Public Building', 'frequency' => 985, 'icon' => ''), - 'amenity:library' => array('label' => 'Library', 'frequency' => 794, 'icon' => 'amenity_library'), - 'amenity:townhall' => array('label' => 'Townhall', 'frequency' => 242, 'icon' => ''), - 'amenity:community_centre' => array('label' => 'Community Centre', 'frequency' => 157, 'icon' => ''), - 'amenity:fire_station' => array('label' => 'Fire Station', 'frequency' => 221, 'icon' => 'amenity_firestation3'), - 'amenity:police' => array('label' => 'Police', 'frequency' => 334, 'icon' => 'amenity_police2'), - 'amenity:bank' => array('label' => 'Bank', 'frequency' => 1248, 'icon' => 'money_bank2'), - 'amenity:post_office' => array('label' => 'Post Office', 'frequency' => 859, 'icon' => 'amenity_post_office'), - 'leisure:park' => array('label' => 'Park', 'frequency' => 2378, 'icon' => ''), - 'amenity:park' => array('label' => 'Park', 'frequency' => 53, 'icon' => ''), - 'landuse:park' => array('label' => 'Park', 'frequency' => 50, 'icon' => ''), - 'landuse:recreation_ground' => array('label' => 'Recreation Ground', 'frequency' => 517, 'icon' => ''), - 'tourism:hotel' => array('label' => 'Hotel', 'frequency' => 2150, 'icon' => 'accommodation_hotel2'), - 'tourism:motel' => array('label' => 'Motel', 'frequency' => 43, 'icon' => ''), - 'amenity:cinema' => array('label' => 'Cinema', 'frequency' => 277, 'icon' => 'tourist_cinema'), - 'tourism:artwork' => array('label' => 'Artwork', 'frequency' => 171, 'icon' => 'tourist_art_gallery2'), - 'historic:archaeological_site' => array('label' => 'Archaeological Site', 'frequency' => 407, 'icon' => 'tourist_archaeological2'), - 'amenity:doctors' => array('label' => 'Doctors', 'frequency' => 581, 'icon' => 'health_doctors'), - 'leisure:sports_centre' => array('label' => 'Sports Centre', 'frequency' => 767, 'icon' => 'sport_leisure_centre'), - 'leisure:swimming_pool' => array('label' => 'Swimming Pool', 'frequency' => 24, 'icon' => 'sport_swimming_outdoor'), - 'shop:supermarket' => array('label' => 'Supermarket', 'frequency' => 2673, 'icon' => 'shopping_supermarket'), - 'shop:convenience' => array('label' => 'Convenience', 'frequency' => 1469, 'icon' => 'shopping_convenience'), - 'amenity:restaurant' => array('label' => 'Restaurant', 'frequency' => 3179, 'icon' => 'food_restaurant'), - 'amenity:fast_food' => array('label' => 'Fast Food', 'frequency' => 2289, 'icon' => 'food_fastfood'), - 'amenity:cafe' => array('label' => 'Cafe', 'frequency' => 1780, 'icon' => 'food_cafe'), - 'tourism:guest_house' => array('label' => 'Guest House', 'frequency' => 223, 'icon' => 'accommodation_bed_and_breakfast'), - 'amenity:pharmacy' => array('label' => 'Pharmacy', 'frequency' => 733, 'icon' => 'health_pharmacy_dispensing'), - 'amenity:fuel' => array('label' => 'Fuel', 'frequency' => 1308, 'icon' => 'transport_fuel'), - 'natural:peak' => array('label' => 'Peak', 'frequency' => 3212, 'icon' => 'poi_peak'), - 'waterway:waterfall' => array('label' => 'Waterfall', 'frequency' => 24, 'icon' => ''), - 'natural:wood' => array('label' => 'Wood', 'frequency' => 1845, 'icon' => 'landuse_coniferous_and_deciduous'), - 'natural:water' => array('label' => 'Water', 'frequency' => 1790, 'icon' => ''), - 'landuse:forest' => array('label' => 'Forest', 'frequency' => 467, 'icon' => ''), - 'landuse:cemetery' => array('label' => 'Cemetery', 'frequency' => 463, 'icon' => ''), - 'landuse:allotments' => array('label' => 'Allotments', 'frequency' => 408, 'icon' => ''), - 'landuse:farmyard' => array('label' => 'Farmyard', 'frequency' => 397, 'icon' => ''), - 'railway:rail' => array('label' => 'Rail', 'frequency' => 4894, 'icon' => ''), - 'waterway:canal' => array('label' => 'Canal', 'frequency' => 1723, 'icon' => ''), - 'waterway:river' => array('label' => 'River', 'frequency' => 4089, 'icon' => ''), - 'waterway:stream' => array('label' => 'Stream', 'frequency' => 2684, 'icon' => ''), - 'shop:bicycle' => array('label' => 'Bicycle', 'frequency' => 349, 'icon' => 'shopping_bicycle'), - 'shop:clothes' => array('label' => 'Clothes', 'frequency' => 315, 'icon' => 'shopping_clothes'), - 'shop:hairdresser' => array('label' => 'Hairdresser', 'frequency' => 312, 'icon' => 'shopping_hairdresser'), - 'shop:doityourself' => array('label' => 'Doityourself', 'frequency' => 247, 'icon' => 'shopping_diy'), - 'shop:estate_agent' => array('label' => 'Estate Agent', 'frequency' => 162, 'icon' => 'shopping_estateagent2'), - 'shop:car' => array('label' => 'Car', 'frequency' => 159, 'icon' => 'shopping_car'), - 'shop:garden_centre' => array('label' => 'Garden Centre', 'frequency' => 143, 'icon' => 'shopping_garden_centre'), - 'shop:car_repair' => array('label' => 'Car Repair', 'frequency' => 141, 'icon' => 'shopping_car_repair'), - 'shop:newsagent' => array('label' => 'Newsagent', 'frequency' => 132, 'icon' => ''), - 'shop:bakery' => array('label' => 'Bakery', 'frequency' => 129, 'icon' => 'shopping_bakery'), - 'shop:furniture' => array('label' => 'Furniture', 'frequency' => 124, 'icon' => ''), - 'shop:butcher' => array('label' => 'Butcher', 'frequency' => 105, 'icon' => 'shopping_butcher'), - 'shop:apparel' => array('label' => 'Apparel', 'frequency' => 98, 'icon' => 'shopping_clothes'), - 'shop:electronics' => array('label' => 'Electronics', 'frequency' => 96, 'icon' => ''), - 'shop:department_store' => array('label' => 'Department Store', 'frequency' => 86, 'icon' => ''), - 'shop:books' => array('label' => 'Books', 'frequency' => 85, 'icon' => ''), - 'shop:yes' => array('label' => 'Shop', 'frequency' => 68, 'icon' => ''), - 'shop:outdoor' => array('label' => 'Outdoor', 'frequency' => 67, 'icon' => ''), - 'shop:mall' => array('label' => 'Mall', 'frequency' => 63, 'icon' => ''), - 'shop:florist' => array('label' => 'Florist', 'frequency' => 61, 'icon' => ''), - 'shop:charity' => array('label' => 'Charity', 'frequency' => 60, 'icon' => ''), - 'shop:hardware' => array('label' => 'Hardware', 'frequency' => 59, 'icon' => ''), - 'shop:laundry' => array('label' => 'Laundry', 'frequency' => 51, 'icon' => 'shopping_laundrette'), - 'shop:shoes' => array('label' => 'Shoes', 'frequency' => 49, 'icon' => ''), - 'shop:beverages' => array('label' => 'Beverages', 'frequency' => 48, 'icon' => 'shopping_alcohol'), - 'shop:dry_cleaning' => array('label' => 'Dry Cleaning', 'frequency' => 46, 'icon' => ''), - 'shop:carpet' => array('label' => 'Carpet', 'frequency' => 45, 'icon' => ''), - 'shop:computer' => array('label' => 'Computer', 'frequency' => 44, 'icon' => ''), - 'shop:alcohol' => array('label' => 'Alcohol', 'frequency' => 44, 'icon' => 'shopping_alcohol'), - 'shop:optician' => array('label' => 'Optician', 'frequency' => 55, 'icon' => 'health_opticians'), - 'shop:chemist' => array('label' => 'Chemist', 'frequency' => 42, 'icon' => 'health_pharmacy'), - 'shop:gallery' => array('label' => 'Gallery', 'frequency' => 38, 'icon' => 'tourist_art_gallery2'), - 'shop:mobile_phone' => array('label' => 'Mobile Phone', 'frequency' => 37, 'icon' => ''), - 'shop:sports' => array('label' => 'Sports', 'frequency' => 37, 'icon' => ''), - 'shop:jewelry' => array('label' => 'Jewelry', 'frequency' => 32, 'icon' => 'shopping_jewelry'), - 'shop:pet' => array('label' => 'Pet', 'frequency' => 29, 'icon' => ''), - 'shop:beauty' => array('label' => 'Beauty', 'frequency' => 28, 'icon' => ''), - 'shop:stationery' => array('label' => 'Stationery', 'frequency' => 25, 'icon' => ''), - 'shop:shopping_centre' => array('label' => 'Shopping Centre', 'frequency' => 25, 'icon' => ''), - 'shop:general' => array('label' => 'General', 'frequency' => 25, 'icon' => ''), - 'shop:electrical' => array('label' => 'Electrical', 'frequency' => 25, 'icon' => ''), - 'shop:toys' => array('label' => 'Toys', 'frequency' => 23, 'icon' => ''), - 'shop:jeweller' => array('label' => 'Jeweller', 'frequency' => 23, 'icon' => ''), - 'shop:betting' => array('label' => 'Betting', 'frequency' => 23, 'icon' => ''), - 'shop:household' => array('label' => 'Household', 'frequency' => 21, 'icon' => ''), - 'shop:travel_agency' => array('label' => 'Travel Agency', 'frequency' => 21, 'icon' => ''), - 'shop:hifi' => array('label' => 'Hifi', 'frequency' => 21, 'icon' => ''), - 'amenity:shop' => array('label' => 'Shop', 'frequency' => 61, 'icon' => ''), - 'tourism:information' => array('label' => 'Information', 'frequency' => 224, 'icon' => 'amenity_information'), - - 'place:house' => array('label' => 'House', 'frequency' => 2086, 'icon' => '', 'defzoom' => 18), - 'place:house_name' => array('label' => 'House', 'frequency' => 2086, 'icon' => '', 'defzoom' => 18), - 'place:house_number' => array('label' => 'House Number', 'frequency' => 2086, 'icon' => '', 'defzoom' => 18), - 'place:country_code' => array('label' => 'Country Code', 'frequency' => 2086, 'icon' => '', 'defzoom' => 18), - - // - - 'leisure:pitch' => array('label' => 'Pitch', 'frequency' => 762, 'icon' => ''), - 'highway:unsurfaced' => array('label' => 'Unsurfaced', 'frequency' => 492, 'icon' => ''), - 'historic:ruins' => array('label' => 'Ruins', 'frequency' => 483, 'icon' => 'tourist_ruin'), - 'amenity:college' => array('label' => 'College', 'frequency' => 473, 'icon' => 'education_school'), - 'historic:monument' => array('label' => 'Monument', 'frequency' => 470, 'icon' => 'tourist_monument'), - 'railway:subway' => array('label' => 'Subway', 'frequency' => 385, 'icon' => ''), - 'historic:memorial' => array('label' => 'Memorial', 'frequency' => 382, 'icon' => 'tourist_monument'), - 'leisure:nature_reserve' => array('label' => 'Nature Reserve', 'frequency' => 342, 'icon' => ''), - 'leisure:common' => array('label' => 'Common', 'frequency' => 322, 'icon' => ''), - 'waterway:lock_gate' => array('label' => 'Lock Gate', 'frequency' => 321, 'icon' => ''), - 'natural:fell' => array('label' => 'Fell', 'frequency' => 308, 'icon' => ''), - 'amenity:nightclub' => array('label' => 'Nightclub', 'frequency' => 292, 'icon' => ''), - 'highway:path' => array('label' => 'Path', 'frequency' => 287, 'icon' => ''), - 'leisure:garden' => array('label' => 'Garden', 'frequency' => 285, 'icon' => ''), - 'landuse:reservoir' => array('label' => 'Reservoir', 'frequency' => 276, 'icon' => ''), - 'leisure:playground' => array('label' => 'Playground', 'frequency' => 264, 'icon' => ''), - 'leisure:stadium' => array('label' => 'Stadium', 'frequency' => 212, 'icon' => ''), - 'historic:mine' => array('label' => 'Mine', 'frequency' => 193, 'icon' => 'poi_mine'), - 'natural:cliff' => array('label' => 'Cliff', 'frequency' => 193, 'icon' => ''), - 'tourism:caravan_site' => array('label' => 'Caravan Site', 'frequency' => 183, 'icon' => 'accommodation_caravan_park'), - 'amenity:bus_station' => array('label' => 'Bus Station', 'frequency' => 181, 'icon' => 'transport_bus_station'), - 'amenity:kindergarten' => array('label' => 'Kindergarten', 'frequency' => 179, 'icon' => ''), - 'highway:construction' => array('label' => 'Construction', 'frequency' => 176, 'icon' => ''), - 'amenity:atm' => array('label' => 'Atm', 'frequency' => 172, 'icon' => 'money_atm2'), - 'amenity:emergency_phone' => array('label' => 'Emergency Phone', 'frequency' => 164, 'icon' => ''), - 'waterway:lock' => array('label' => 'Lock', 'frequency' => 146, 'icon' => ''), - 'waterway:riverbank' => array('label' => 'Riverbank', 'frequency' => 143, 'icon' => ''), - 'natural:coastline' => array('label' => 'Coastline', 'frequency' => 142, 'icon' => ''), - 'tourism:viewpoint' => array('label' => 'Viewpoint', 'frequency' => 140, 'icon' => 'tourist_view_point'), - 'tourism:hostel' => array('label' => 'Hostel', 'frequency' => 140, 'icon' => ''), - 'tourism:bed_and_breakfast' => array('label' => 'Bed And Breakfast', 'frequency' => 140, 'icon' => 'accommodation_bed_and_breakfast'), - 'railway:halt' => array('label' => 'Halt', 'frequency' => 135, 'icon' => ''), - 'railway:platform' => array('label' => 'Platform', 'frequency' => 134, 'icon' => ''), - 'railway:tram' => array('label' => 'Tram', 'frequency' => 130, 'icon' => 'transport_tram_stop'), - 'amenity:courthouse' => array('label' => 'Courthouse', 'frequency' => 129, 'icon' => 'amenity_court'), - 'amenity:recycling' => array('label' => 'Recycling', 'frequency' => 126, 'icon' => 'amenity_recycling'), - 'amenity:dentist' => array('label' => 'Dentist', 'frequency' => 124, 'icon' => 'health_dentist'), - 'natural:beach' => array('label' => 'Beach', 'frequency' => 121, 'icon' => 'tourist_beach'), - 'place:moor' => array('label' => 'Moor', 'frequency' => 118, 'icon' => ''), - 'amenity:grave_yard' => array('label' => 'Grave Yard', 'frequency' => 110, 'icon' => ''), - 'waterway:drain' => array('label' => 'Drain', 'frequency' => 108, 'icon' => ''), - 'landuse:grass' => array('label' => 'Grass', 'frequency' => 106, 'icon' => ''), - 'landuse:village_green' => array('label' => 'Village Green', 'frequency' => 106, 'icon' => ''), - 'natural:bay' => array('label' => 'Bay', 'frequency' => 102, 'icon' => ''), - 'railway:tram_stop' => array('label' => 'Tram Stop', 'frequency' => 101, 'icon' => 'transport_tram_stop'), - 'leisure:marina' => array('label' => 'Marina', 'frequency' => 98, 'icon' => ''), - 'highway:stile' => array('label' => 'Stile', 'frequency' => 97, 'icon' => ''), - 'natural:moor' => array('label' => 'Moor', 'frequency' => 95, 'icon' => ''), - 'railway:light_rail' => array('label' => 'Light Rail', 'frequency' => 91, 'icon' => ''), - 'railway:narrow_gauge' => array('label' => 'Narrow Gauge', 'frequency' => 90, 'icon' => ''), - 'natural:land' => array('label' => 'Land', 'frequency' => 86, 'icon' => ''), - 'amenity:village_hall' => array('label' => 'Village Hall', 'frequency' => 82, 'icon' => ''), - 'waterway:dock' => array('label' => 'Dock', 'frequency' => 80, 'icon' => ''), - 'amenity:veterinary' => array('label' => 'Veterinary', 'frequency' => 79, 'icon' => ''), - 'landuse:brownfield' => array('label' => 'Brownfield', 'frequency' => 77, 'icon' => ''), - 'leisure:track' => array('label' => 'Track', 'frequency' => 76, 'icon' => ''), - 'railway:historic_station' => array('label' => 'Historic Station', 'frequency' => 74, 'icon' => ''), - 'landuse:construction' => array('label' => 'Construction', 'frequency' => 72, 'icon' => ''), - 'amenity:prison' => array('label' => 'Prison', 'frequency' => 71, 'icon' => 'amenity_prison'), - 'landuse:quarry' => array('label' => 'Quarry', 'frequency' => 71, 'icon' => ''), - 'amenity:telephone' => array('label' => 'Telephone', 'frequency' => 70, 'icon' => ''), - 'highway:traffic_signals' => array('label' => 'Traffic Signals', 'frequency' => 66, 'icon' => ''), - 'natural:heath' => array('label' => 'Heath', 'frequency' => 62, 'icon' => ''), - 'historic:house' => array('label' => 'House', 'frequency' => 61, 'icon' => ''), - 'amenity:social_club' => array('label' => 'Social Club', 'frequency' => 61, 'icon' => ''), - 'landuse:military' => array('label' => 'Military', 'frequency' => 61, 'icon' => ''), - 'amenity:health_centre' => array('label' => 'Health Centre', 'frequency' => 59, 'icon' => ''), - 'historic:building' => array('label' => 'Building', 'frequency' => 58, 'icon' => ''), - 'amenity:clinic' => array('label' => 'Clinic', 'frequency' => 57, 'icon' => ''), - 'highway:services' => array('label' => 'Services', 'frequency' => 56, 'icon' => ''), - 'amenity:ferry_terminal' => array('label' => 'Ferry Terminal', 'frequency' => 55, 'icon' => ''), - 'natural:marsh' => array('label' => 'Marsh', 'frequency' => 55, 'icon' => ''), - 'natural:hill' => array('label' => 'Hill', 'frequency' => 54, 'icon' => ''), - 'highway:raceway' => array('label' => 'Raceway', 'frequency' => 53, 'icon' => ''), - 'amenity:taxi' => array('label' => 'Taxi', 'frequency' => 47, 'icon' => ''), - 'amenity:take_away' => array('label' => 'Take Away', 'frequency' => 45, 'icon' => ''), - 'amenity:car_rental' => array('label' => 'Car Rental', 'frequency' => 44, 'icon' => ''), - 'place:islet' => array('label' => 'Islet', 'frequency' => 44, 'icon' => ''), - 'amenity:nursery' => array('label' => 'Nursery', 'frequency' => 44, 'icon' => ''), - 'amenity:nursing_home' => array('label' => 'Nursing Home', 'frequency' => 43, 'icon' => ''), - 'amenity:toilets' => array('label' => 'Toilets', 'frequency' => 38, 'icon' => ''), - 'amenity:hall' => array('label' => 'Hall', 'frequency' => 38, 'icon' => ''), - 'waterway:boatyard' => array('label' => 'Boatyard', 'frequency' => 36, 'icon' => ''), - 'highway:mini_roundabout' => array('label' => 'Mini Roundabout', 'frequency' => 35, 'icon' => ''), - 'historic:manor' => array('label' => 'Manor', 'frequency' => 35, 'icon' => ''), - 'tourism:chalet' => array('label' => 'Chalet', 'frequency' => 34, 'icon' => ''), - 'amenity:bicycle_parking' => array('label' => 'Bicycle Parking', 'frequency' => 34, 'icon' => ''), - 'amenity:hotel' => array('label' => 'Hotel', 'frequency' => 34, 'icon' => ''), - 'waterway:weir' => array('label' => 'Weir', 'frequency' => 33, 'icon' => ''), - 'natural:wetland' => array('label' => 'Wetland', 'frequency' => 33, 'icon' => ''), - 'natural:cave_entrance' => array('label' => 'Cave Entrance', 'frequency' => 32, 'icon' => ''), - 'amenity:crematorium' => array('label' => 'Crematorium', 'frequency' => 31, 'icon' => ''), - 'tourism:picnic_site' => array('label' => 'Picnic Site', 'frequency' => 31, 'icon' => ''), - 'landuse:wood' => array('label' => 'Wood', 'frequency' => 30, 'icon' => ''), - 'landuse:basin' => array('label' => 'Basin', 'frequency' => 30, 'icon' => ''), - 'natural:tree' => array('label' => 'Tree', 'frequency' => 30, 'icon' => ''), - 'leisure:slipway' => array('label' => 'Slipway', 'frequency' => 29, 'icon' => ''), - 'landuse:meadow' => array('label' => 'Meadow', 'frequency' => 29, 'icon' => ''), - 'landuse:piste' => array('label' => 'Piste', 'frequency' => 28, 'icon' => ''), - 'amenity:care_home' => array('label' => 'Care Home', 'frequency' => 28, 'icon' => ''), - 'amenity:club' => array('label' => 'Club', 'frequency' => 28, 'icon' => ''), - 'amenity:medical_centre' => array('label' => 'Medical Centre', 'frequency' => 27, 'icon' => ''), - 'historic:roman_road' => array('label' => 'Roman Road', 'frequency' => 27, 'icon' => ''), - 'historic:fort' => array('label' => 'Fort', 'frequency' => 26, 'icon' => ''), - 'railway:subway_entrance' => array('label' => 'Subway Entrance', 'frequency' => 26, 'icon' => ''), - 'historic:yes' => array('label' => 'Historic', 'frequency' => 25, 'icon' => ''), - 'highway:gate' => array('label' => 'Gate', 'frequency' => 25, 'icon' => ''), - 'leisure:fishing' => array('label' => 'Fishing', 'frequency' => 24, 'icon' => ''), - 'historic:museum' => array('label' => 'Museum', 'frequency' => 24, 'icon' => ''), - 'amenity:car_wash' => array('label' => 'Car Wash', 'frequency' => 24, 'icon' => ''), - 'railway:level_crossing' => array('label' => 'Level Crossing', 'frequency' => 23, 'icon' => ''), - 'leisure:bird_hide' => array('label' => 'Bird Hide', 'frequency' => 23, 'icon' => ''), - 'natural:headland' => array('label' => 'Headland', 'frequency' => 21, 'icon' => ''), - 'tourism:apartments' => array('label' => 'Apartments', 'frequency' => 21, 'icon' => ''), - 'amenity:shopping' => array('label' => 'Shopping', 'frequency' => 21, 'icon' => ''), - 'natural:scrub' => array('label' => 'Scrub', 'frequency' => 20, 'icon' => ''), - 'natural:fen' => array('label' => 'Fen', 'frequency' => 20, 'icon' => ''), - 'building:yes' => array('label' => 'Building', 'frequency' => 200, 'icon' => ''), - 'mountain_pass:yes' => array('label' => 'Mountain Pass', 'frequency' => 200, 'icon' => ''), - - 'amenity:parking' => array('label' => 'Parking', 'frequency' => 3157, 'icon' => ''), - 'highway:bus_stop' => array('label' => 'Bus Stop', 'frequency' => 35777, 'icon' => 'transport_bus_stop2'), - 'place:postcode' => array('label' => 'Postcode', 'frequency' => 27267, 'icon' => ''), - 'amenity:post_box' => array('label' => 'Post Box', 'frequency' => 9613, 'icon' => ''), - - 'place:houses' => array('label' => 'Houses', 'frequency' => 85, 'icon' => ''), - 'railway:preserved' => array('label' => 'Preserved', 'frequency' => 227, 'icon' => ''), - 'waterway:derelict_canal' => array('label' => 'Derelict Canal', 'frequency' => 21, 'icon' => ''), - 'amenity:dead_pub' => array('label' => 'Dead Pub', 'frequency' => 20, 'icon' => ''), - 'railway:disused_station' => array('label' => 'Disused Station', 'frequency' => 114, 'icon' => ''), - 'railway:abandoned' => array('label' => 'Abandoned', 'frequency' => 641, 'icon' => ''), - 'railway:disused' => array('label' => 'Disused', 'frequency' => 72, 'icon' => ''), - ); -} - - -function getClassTypesWithImportance() -{ - $aOrders = getClassTypes(); - $i = 1; - foreach ($aOrders as $sID => $a) { - $aOrders[$sID]['importance'] = $i++; - } - return $aOrders; -} - -function getResultDiameter($aResult) -{ - $aClassType = getClassTypes(); - - $fDiameter = 0.0001; - - if (isset($aResult['class']) - && isset($aResult['type']) - && isset($aResult['admin_level']) - && isset($aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter']) - && $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter'] - ) { - $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']]['defdiameter']; - } elseif (isset($aResult['class']) - && isset($aResult['type']) - && isset($aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']) - && $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter'] - ) { - $fDiameter = $aClassType[$aResult['class'].':'.$aResult['type']]['defdiameter']; - } - - return $fDiameter; -} - - function javascript_renderData($xVal, $iOptions = 0) { $iOptions |= JSON_UNESCAPED_UNICODE; @@ -438,22 +96,16 @@ function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCo //var_dump($aAddressLines); $aAddress = array(); $aFallback = array(); - $aClassType = getClassTypes(); foreach ($aAddressLines as $aLine) { $bFallback = false; - $aTypeLabel = false; - if (isset($aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']])) { - $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type'].':'.$aLine['admin_level']]; - } elseif (isset($aClassType[$aLine['class'].':'.$aLine['type']])) { - $aTypeLabel = $aClassType[$aLine['class'].':'.$aLine['type']]; - } elseif (isset($aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))])) { - $aTypeLabel = $aClassType['boundary:administrative:'.((int)($aLine['rank_address']/2))]; - $bFallback = true; - } else { - $aTypeLabel = array('simplelabel' => 'address'.$aLine['rank_address']); + $aTypeLabel = Nominatim\ClassTypes\getInfo($aLine); + + if ($aTypeLabel === false) { + $aTypeLabel = Nominatim\ClassTypes\getFallbackInfo($aLine); $bFallback = true; } - if ($aTypeLabel && ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber']))) { + + if ((isset($aLine['localname']) && $aLine['localname']) || (isset($aLine['housenumber']) && $aLine['housenumber'])) { $sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']); $sTypeLabel = str_replace(' ', '_', $sTypeLabel); if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place') { diff --git a/website/details.php b/website/details.php index 08d1d2d8..2427c9dd 100755 --- a/website/details.php +++ b/website/details.php @@ -135,15 +135,7 @@ if (!$aPointDetails) { } $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber']; - -$aClassType = getClassTypesWithImportance(); - -$sPointClassType = $aPointDetails['class'].':'.$aPointDetails['type']; -if (isset($aClassType[$sPointClassType]) && $aClassType[$sPointClassType]['icon']) { - $aPointDetails['icon'] = $aClassType[$sPointClassType]['icon']; -} else { - $aPointDetails['icon'] = false; -} +$aPointDetails['icon'] = Nominatim\ClassTypes\getProperty($aPointDetails, 'icon', false); // Get all alternative names (languages, etc) $sSQL = 'SELECT (each(name)).key,(each(name)).value FROM placex '; diff --git a/website/hierarchy.php b/website/hierarchy.php index 9b488f83..bfc0eebb 100755 --- a/website/hierarchy.php +++ b/website/hierarchy.php @@ -102,18 +102,12 @@ $aParentOfLines = chksql($oDB->getAll($sSQL)); if (!empty($aParentOfLines)) { echo '

Parent Of:

'; - $aClassType = getClassTypesWithImportance(); $aGroupedAddressLines = array(); foreach ($aParentOfLines as $aAddressLine) { - if (isset($aClassType[$aAddressLine['class'].':'.$aAddressLine['type'].':'.$aAddressLine['admin_level']]['label']) - && $aClassType[$aAddressLine['class'].':'.$aAddressLine['type'].':'.$aAddressLine['admin_level']]['label'] - ) { - $aAddressLine['label'] = $aClassType[$aAddressLine['class'].':'.$aAddressLine['type'].':'.$aAddressLine['admin_level']]['label']; - } elseif (isset($aClassType[$aAddressLine['class'].':'.$aAddressLine['type']]['label']) - && $aClassType[$aAddressLine['class'].':'.$aAddressLine['type']]['label'] - ) { - $aAddressLine['label'] = $aClassType[$aAddressLine['class'].':'.$aAddressLine['type']]['label']; - } else $aAddressLine['label'] = ucwords($aAddressLine['type']); + $aAddressLine['label'] = Nominatim\ClassTypes\getProperty($aAddressLine, 'label'); + if (!$aAddressLine['label']) { + $aAddressLine['label'] = ucwords($aAddressLine['type']); + } if (!isset($aGroupedAddressLines[$aAddressLine['label']])) $aGroupedAddressLines[$aAddressLine['label']] = array(); $aGroupedAddressLines[$aAddressLine['label']][] = $aAddressLine; diff --git a/website/reverse.php b/website/reverse.php index 9c6368f0..2e03acae 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -54,12 +54,11 @@ if ($sOsmType && $iOsmId > 0) { } if (isset($aPlace)) { - $fRadius = $fDiameter = getResultDiameter($aPlace); $aOutlineResult = $oPlaceLookup->getOutlines( $aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], - $fRadius, + Nominatim\ClassTypes\getProperty($aPlace, 'defdiameter', 0.0001), $fLat, $fLon );