Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update github actions & add geojson response option #140

Closed
wants to merge 1 commit into from
Closed

Update github actions & add geojson response option #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 17 additions & 9 deletions app/templates/landing_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down