Merge pull request kubilus1#14 from jonaseberle/feat/use-sonny-lidar-dtm

Add Iceland, Faroe and Svalbard/Spitsbergen, use Sonny's LiDAR
jonaseberle · Jul 30, 2023 · fef336e · fef336e
2 parents 245fc37 + 25d677a
commit fef336e
Show file tree

Hide file tree

Showing 12 changed files with 409 additions and 605 deletions.
diff --git a/.github/workflows/build-tiles.yml b/.github/workflows/build-tiles.yml
@@ -1,4 +1,4 @@
-name: Test
+name: Build one .zip (and upload) (sub-workflow)
 
 on:
   workflow_call:
@@ -22,6 +22,7 @@ jobs:
     env:
       DEBIAN_FRONTEND: noninteractive
       TZ: America/NewYork
+      GH_TOKEN: ${{ github.token }}
 
     runs-on: ubuntu-22.04
 
@@ -44,19 +45,16 @@ jobs:
           TILENAME=${{ inputs.setname }} make -f Makefile.tiles ${{ inputs.setname }}_tile_list_chunks
           TILENAME=${{ inputs.setname }} make -n -f Makefile.tiles ${{ inputs.zip }}
 
-      - name: Setup Ortho4XP
-        run: make Ortho4XP
-
       - name: Build
         id: build
         run: |
           TILENAME=${{ inputs.setname }} make -f Makefile.tiles ${{ inputs.setname }}_tile_list_chunks
-          TILENAME=${{ inputs.setname }} timeout 300m make -f Makefile.tiles ${{ inputs.zip }} && echo "done=true" >> "$GITHUB_OUTPUT" || echo "done=false" >> "$GITHUB_OUTPUT"
+          TILENAME=${{ inputs.setname }} timeout 300m make -f Makefile.tiles ${{ inputs.zip }}.info && echo "done=true" >> "$GITHUB_OUTPUT" || echo "done=false" >> "$GITHUB_OUTPUT"
+          TILENAME=${{ inputs.tileset }} make -f Makefile.tiles ${{ inputs.zip }}.sha256
           
       - name: Show work
         if: steps.build.outputs.done == 'true'
         run: |
-          TILENAME=${{ inputs.tileset }} make -f Makefile.tiles ${{ inputs.zip }}.sha256
           echo '### ${{ inputs.tileset }} : ${{ inputs.zip }}' >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
           #unzip -l ${{ inputs.zip }} *.dsf >> $GITHUB_STEP_SUMMARY
@@ -91,6 +89,10 @@ jobs:
     if: needs.build.outputs.done == 'false'
     needs: build
     runs-on: ubuntu-22.04
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      TZ: America/NewYork
+      GH_TOKEN: ${{ github.token }}
 
     outputs:
       done: ${{ steps.rebuild.outputs.done }}
@@ -120,12 +122,12 @@ jobs:
         id: rebuild
         run: |
           TILENAME=${{ inputs.setname }} make -f Makefile.tiles ${{ inputs.setname }}_tile_list_chunks
-          TILENAME=${{ inputs.setname }} timeout 300m make -f Makefile.tiles ${{ inputs.zip }} && echo "done=true" >> "$GITHUB_OUTPUT" || echo "done=false" >> "$GITHUB_OUTPUT"
+          TILENAME=${{ inputs.setname }} timeout 300m make -f Makefile.tiles ${{ inputs.zip }}.info && echo "done=true" >> "$GITHUB_OUTPUT" || echo "done=false" >> "$GITHUB_OUTPUT"
+          TILENAME=${{ inputs.tileset }} make -f Makefile.tiles ${{ inputs.zip }}.sha256
           
       - name: Show work
         if: steps.rebuild.outputs.done == 'true'
         run: |
-          TILENAME=${{ inputs.tileset }} make -f Makefile.tiles ${{ inputs.zip }}.sha256
           echo '### ${{ inputs.tileset }} : ${{ inputs.zip }}' >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
           #unzip -l ${{ inputs.zip }} *.dsf >> $GITHUB_STEP_SUMMARY
