From eed89226d6eb4f8301e91947fac46f36cca59b9a Mon Sep 17 00:00:00 2001
From: KoalaGeo <eddlewis85@gmail.com>
Date: Thu, 7 Mar 2024 10:14:18 +0000
Subject: [PATCH 1/5] Add geojson response option

---
 app/templates/landing_page.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/templates/landing_page.html b/app/templates/landing_page.html
index 8d9098b..1cef08e 100644
--- a/app/templates/landing_page.html
+++ b/app/templates/landing_page.html
@@ -127,6 +127,8 @@ <h4>Future data validation rules: (Coming Soon)</h4>
           <label for="text">Plain Text</label>
           <input type="radio" id="json" name="fmt" value="json">
           <label for="json">JSON</label><br>
+          <input type="checkbox" id="return_geometry" name="return_geometry" value="true" checked>
+          <label for="bgs_validate">If HTML show LOCA features on a map / If JSON include GeoJSON</label><br>
       </fieldset>
         <br>
       <fieldset>
@@ -165,13 +167,13 @@ <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="dictionary" name="sort_tables" value="dictionary">
-      <label for="dictionary">Dictionary</label>
+      <label for="dictionary">File Dictionary</label>
       <input type="radio" id="alphabetical" name="sort_tables" value="alphabetical">
       <label for="alphabetical">Alphabetical</label>
       <input type="radio" id="hierarchical" name="sort_tables" value="hierarchical">
-      <label for="hierarchical">Hierarchical</label>
+      <label for="hierarchical">AGS Standard Hierarchy</label>
       <input type="radio" id="default" name="sort_tables" value="default" checked>
       <label for="default">None (Maintain Input File Order)</label><br>
     </fieldset>

From d58a8cc4a25cf498bde50a4c007bc287fb48c704 Mon Sep 17 00:00:00 2001
From: KoalaGeo <eddlewis85@gmail.com>
Date: Thu, 7 Mar 2024 10:21:58 +0000
Subject: [PATCH 2/5] Update GitHub Actions Versions

---
 .github/workflows/lint_and_test.yml | 6 +++---
 .github/workflows/main.yml          | 2 +-
 .github/workflows/pages.yml         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/lint_and_test.yml b/.github/workflows/lint_and_test.yml
index ed8d822..91e0775 100644
--- a/.github/workflows/lint_and_test.yml
+++ b/.github/workflows/lint_and_test.yml
@@ -15,12 +15,12 @@ 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
+        python-version: 3.12
         architecture: x64
 
     - name: Ensure Nexus mirror configuration is not committed
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0aadcbb..9523348 100644
--- 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
index 2c651d1..32c2483 100644
--- 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

From 9e6ba29f594552dc06077fe5c1c9daa9f71badd3 Mon Sep 17 00:00:00 2001
From: KoalaGeo <eddlewis85@gmail.com>
Date: Thu, 7 Mar 2024 10:22:48 +0000
Subject: [PATCH 3/5] Python version 3.11 in actions

---
 .github/workflows/lint_and_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_test.yml b/.github/workflows/lint_and_test.yml
index 91e0775..dc8caf4 100644
--- a/.github/workflows/lint_and_test.yml
+++ b/.github/workflows/lint_and_test.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.12
+        python-version: 3.11
         architecture: x64
 
     - name: Ensure Nexus mirror configuration is not committed

From 4c7a57ef1c62816f6b297781745add4dbad24955 Mon Sep 17 00:00:00 2001
From: KoalaGeo <eddlewis85@gmail.com>
Date: Thu, 7 Mar 2024 10:28:51 +0000
Subject: [PATCH 4/5] Add default selection for sorting strategy

---
 app/templates/landing_page.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/landing_page.html b/app/templates/landing_page.html
index 1cef08e..0c0d0c2 100644
--- a/app/templates/landing_page.html
+++ b/app/templates/landing_page.html
@@ -168,14 +168,14 @@ <h2>AGS Converter</h2>
   <form action="/convert/" enctype="multipart/form-data" method="post" id="convertForm">
     <fieldset>
       <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">File Dictionary</label>
       <input type="radio" id="alphabetical" name="sort_tables" value="alphabetical">
       <label for="alphabetical">Alphabetical</label>
       <input type="radio" id="hierarchical" name="sort_tables" value="hierarchical">
       <label for="hierarchical">AGS Standard Hierarchy</label>
-      <input type="radio" id="default" name="sort_tables" value="default" checked>
-      <label for="default">None (Maintain Input File Order)</label><br>
     </fieldset>
     <br>
     <fieldset>

From fb4b41151c55d64661d75b4ffdc430772870acd6 Mon Sep 17 00:00:00 2001
From: KoalaGeo <eddlewis85@gmail.com>
Date: Thu, 7 Mar 2024 10:42:25 +0000
Subject: [PATCH 5/5] Format Text

---
 app/templates/landing_page.html | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/templates/landing_page.html b/app/templates/landing_page.html
index 0c0d0c2..13e4201 100644
--- a/app/templates/landing_page.html
+++ b/app/templates/landing_page.html
@@ -123,14 +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>
-          <input type="checkbox" id="return_geometry" name="return_geometry" value="true" checked>
-          <label for="bgs_validate">If HTML show LOCA features on a map / If JSON include GeoJSON</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>
@@ -171,11 +177,11 @@ <h2>AGS Converter</h2>
       <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">File 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">AGS Standard Hierarchy</label>
+      <label for="hierarchical">AGS Standard Hierarchy</label><br>
     </fieldset>
     <br>
     <fieldset>