Update github actions & add geojson response option

BritishGeologicalSurvey · Mar 7, 2024 · 65bfc94 · 65bfc94
1 parent f2c4ef3
commit 65bfc94
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/.github/workflows/lint_and_test.yml b/.github/workflows/lint_and_test.yml
@@ -15,10 +15,10 @@ jobs:
 
     steps:
     - name: Checkout source repository
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4
 
     - name: Setup Python
-      uses: actions/setup-python@v4.5.0
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
         architecture: x64

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
 
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -14,11 +14,11 @@ jobs:
         run: |
           git config user.name github-actions[bot]
           git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           key: mkdocs-material-${{ env.cache_id }}
           path: .cache

diff --git a/app/templates/landing_page.html b/app/templates/landing_page.html
@@ -123,12 +123,20 @@ <h4>Future data validation rules: (Coming Soon)</h4>
         <br>
       <fieldset>
           <legend>Select response format:</legend>
-          <input type="radio" id="text" name="fmt" value="text">
-          <label for="text">Plain Text</label>
           <input type="radio" id="json" name="fmt" value="json">
-          <label for="json">JSON</label><br>
+          <label for="json">JSON</label>
+          <input type="radio" id="text" name="fmt" value="text">
+          <label for="text">Plain Text</label><br>
       </fieldset>
         <br>
+        <fieldset>
+          <legend>If HTML show LOCA features on a map / If JSON include GeoJSON</legend>
+          <input type="radio" id="return_geometry" name="return_geometry" value="true" checked="checked">
+          <label for="true">Yes</label>
+          <input type="radio" id="return_geometry" name="return_geometry" value="false">
+          <label for="false">No</label><br>
+      </fieldset>  
+        <br>
       <fieldset>
           <legend>Select .ags / .AGS file(s) for validation (v4.x only) <b>(50 Mb Maximum)</b></legend>
           <input name="files" type="file" multiple>
@@ -165,15 +173,15 @@ <h2>AGS Converter</h2>
   <br>
   <form action="/convert/" enctype="multipart/form-data" method="post" id="convertForm">
     <fieldset>
-      <legend>Sort worksheets in .xlsx file using sorting strategy<strong>(Warning: .ags to .xlsx only. The original group order will be lost)</strong></legend>
+      <legend>Sort worksheets in .xlsx file using a sorting strategy <strong>(Warning: .ags to .xlsx only. The original group order will be lost)</strong></legend>
+      <input type="radio" id="default" name="sort_tables" value="default" checked="checked">
+      <label for="default">None (Maintain Input File Order)</label><br>
       <input type="radio" id="dictionary" name="sort_tables" value="dictionary">
-      <label for="dictionary">Dictionary</label>
+      <label for="dictionary">File Dictionary</label><br>
       <input type="radio" id="alphabetical" name="sort_tables" value="alphabetical">
-      <label for="alphabetical">Alphabetical</label>
+      <label for="alphabetical">Alphabetical</label><br>
       <input type="radio" id="hierarchical" name="sort_tables" value="hierarchical">
-      <label for="hierarchical">Hierarchical</label>
-      <input type="radio" id="default" name="sort_tables" value="default" checked>
-      <label for="default">None (Maintain Input File Order)</label><br>
+      <label for="hierarchical">AGS Standard Hierarchy</label><br>
     </fieldset>
     <br>
     <fieldset>