fix: repair spatial import for non-nested ZIP files

geops · Apr 27, 2020 · faa02a6 · faa02a6
1 parent 90d3730
commit faa02a6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/data/spatial/1-import.sh b/lib/data/spatial/1-import.sh
@@ -8,13 +8,13 @@ _import () {
         cd /data/spatial
         wget --no-check-certificate "${URL}" -O "${TARGET}.zip"
         7z x -aoa -o"${TARGET}" "${TARGET}.zip"
-        if [ -f "/data/spatial/${TARGET}/${TARGET}.zip" ]; then
-            7z x -aoa -o"${TARGET}" "${TARGET}/${TARGET}.zip"
-            rm "${TARGET}/${ZIPFILE}.zip"
-        fi
         cd ${TARGET}
-        #mv ${TARGET}/${SHPFILE}.* .
-        rm "${TARGET}.zip"
+        if [ -f "/data/spatial/${TARGET}/${ZIPFILE}/${SHPFILE}.shp" ]; then
+            mv ${ZIPFILE}/${SHPFILE}.* .
+        else
+            7z x -aoa -o"." "${ZIPFILE}.zip"
+            rm "${ZIPFILE}.zip"
+        fi
         rename "s/${SHPFILE}/${TARGET}/" ${SHPFILE}.*
     else
         echo "$TARGET already downloaded! Will be reused ..."