Cleaned up more code from landmark that wasn't used. Experimenting with power generator:source stuff

layers/poi/layer.sql

@@ -34,6 +34,8 @@ SELECT osm_id_hash                                  AS osm_id,
                THEN NULLIF(religion, '')
            WHEN subclass = 'pitch'
                THEN NULLIF(sport, '')
+           when class = 'power'
+               THEN NULLIF(source, '')
            ELSE subclass
            END                                      AS subclass,
        agg_stop,

layers/poi/mapping.yaml

@@ -62,6 +62,7 @@ def_poi_mapping_amenity: &poi_mapping_amenity
   - university
   - veterinary
   - waste_basket
+  - charging_station
 
 # barrier values , see http://taginfo.openstreetmap.org/keys/barrier#values
 def_poi_mapping_barrier: &poi_mapping_barrier
@@ -319,6 +320,15 @@ def_poi_mapping_tourism: &poi_mapping_tourism
 def_poi_mapping_waterway: &poi_mapping_waterway
   - dock
 
+# aeroway values , see http://taginfo.openstreetmap.org/keys/aeroway#values
+def_poi_mapping_aeroway: &poi_mapping_aeroway
+  - helipad
+  - aerodrome
+
+# aeroway values , see http://taginfo.openstreetmap.org/keys/aeroway#values
+def_poi_mapping_power: &poi_mapping_power
+  - generator
+
 def_poi_fields: &poi_fields
   - name: osm_id
     type: id
@@ -366,6 +376,9 @@ def_poi_fields: &poi_fields
   - name: sport
     key: sport
     type: string
+  - name: source
+    key: "generator:source"
+    type: string
 
 def_poi_mapping: &poi_mapping
   aerialway: *poi_mapping_aerialway
@@ -381,6 +394,8 @@ def_poi_mapping: &poi_mapping
   sport: *poi_mapping_sport
   tourism: *poi_mapping_tourism
   waterway: *poi_mapping_waterway
+  aeroway: *poi_mapping_aeroway
+  power: *poi_mapping_power
 
 tables:
   # etldoc: imposm3 -> osm_poi_point

layers/poi/poi.yaml

@@ -124,6 +124,10 @@ layer:
           subclass: ['swimming_area', 'swimming']
         castle:
           subclass: ['castle', 'ruins']
+        airport:
+          subclass: ['aerodrome']
+        heliport:
+          subclass: ['helipad']
     subclass:
       description: |
           Original value of either the