From 9c50026f16538f30e3b5fe6ce0e553c6b349d49b Mon Sep 17 00:00:00 2001 From: lukasmartinelli Date: Tue, 25 Oct 2016 19:15:51 +0200 Subject: [PATCH] Remove osm_id in vector tiles coz of huge size savings --- layers/building/building.yaml | 2 +- layers/highway/highway.yaml | 2 +- layers/highway_name/highway_name.yaml | 2 +- layers/landcover/landcover.yaml | 2 +- layers/landuse/landuse.sql | 1 + layers/landuse/landuse.yaml | 2 +- layers/place/place.yaml | 2 +- layers/railway/railway.yaml | 2 +- layers/water/mapping.yaml | 4 ++-- layers/water/water.yaml | 2 +- layers/waterway/waterway.yaml | 2 +- openmaptiles.yaml | 1 + 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/layers/building/building.yaml b/layers/building/building.yaml index 42bebf58..c6826674 100644 --- a/layers/building/building.yaml +++ b/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) diff --git a/layers/highway/highway.yaml b/layers/highway/highway.yaml index 867e306f..7ffda088 100644 --- a/layers/highway/highway.yaml +++ b/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 diff --git a/layers/highway_name/highway_name.yaml b/layers/highway_name/highway_name.yaml index da2bef90..8d8ead90 100644 --- a/layers/highway_name/highway_name.yaml +++ b/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 diff --git a/layers/landcover/landcover.yaml b/layers/landcover/landcover.yaml index c150998c..4d0b12b2 100644 --- a/layers/landcover/landcover.yaml +++ b/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: diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index 28399be8..0a408c39 100644 --- a/layers/landuse/landuse.sql +++ b/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' diff --git a/layers/landuse/landuse.yaml b/layers/landuse/landuse.yaml index 0676acf0..346680b8 100644 --- a/layers/landuse/landuse.yaml +++ b/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: diff --git a/layers/place/place.yaml b/layers/place/place.yaml index 3a7c602e..81f3e285 100644 --- a/layers/place/place.yaml +++ b/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 diff --git a/layers/railway/railway.yaml b/layers/railway/railway.yaml index f762e329..6290e222 100644 --- a/layers/railway/railway.yaml +++ b/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: diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml index 1fb30354..f9256cec 100644 --- a/layers/water/mapping.yaml +++ b/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 diff --git a/layers/water/water.yaml b/layers/water/water.yaml index e343aaab..d4e315f9 100644 --- a/layers/water/water.yaml +++ b/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: diff --git a/layers/waterway/waterway.yaml b/layers/waterway/waterway.yaml index 32b25af2..10c84219 100644 --- a/layers/waterway/waterway.yaml +++ b/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: diff --git a/openmaptiles.yaml b/openmaptiles.yaml index 21ed7d4e..a20a27c4 100644 --- a/openmaptiles.yaml +++ b/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