Include update-scaleranks into import-osm

Makefile

@@ -1,8 +1,8 @@
 .PHONY: all
 
-all: postgis export-mbtiles import-osm import-external import-sql update-scaleranks create-extracts changed-tiles generate-jobs merge-jobs compare-visual mapping-qa-report
+all: postgis export-mbtiles import-osm import-external import-sql create-extracts changed-tiles generate-jobs merge-jobs compare-visual mapping-qa-report
 
-fast: postgis export-mbtiles import-osm import-sql update-scaleranks create-extracts changed-tiles generate-jobs merge-jobs
+fast: postgis export-mbtiles import-osm import-sql create-extracts changed-tiles generate-jobs merge-jobs
 
 postgis:
 	docker build -t osm2vectortiles/postgis src/postgis
@@ -19,9 +19,6 @@ import-external:
 import-sql:
 	docker build -t osm2vectortiles/import-sql src/import-sql
 
-update-scaleranks:
-	docker build -t osm2vectortiles/update-scaleranks src/update-scaleranks
-
 create-extracts:
 	docker build -t osm2vectortiles/create-extracts src/create-extracts
 

docker-compose.yml

@@ -61,10 +61,6 @@ import-water:
   command: ./import-water.sh
   links:
   - postgis:db
-update-scaleranks:
-  image: "osm2vectortiles/update-scaleranks"
-  links:
-  - postgis:db
 changed-tiles:
   image: "osm2vectortiles/changed-tiles"
   volumes:

src/import-external/clean-natural-earth.sh

@@ -53,7 +53,6 @@ function clean_natural_earth() {
     drop_table 'ne_10m_parks_and_protected_lands_point'
     drop_table 'ne_10m_parks_and_protected_lands_scale_rank'
     drop_table 'ne_10m_playas'
-    drop_table 'ne_10m_populated_places'
     drop_table 'ne_10m_populated_places_simple'
     drop_table 'ne_10m_ports'
     drop_table 'ne_10m_railroads'
@@ -115,6 +114,7 @@ function clean_natural_earth() {
     drop_table 'ne_110m_admin_1_states_provinces_lakes_shp'
     drop_table 'ne_110m_coastline'
     drop_table 'ne_110m_geographic_lines'
+    drop_table 'ne_110m_populated_places'
     drop_table 'ne_110m_populated_places_simple'
     drop_table 'ne_110m_rivers_lake_centerlines'
     drop_table 'ne_110m_admin_0_countries'

src/import-osm/import.sh

@@ -41,6 +41,9 @@ function import_pbf() {
     echo "Create osm_landuse_clustered table"
     create_osm_landuse_clustered_table
 
+    echo "Update scaleranks from Natural Earth data"
+    update_scaleranks
+
     local timestamp=$(extract_timestamp "$pbf_file")
     store_timestamp_history "$timestamp"
 }
@@ -50,6 +53,10 @@ function extract_timestamp() {
     osmconvert "$file" --out-timestamp
 }
 
+function update_scaleranks() {
+    exec_sql_file "update_scaleranks.sql"
+}
+
 function create_osm_landuse_clustered_table() {
     exec_sql_file "landuse_clustered_table.sql"
 }

src/update-scaleranks/Dockerfile

@@ -1,7 +0,0 @@
-FROM mdillon/postgis:9.4
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-COPY . /usr/src/app
-CMD ["./update-scaleranks.sh"]

src/update-scaleranks/update-scaleranks.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-set -o errexit
-set -o pipefail
-set -o nounset
-
-readonly SQL_FILE=${IMPORT_DATA_DIR:-/usr/src/app/update.sql}
-
-readonly DB_HOST=$DB_PORT_5432_TCP_ADDR
-readonly OSM_DB=${OSM_DB:-osm}
-readonly OSM_USER=${OSM_USER:-osm}
-readonly OSM_PASSWORD=${OSM_PASSWORD:-osm}
-
-function exec_sql_file() {
-	local sql_file=$1
-	PG_PASSWORD=$OSM_PASSWORD psql --host="$DB_HOST" --port=5432 --dbname="$OSM_DB" --username="$OSM_USER" -a -f "$sql_file"
-}
-
-function main() {
-    echo "Updating scalerank in $OSM_DB"
-    exec_sql_file "update.sql"
-}
-
-main