diff --git a/src/import-osm/subdivide_polygons.sql b/src/import-osm/subdivide_polygons.sql index 6658b9e..11b0089 100644 --- a/src/import-osm/subdivide_polygons.sql +++ b/src/import-osm/subdivide_polygons.sql @@ -28,20 +28,6 @@ ANALYZE osm_landuse_polygon_subdivided_gen0; ANALYZE osm_landuse_polygon_subdivided_gen1; ANALYZE osm_landuse_polygon_subdivided; -/* OSM Ocean Polygons */ - -DROP TABLE IF EXISTS osm_ocean_polygon_subdivided CASCADE; - -CREATE TABLE osm_ocean_polygon_subdivided AS SELECT gid,fid,st_subdivide(geometry,1024) AS geometry FROM osm_ocean_polygon; - -SELECT UpdateGeometrySRID('osm_ocean_polygon_subdivided','geometry',3857); - -CREATE INDEX ON osm_ocean_polygon_subdivided USING btree (gid); - -CREATE INDEX ON osm_ocean_polygon_subdivided USING gist (geometry); - -ANALYZE osm_ocean_polygon_subdivided; - /* Update SRID for lakes and water polygons */ SELECT UpdateGeometrySRID('ne_110m_lakes','geom',3857); diff --git a/src/import-sql/layers/water.sql b/src/import-sql/layers/water.sql index 76ee441..dc2f46d 100644 --- a/src/import-sql/layers/water.sql +++ b/src/import-sql/layers/water.sql @@ -35,14 +35,14 @@ CREATE OR REPLACE VIEW water_z5toz7 AS CREATE OR REPLACE VIEW water_z8toz10 AS SELECT 0 AS osm_id, geometry - FROM osm_ocean_polygon_subdivided + FROM osm_ocean_polygon UNION ALL SELECT id AS osm_id, geometry FROM osm_water_polygon_gen0; CREATE OR REPLACE VIEW water_z11toz12 AS SELECT 0 AS osm_id, geometry, 0 AS area - FROM osm_ocean_polygon_subdivided + FROM osm_ocean_polygon UNION ALL SELECT id AS osm_id, geometry, area FROM osm_water_polygon @@ -50,7 +50,7 @@ CREATE OR REPLACE VIEW water_z11toz12 AS CREATE OR REPLACE VIEW water_z13toz14 AS SELECT 0 AS osm_id, geometry - FROM osm_ocean_polygon_subdivided + FROM osm_ocean_polygon UNION ALL SELECT id AS osm_id, geometry FROM osm_water_polygon;