Added logc to check pbf download is finished

docker-compose.yml

@@ -58,8 +58,6 @@ services:
     depends_on:
         db:
           condition: service_healthy
-        osm_downloader:
-          condition: service_started
     environment:
       - POSTGRES_USER=docker
       - POSTGRES_PASS=docker
@@ -91,6 +89,7 @@ services:
       - QGIS_STYLE=yes
       # Use clip in the database - To use this you should have run make import_clip to add your clip to the DB
       - CLIP=no
+    command: bash -c "while [ ! -f /home/settings/country.pbf ] ; do sleep 1; done && python3 -u /home/importer.py"
 
   osmupdate:
     build: docker-osmupdate
@@ -105,8 +104,6 @@ services:
     depends_on:
       db:
         condition: service_healthy
-      osm_downloader:
-        condition: service_started
     environment:
       # These are all currently the defaults but listed here for your
       # convenience if you want to change them
@@ -127,6 +124,7 @@ services:
       # seconds between 2 executions of the script
       # if 0, then no update will be done, only the first initial import from the PBF
       - TIME=120
+    command: bash -c "while [ ! -f /home/settings/country.pbf ] ; do sleep 1; done && python3 -u /home/download.py"
   pgwatch2:
     image: cybertec/pgwatch2-postgres
     hostname: pgwatch2

docker-osm-pbf/download.sh

@@ -3,6 +3,9 @@
 CONTINENT_LOCKFILE=/home/settings/.${CONTINENT}_lock
 COUNTRY_LOCKFILE=/home/settings/.${COUNTRY}_lock
 
+touch /home/settings/last.state.txt
+touch /home/settings/timestamp.txt
+
 # Download OSM Mapping file and Associated data
 if [ ! -f /home/settings/mapping.yml ]; then \
   wget -c ${MAPPING_URL}/mapping.yml -O /home/settings/mapping.yml
@@ -11,6 +14,14 @@ fi
 if [ ! -f /home/settings/qgis_style.sql ]; then \
   wget -c ${MAPPING_URL}/qgis_style.sql -O /home/settings/qgis_style.sql
 fi
+if [ ! -f /home/settings/post-pbf-import.sql ]; then \
+  url=${MAPPING_URL}/post-pbf-import.sql
+  if curl --output /dev/null --silent --head --fail "${url}"; then
+    wget -c ${MAPPING_URL}/post-pbf-import.sql -O /home/settings/post-pbf-import.sql
+  else
+    echo "URL does not exist: ${url}"
+  fi
+fi
 
 if [[ ! -f /home/settings/clip.geojson && -z ${GEOJSON_URL} ]]; then \
   echo "We are not downloading any Geojson"
@@ -22,14 +33,16 @@ fi
 if [[ ! -f ${CONTINENT_LOCKFILE} && -z ${COUNTRY} ]]; then \
 
   echo "${BASE_URL}/${CONTINENT}-latest.osm.pbf"
-  wget  -c --no-check-certificate ${BASE_URL}/${CONTINENT}-latest.osm.pbf -O /home/settings/country.pbf
+  wget  -c --no-check-certificate ${BASE_URL}/${CONTINENT}-latest.osm.pbf -O /tmp/${CONTINENT}.pbf
+  mv /tmp/$CONTINENT}.pbf /home/settings/country.pbf
   touch ${CONTINENT_LOCKFILE}
 
 
 elif [[ ! -f ${COUNTRY_LOCKFILE} ]]; then
 
   echo "${BASE_URL}/${CONTINENT}/${COUNTRY}-latest.osm.pbf"
-  wget  -c --no-check-certificate ${BASE_URL}/${CONTINENT}/${COUNTRY}-latest.osm.pbf -O /home/settings/country.pbf
+  wget  -c --no-check-certificate ${BASE_URL}/${CONTINENT}/${COUNTRY}-latest.osm.pbf -O /tmp/${COUNTRY}.pbf
+  mv /tmp/${COUNTRY}.pbf /home/settings/country.pbf
   touch ${COUNTRY_LOCKFILE}
 fi