Move subdivide into import-osm

docker-compose.yml

@@ -135,7 +135,6 @@ import-sql:
    - postgis:db
   environment:
     SQL_CREATE_INDIZES: 'false'
-    SQL_SUBDIVIDE_POLYGON: 'true'
 mapbox-studio:
   image: "osm2vectortiles/mapbox-studio"
   volumes:

src/import-osm/import.sh

@@ -56,6 +56,9 @@ function import_pbf() {
     echo "Update osm_place_polygon with point geometry"
     update_points
 
+    echo "Subdividing polygons in $OSM_DB"
+    subdivide_polygons
+
     echo "Update scaleranks from Natural Earth data"
     update_scaleranks
 
@@ -80,6 +83,10 @@ function create_osm_water_point_table() {
     exec_sql_file "water_point_table.sql"
 }
 
+function subdivide_polygons() {
+    exec_sql_file "subdivide_polygons.sql"
+}
+
 function update_scaleranks() {
     exec_sql_file "update_scaleranks.sql"
 }
@@ -189,6 +196,9 @@ function import_pbf_diffs() {
     echo "Update osm_place_polygon with point geometry"
     update_points
 
+    echo "Subdividing polygons in $OSM_DB"
+    subdivide_polygons
+
     local timestamp=$(extract_timestamp "$diffs_file")
     echo "Set $timestamp for latest updates from $diffs_file"
     update_timestamp "$timestamp"

src/import-sql/prepare.sh

@@ -26,13 +26,6 @@ function exec_sql_file() {
 }
 
 function main() {
-    if [ "$SQL_SUBDIVIDE_POLYGON" = true ] ; then
-        echo "Subdividing polygons in $OSM_DB"
-        exec_sql_file "$SQL_SUBDIVIDE_POLYGON_FILE"
-    else
-        echo "Omitting subdividing polygons for $OSM_DB"
-    fi
-
     echo "Creating functions in $OSM_DB"
     exec_sql_file "$SQL_FUNCTIONS_FILE"
     exec_sql_file "$SQL_XYZ_EXTENT_FILE"