Merge branch 'master' into zlw-route-name-hstore

layers/place/place.yaml

@@ -5,7 +5,6 @@ layer:
       - ne_10m_admin_1_states_provinces
       - ne_10m_admin_0_countries
       - ne_10m_populated_places
-  requires:
     layers:
       - boundary
   description: |

layers/poi/poi.yaml

@@ -18,7 +18,7 @@ layer:
       values:
         shop:
           subclass: ['accessories', 'antiques', 'beauty', 'bed', 'boutique', 'camera', 'carpet', 'charity', 'chemist',
-                     'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics', 'garden_centre', 'doityourself',
+                     'coffee', 'computer', 'convenience', 'confectionery', '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', 'locksmith', 'lamps', 'mall', 'massage', 'motorcycle', 'mobile_phone',
@@ -69,7 +69,7 @@ layer:
         lodging:
           subclass: ['hotel', 'motel', 'bed_and_breakfast', 'guest_house', 'hostel', 'chalet', 'alpine_hut', 'dormitory']
         ice_cream:
-          subclass: ['chocolate', 'confectionery']
+          subclass: ['chocolate']
         post:
           subclass: ['post_box', 'post_office', 'parcel_locker']
         cafe: