Merge branch 'master' of https://github.com/openmaptiles/openmaptiles into merge-github

# Conflicts:
#	Makefile
#	QUICKSTART.md
#	docker-compose.yml
#	layers/boundary/mapping.yaml
#	layers/landuse/landuse.sql
#	layers/landuse/landuse.yaml
#	layers/landuse/mapping.yaml
#	layers/poi/mapping.yaml
#	layers/poi/poi.sql
#	layers/poi/poi.yaml

layers/poi/poi.yaml

@@ -18,37 +18,39 @@ layer:
       values:
         shop:
           subclass: ['accessories', 'antiques', 'beauty', 'bed', 'boutique', 'camera', 'carpet', 'charity', 'chemist',
-                     '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']
+                     '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', 'locksmith', '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']
         optician:
-          subclass: ['optician']
+          subclass: [ 'optician' ]
         toys:
-          subclass: ['toys']
+          subclass: [ 'toys' ]
         jewelry:
-          subclass: ['jewelry']
+          subclass: [ 'jewelry' ]
         furniture:
-          subclass: ['furniture']
+          subclass: [ 'furniture' ]
         newsagent:
-          subclass: ['newsagent']
+          subclass: [ 'newsagent' ]
         paint:
-          subclass: ['paint']
+          subclass: [ 'paint' ]
         beverages:
-          subclass: ['beverages']
+          subclass: [ 'beverages' ]
         electronics:
-          subclass: ['electronics']
+          subclass: [ 'electronics' ]
         garden_centre:
-          subclass: ['garden_centre']
+          subclass: [ 'garden_centre' ]
         mobile_phone:
-          subclass: ['mobile_phone']
+          subclass: [ 'mobile_phone' ]
         shoes:
-          subclass: ['shoes']
+          subclass: [ 'shoes' ]
         hardware:
-          subclass: ['hardware', 'doityourself']
+          subclass: [ 'hardware', 'doityourself' ]
         florist:
-          subclass: ['florist']
+          subclass: [ 'florist' ]
         town_hall:
           subclass: ['townhall', 'public_building', 'courthouse']
         community_centre:
@@ -87,7 +89,7 @@ layer:
         ice_cream:
           subclass: ['chocolate', 'confectionery', 'ice_cream']
         post:
-          subclass: ['post_box', 'post_office']
+          subclass: ['post_box', 'post_office', 'parcel_locker']
         cafe:
           subclass: ['cafe']
         school:
@@ -126,25 +128,27 @@ layer:
           subclass: ['swimming_area', 'swimming']
         castle:
           subclass: ['castle', 'ruins']
+        atm:
+          subclass: ['atm']
         airport:
-          subclass: ['aerodrome']
+          subclass: [ 'aerodrome' ]
         heliport:
-          subclass: ['helipad']
+          subclass: [ 'helipad' ]
         wind_turbine:
           __AND__:
-            subclass: ['generator']
-            subtype: ['wind']
-            mapping_key: ['power']
+            subclass: [ 'generator' ]
+            subtype: [ 'wind' ]
+            mapping_key: [ 'power' ]
         communications_tower:
-          subclass: ['communications_tower']
+          subclass: [ 'communications_tower' ]
         water_tower:
-          subclass: ['water_tower']
+          subclass: [ 'water_tower' ]
         wind_mill:
-          subclass: ['wind_mill']
+          subclass: [ 'wind_mill' ]
         power_tower:
-          subclass: ['tower']
+          subclass: [ 'tower' ]
         industry:
-          subclass: ['industrial']
+          subclass: [ 'industrial' ]
     subclass:
       description: |
           Original value of either the
@@ -162,7 +166,8 @@ layer:
           [`tourism`](http://wiki.openstreetmap.org/wiki/Key:tourism),
           [`aerialway`](http://wiki.openstreetmap.org/wiki/Key:aerialway),
           [`building`](http://wiki.openstreetmap.org/wiki/Key:building),
-          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway)
+          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway),
+          [`office`](https://wiki.openstreetmap.org/wiki/Key:office)
           or [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway)
           tag.  Use this to do more precise styling.
     rank: |