Remove osm_id in vector tiles coz of huge size savings

layers/building/building.yaml

@@ -4,7 +4,7 @@ layer:
     All [OSM Buildings](http://wiki.openstreetmap.org/wiki/Buildings).
   buffer_size: 4
   datasource:
-    query: (SELECT * FROM layer_building(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geom FROM layer_building(!bbox!, z(!scale_denominator!))) AS t
   fields:
     render_height: |
         An approximated height from levels and height of building after the method of Paul Norman in [OSM Clear](https://github.com/ClearTables/osm-clear)

layers/highway/highway.yaml

@@ -10,7 +10,7 @@ layer:
   datasource:
     geometry_field: geometry
     srid: 900913
-    query: (SELECT osm_id, geometry, class::text, subclass, properties::text FROM layer_highway(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class::text, subclass, properties::text FROM layer_highway(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./types.sql
   - ./ne_global_roads.sql

layers/highway_name/highway_name.yaml

@@ -10,7 +10,7 @@ layer:
   datasource:
     geometry_field: geometry
     srid: 900913
-    query: (SELECT osm_id, geometry, name, ref, class::text, subclass FROM layer_highway_name(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, name, ref, class::text, subclass FROM layer_highway_name(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./merge_highways.sql
   - ./layer.sql

layers/landcover/landcover.yaml

@@ -4,7 +4,7 @@ layer:
   buffer_size: 4
   datasource:
     geometry_field: geometry
-    query: (SELECT * FROM layer_landcover(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class, subclass FROM layer_landcover(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./landcover.sql
 datasources:

layers/landuse/landuse.sql

@@ -1,3 +1,4 @@
+
 CREATE OR REPLACE FUNCTION landuse_class(landuse TEXT, amenity TEXT, leisure TEXT, boundary TEXT) RETURNS TEXT AS $$
     SELECT CASE
          WHEN leisure = 'nature_reserve' OR boundary='national_park' THEN 'park'

layers/landuse/landuse.yaml

@@ -4,7 +4,7 @@ layer:
   buffer_size: 4
   datasource:
     geometry_field: geometry
-    query: (SELECT * FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class, subclass FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./landuse.sql
 datasources:

layers/place/place.yaml

@@ -5,7 +5,7 @@ layer:
   buffer_size: 128
   datasource:
     geometry_field: geometry
-    query: (SELECT * FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
+    query: (SELECT geometry, name, name_en, place, abbrev, postal, scalerank FROM layer_place(!bbox!, z(!scale_denominator!), !pixel_width!)) AS t
 schema:
   - ./country.sql
   - ./state.sql

layers/railway/railway.yaml

@@ -4,7 +4,7 @@ layer:
   buffer_size: 4
   datasource:
     geometry_field: geometry
-    query: (SELECT * FROM layer_railway(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class, subclass, brunnel FROM layer_railway(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./railway.sql
 datasources:

layers/water/mapping.yaml

@@ -1,11 +1,11 @@
 generalized_tables:
   water_polygon_gen3:
     source: water_polygon
-    sql_filter: area>9000000.0
+    sql_filter: area>15000000.0
     tolerance: 350.0
   water_polygon_gen2:
     source: water_polygon
-    sql_filter: area>1000000
+    sql_filter: area>2000000
     tolerance: 200.0
   water_polygon_gen1:
     source: water_polygon

layers/water/water.yaml

@@ -4,7 +4,7 @@ layer:
       Water polygons and linestrings representing oceans, lakes and waterways.
   buffer_size: 4
   datasource:
-    query: (SELECT * FROM layer_water(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geom, class FROM layer_water(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./water.sql
 datasources:

layers/waterway/waterway.yaml

@@ -5,7 +5,7 @@ layer:
   buffer_size: 4
   datasource:
     geometry_field: geometry
-    query: (SELECT * FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./waterway.sql
 datasources:

openmaptiles.yaml

@@ -4,6 +4,7 @@ tileset:
     - layers/highway/highway.yaml
     - layers/highway_name/highway_name.yaml
     - layers/building/building.yaml
+    - layers/housenumber/housenumber.yaml
     - layers/place/place.yaml
     - layers/railway/railway.yaml
     - layers/water/water.yaml