Merge branch 'master' into gh-master
# Conflicts: # Makefile # layers/landuse/landuse.sql # layers/poi/poi.sql
This commit is contained in:
@@ -18,15 +18,41 @@ layer:
|
||||
values:
|
||||
shop:
|
||||
subclass: ['accessories', 'antiques', 'beauty', 'bed', 'boutique', 'camera', 'carpet', 'charity', 'chemist',
|
||||
'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics', 'garden_centre', 'doityourself',
|
||||
'erotic', 'electronics', 'fabric', 'florist', 'frozen_food', 'furniture', 'video_games', 'video',
|
||||
'general', 'gift', 'hardware', 'hearing_aids', 'hifi', 'ice_cream', 'interior_decoration',
|
||||
'jewelry', 'kiosk', 'lamps', 'mall', 'massage', 'motorcycle', 'mobile_phone', 'newsagent',
|
||||
'optician', 'outdoor', 'perfumery', 'perfume', 'pet', 'photo', 'second_hand', 'shoes', 'sports',
|
||||
'stationery', 'tailor', 'tattoo', 'ticket', 'tobacco', 'toys', 'travel_agency', 'watches',
|
||||
'weapons', 'wholesale']
|
||||
'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics',
|
||||
'erotic', 'fabric', 'frozen_food', 'video_games', 'video', 'general', 'gift',
|
||||
'hearing_aids', 'hifi', 'interior_decoration', 'kiosk', 'lamps', 'mall', 'massage','outdoor',
|
||||
'perfumery', 'perfume', 'pet', 'photo', 'second_hand', 'sports', 'stationery', 'tailor', 'tattoo',
|
||||
'ticket', 'tobacco', 'travel_agency', 'watches', 'weapons', 'wholesale']
|
||||
optician:
|
||||
subclass: ['optician']
|
||||
toys:
|
||||
subclass: ['toys']
|
||||
jewelry:
|
||||
subclass: ['jewelry']
|
||||
furniture:
|
||||
subclass: ['furniture']
|
||||
newsagent:
|
||||
subclass: ['newsagent']
|
||||
paint:
|
||||
subclass: ['paint']
|
||||
beverages:
|
||||
subclass: ['beverages']
|
||||
electronics:
|
||||
subclass: ['electronics']
|
||||
garden_centre:
|
||||
subclass: ['garden_centre']
|
||||
mobile_phone:
|
||||
subclass: ['mobile_phone']
|
||||
shoes:
|
||||
subclass: ['shoes']
|
||||
hardware:
|
||||
subclass: ['hardware', 'doityourself']
|
||||
florist:
|
||||
subclass: ['florist']
|
||||
town_hall:
|
||||
subclass: ['townhall', 'public_building', 'courthouse', 'community_centre']
|
||||
subclass: ['townhall', 'public_building', 'courthouse']
|
||||
community_centre:
|
||||
subclass: ['community_centre', 'social_facility']
|
||||
golf:
|
||||
subclass: ['golf', 'golf_course', 'miniature_golf']
|
||||
fast_food:
|
||||
@@ -59,7 +85,7 @@ layer:
|
||||
lodging:
|
||||
subclass: ['hotel', 'motel', 'bed_and_breakfast', 'guest_house', 'hostel', 'chalet', 'alpine_hut', 'dormitory']
|
||||
ice_cream:
|
||||
subclass: ['chocolate', 'confectionery']
|
||||
subclass: ['chocolate', 'confectionery', 'ice_cream']
|
||||
post:
|
||||
subclass: ['post_box', 'post_office']
|
||||
cafe:
|
||||
@@ -72,8 +98,14 @@ layer:
|
||||
subclass: ['bar', 'nightclub']
|
||||
harbor:
|
||||
subclass: ['marina', 'dock']
|
||||
car:
|
||||
subclass: ['car', 'car_repair', 'car_parts', 'taxi']
|
||||
taxi:
|
||||
subclass: ['taxi']
|
||||
motorcycle_dealer:
|
||||
subclass: ['motorcycle']
|
||||
car_dealer:
|
||||
subclass: ['car', 'car_parts']
|
||||
car_repair:
|
||||
subclass: ['car_repair']
|
||||
hospital:
|
||||
subclass: ['hospital', 'nursing_home', 'clinic']
|
||||
cemetery:
|
||||
@@ -94,6 +126,25 @@ layer:
|
||||
subclass: ['swimming_area', 'swimming']
|
||||
castle:
|
||||
subclass: ['castle', 'ruins']
|
||||
airport:
|
||||
subclass: ['aerodrome']
|
||||
heliport:
|
||||
subclass: ['helipad']
|
||||
wind_turbine:
|
||||
__AND__:
|
||||
subclass: ['generator']
|
||||
subtype: ['wind']
|
||||
mapping_key: ['power']
|
||||
communications_tower:
|
||||
subclass: ['communications_tower']
|
||||
water_tower:
|
||||
subclass: ['water_tower']
|
||||
wind_mill:
|
||||
subclass: ['wind_mill']
|
||||
power_tower:
|
||||
subclass: ['tower']
|
||||
industry:
|
||||
subclass: ['industrial']
|
||||
subclass:
|
||||
description: |
|
||||
Original value of either the
|
||||
|
||||
Reference in New Issue
Block a user