Attempt at cleaning up the excessive office/industrial POIs, and cleaning up the subtype code while we're at it. (SQL bugs likely)

layers/poi/poi.yaml

@@ -50,7 +50,7 @@ layer:
         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:
@@ -143,6 +143,8 @@ layer:
           subclass: ['wind_mill']
         power_tower:
           subclass: ['tower']
+        industry:
+          subclass: ['industrial']
     subclass:
       description: |
           Original value of either the