@@ -160,6 +162,10 @@ jobs:
     if: needs.rebuild.outputs.done == 'false'
     needs: rerun
     runs-on: ubuntu-22.04
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      TZ: America/NewYork
+      GH_TOKEN: ${{ github.token }}
 
     outputs:
       done: ${{ steps.rebuild.outputs.done }}
@@ -189,12 +195,12 @@ jobs:
         id: rebuild
         run: |
           TILENAME=${{ inputs.setname }} make -f Makefile.tiles ${{ inputs.setname }}_tile_list_chunks
-          TILENAME=${{ inputs.setname }} timeout 300m make -f Makefile.tiles ${{ inputs.zip }} && echo "done=true" >> "$GITHUB_OUTPUT" || echo "done=false" >> "$GITHUB_OUTPUT"
+          TILENAME=${{ inputs.setname }} timeout 300m make -f Makefile.tiles ${{ inputs.zip }}.info && echo "done=true" >> "$GITHUB_OUTPUT" || echo "done=false" >> "$GITHUB_OUTPUT"
+          TILENAME=${{ inputs.tileset }} make -f Makefile.tiles ${{ inputs.zip }}.sha256
           
       - name: Show work
         if: steps.rebuild.outputs.done == 'true'
         run: |
-          TILENAME=${{ inputs.tileset }} make -f Makefile.tiles ${{ inputs.zip }}.sha256
           echo '### ${{ inputs.tileset }} : ${{ inputs.zip }}' >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
           #unzip -l ${{ inputs.zip }} *.dsf >> $GITHUB_STEP_SUMMARY

diff --git a/.github/workflows/push-main.yml b/.github/workflows/push-main.yml
@@ -1,4 +1,4 @@
-name: Main
+name: Build tileset (and upload)
 
 on: 
   workflow_dispatch:
@@ -24,6 +24,10 @@ on:
 jobs:
   ziplist:
     runs-on: ubuntu-22.04
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      TZ: America/NewYork
+      GH_TOKEN: ${{ github.token }}
     outputs:
       chunks: ${{ steps.chunks.outputs.chunks }}
     steps:
@@ -44,6 +48,8 @@ jobs:
 
     strategy:
       matrix: ${{ fromJSON(needs.ziplist.outputs.chunks) }}
+      # might still need several restarts of failed jobs, but prevents us from losing successful work
+      fail-fast: false
 
     uses: ./.github/workflows/build-tiles.yml
     with:
@@ -59,6 +65,10 @@ jobs:
     environment: release
 
     runs-on: ubuntu-22.04
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      TZ: America/NewYork
+      GH_TOKEN: ${{ github.token }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/run-one-tile.yml b/.github/workflows/run-one-tile.yml
@@ -0,0 +1,41 @@
+name: Build one tile (and create artifact)
+
+on:
+  workflow_dispatch:
+    inputs:
+      tile:
+        type: string
+        default: '+62-008'
+
+jobs:
+  build:
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      TZ: America/NewYork
+      GH_TOKEN: ${{ github.token }}
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install reqs
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python3 python3-pip python3-tk zip libgeos-dev
+          python3 -m pip install -r requirements.txt
+          make --version
+
+      - name: Build
+        id: build
+        run: |
+          timeout 20m make -f Makefile.tiles z_aosingle_${{ inputs.tile }}.zip
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: z_aosingle_${{ inputs.tile }}.zip
+          path: ./z_aosingle_${{ inputs.tile }}.zip
+          retention-days: 2
+
diff --git a/.github/workflows/run-one.yml b/.github/workflows/run-one.yml
@@ -1,4 +1,4 @@
-name: Run one
+name: Build one .zip (and upload)
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/test-main.yml b/.github/workflows/test-main.yml
@@ -1,11 +1,15 @@
-name: Test
+name: Build test tileset
 
 on:
   push:
 
 jobs:
   ziplist:
     runs-on: ubuntu-22.04
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      TZ: America/NewYork
+      GH_TOKEN: ${{ github.token }}
     outputs:
       chunks: ${{ steps.chunks.outputs.chunks }}
     steps:

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,7 @@
 *.swp
 Ortho4XP
 *_tile_list.*
+/var/
+/.venv/
+/z_*_*/
+/z_*_*.zip
diff --git a/Makefile b/Makefile