mirror of
https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer.git
synced 2026-10-15 07:07:38 +02:00
Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2ab3ace310 | ||
|
|
27a0f4e9ea | ||
|
|
f4ad402f52 | ||
|
|
2fdbb15001 | ||
|
|
8248d1bcae | ||
|
|
abb06b9858 | ||
|
|
e84ee8e543 | ||
|
|
66532c108b | ||
|
|
86da8b9cf4 | ||
|
|
a95831f180 |
No files matched your search
@@ -1,171 +0,0 @@
|
|||||||
name: Code Quality
|
|
||||||
|
|
||||||
# Pouští při každém PR tytéž kontroly, které se dosud dělaly ručně:
|
|
||||||
#
|
|
||||||
# * co spouští plugins.qgis.org při uploadu (bandit, detect-secrets,
|
|
||||||
# flake8, analýza souborů) – https://plugins.qgis.org/docs/security-scanning
|
|
||||||
# * oficiální kontrolu kompatibility s Qt6 (pyqgis4-checker)
|
|
||||||
# * skutečné načtení pluginu v QGIS 3.44 (Qt5) i v QGIS 4 (Qt6)
|
|
||||||
# * sestavení ZIPu, který si recenzent stáhne a nainstaluje přímo z PR
|
|
||||||
#
|
|
||||||
# CodeQL a GitGuardian běží zvlášť, nastavené na úrovni organizace –
|
|
||||||
# tady se schválně neduplikují.
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
env:
|
|
||||||
# Verze se drží napevno, aby se výsledek nezměnil sám od sebe. Výchozí
|
|
||||||
# sada pravidel ruffu se mezi verzemi mění; povýšení je vědomý krok.
|
|
||||||
BANDIT: bandit==1.9.4
|
|
||||||
DETECT_SECRETS: detect-secrets==1.5.0
|
|
||||||
FLAKE8: flake8==7.3.0
|
|
||||||
RUFF: ruff==0.16.5
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
# --------------------------------------------------------------------
|
|
||||||
# 1. Statické kontroly – běží první, protože trvají desítky sekund
|
|
||||||
# --------------------------------------------------------------------
|
|
||||||
lint:
|
|
||||||
name: Lint a bezpečnost
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
|
|
||||||
with:
|
|
||||||
python-version: '3.12'
|
|
||||||
|
|
||||||
- name: Install tools
|
|
||||||
run: pip install "$BANDIT" "$DETECT_SECRETS" "$FLAKE8" "$RUFF"
|
|
||||||
|
|
||||||
# Hygiena repozitáře: BOM, přímé importy z PyQt5/PyQt6, spustitelná
|
|
||||||
# práva a podezřelé typy souborů. Padá jako první, protože BOM
|
|
||||||
# zneviditelní soubor pro kontrolu níž.
|
|
||||||
- name: Source hygiene
|
|
||||||
run: python3 tests/check_sources.py
|
|
||||||
|
|
||||||
# Blokující kontrola na plugins.qgis.org
|
|
||||||
- name: Bandit
|
|
||||||
run: bandit -r amcr_viewer/
|
|
||||||
|
|
||||||
# Blokující kontrola na plugins.qgis.org.
|
|
||||||
# --all-files je podstatné: bez něj detect-secrets prohledá jen
|
|
||||||
# soubory sledované gitem a nesledovaný soubor tiše přeskočí.
|
|
||||||
- name: detect-secrets
|
|
||||||
run: |
|
|
||||||
detect-secrets scan --all-files amcr_viewer/ > vysledek.json
|
|
||||||
python3 -c "
|
|
||||||
import json, sys
|
|
||||||
nalezy = json.load(open('vysledek.json'))['results']
|
|
||||||
if nalezy:
|
|
||||||
print(json.dumps(nalezy, indent=2))
|
|
||||||
sys.exit(1)
|
|
||||||
print('detect-secrets: bez nálezů')
|
|
||||||
"
|
|
||||||
|
|
||||||
# Na plugins.qgis.org je informativní, tady blokuje – konfigurace
|
|
||||||
# v amcr_viewer/.flake8 je stejná pro obě místa.
|
|
||||||
- name: Flake8
|
|
||||||
run: flake8 --config amcr_viewer/.flake8 amcr_viewer/
|
|
||||||
|
|
||||||
# Nad rámec plugins.qgis.org; konfigurace v pyproject.toml
|
|
||||||
- name: Ruff
|
|
||||||
run: ruff check .
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------
|
|
||||||
# 2. Kompatibilita s Qt6 – oficiální skript z QGISu
|
|
||||||
# --------------------------------------------------------------------
|
|
||||||
qt6:
|
|
||||||
name: Kompatibilita s Qt6
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
|
||||||
|
|
||||||
# Pozor: skript končí kódem 0 i když něco najde, výsledek je jen
|
|
||||||
# v logu. Prázdný log (samotná hlavička) znamená čisto.
|
|
||||||
- name: pyqgis4-checker
|
|
||||||
run: |
|
|
||||||
docker run --rm --user "$(id -u):$(id -g)" \
|
|
||||||
--workdir /workspace/ -v "$PWD:/workspace/" \
|
|
||||||
ghcr.io/qgis/pyqgis4-checker:main-ubuntu \
|
|
||||||
pyqt5_to_pyqt6.py --dry_run --logfile /workspace/pyqt6_checker.log .
|
|
||||||
echo "--- pyqt6_checker.log ---"
|
|
||||||
cat pyqt6_checker.log
|
|
||||||
nalezu=$(grep -v '=== dry_run mode | Start Logs ===' pyqt6_checker.log | wc -l)
|
|
||||||
if [ "$nalezu" -ne 0 ]; then
|
|
||||||
echo "::error::pyqgis4-checker nahlásil nálezy, viz log výše"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------
|
|
||||||
# 3. Načtení pluginu ve skutečném QGIS, v obou podporovaných verzích
|
|
||||||
# --------------------------------------------------------------------
|
|
||||||
qgis:
|
|
||||||
name: Smoke test (QGIS ${{ matrix.qgis }})
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
# ltr = 3.44 na Qt5, stable = 4.x na Qt6. Tagy se posouvají
|
|
||||||
# schválně: chceme vědět, že plugin drží krok s aktuálním QGISem.
|
|
||||||
qgis: [ltr, stable]
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
|
||||||
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
docker run --rm -v "$PWD:/work:ro" -w /work \
|
|
||||||
--user "$(id -u):$(id -g)" -e HOME=/tmp \
|
|
||||||
"qgis/qgis:${{ matrix.qgis }}" python3 tests/smoke_test.py
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------
|
|
||||||
# 4. ZIP k instalaci – stejný postup jako v release_plugin.yml
|
|
||||||
# --------------------------------------------------------------------
|
|
||||||
package:
|
|
||||||
name: Balíček pluginu
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
|
||||||
|
|
||||||
- name: Zip plugin
|
|
||||||
run: zip -r amcr_viewer.zip amcr_viewer -x "*.git*"
|
|
||||||
|
|
||||||
# Kontrola obsahu ZIPu. Config soubory pro scanner musí být uvnitř
|
|
||||||
# vedle metadata.txt, jinak je plugins.qgis.org nenajde – a některé
|
|
||||||
# nástroje skryté soubory tiše vynechávají.
|
|
||||||
- name: Verify archive contents
|
|
||||||
run: |
|
|
||||||
unzip -l amcr_viewer.zip
|
|
||||||
for soubor in amcr_viewer/metadata.txt amcr_viewer/__init__.py \
|
|
||||||
amcr_viewer/.flake8; do
|
|
||||||
unzip -l amcr_viewer.zip | grep -qF " $soubor" \
|
|
||||||
|| { echo "::error::v ZIPu chybí $soubor"; exit 1; }
|
|
||||||
done
|
|
||||||
if unzip -l amcr_viewer.zip | grep -qE '\.git'; then
|
|
||||||
echo "::error::v ZIPu jsou git soubory"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
|
|
||||||
with:
|
|
||||||
name: amcr_viewer-plugin
|
|
||||||
path: amcr_viewer.zip
|
|
||||||
if-no-files-found: error
|
|
||||||
@@ -1,26 +1,15 @@
|
|||||||
name: Release QGIS Plugin
|
name: Release QGIS Plugin
|
||||||
|
|
||||||
# Spouští se na push tagu, ne na publikaci releasu. Organizace má zapnuté
|
|
||||||
# immutable releases: k už publikovanému releasu nelze nic přiložit, příloha
|
|
||||||
# tedy musí vzniknout dřív, než se release zveřejní. Workflow proto založí
|
|
||||||
# koncept releasu i se ZIPem; text se dopisuje a publikuje ručně.
|
|
||||||
#
|
|
||||||
# Pozor: workflow se čte z commitu, na který tag ukazuje. Tag musí být
|
|
||||||
# založen až na commitu, který tento soubor obsahuje.
|
|
||||||
on:
|
on:
|
||||||
push:
|
release:
|
||||||
tags:
|
types: [published]
|
||||||
- 'v*'
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-release:
|
build-and-release:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# 1. Stáhne kód z tagu, který běh spustil
|
# 1. Stáhne kód z repozitáře
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||||
|
|
||||||
@@ -31,14 +20,11 @@ jobs:
|
|||||||
# -r = rekurzivně, -x = ignorovat skryté git soubory
|
# -r = rekurzivně, -x = ignorovat skryté git soubory
|
||||||
zip -r amcr_viewer.zip amcr_viewer -x "*.git*"
|
zip -r amcr_viewer.zip amcr_viewer -x "*.git*"
|
||||||
|
|
||||||
# 3. Založí koncept releasu i s přílohou
|
# 3. Nahraje ZIP k Releasu
|
||||||
# Tagy s pomlčkou (v2.0.0-alpha.1) se označí jako pre-release.
|
- name: Upload Release Asset
|
||||||
- name: Create draft release with asset
|
|
||||||
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
|
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
|
||||||
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
with:
|
with:
|
||||||
files: amcr_viewer.zip
|
files: amcr_viewer.zip
|
||||||
draft: true
|
|
||||||
name: AMCR Viewer ${{ github.ref_name }}
|
|
||||||
prerelease: ${{ contains(github.ref_name, '-') }}
|
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -83,58 +83,6 @@ Další pravidla:
|
|||||||
definice pole (`QgsField`), naplnění hodnoty z dokumentu, překlad hlavičky
|
definice pole (`QgsField`), naplnění hodnoty z dokumentu, překlad hlavičky
|
||||||
sloupce a export atributů.
|
sloupce a export atributů.
|
||||||
|
|
||||||
### Kompatibilita s Qt6 / QGIS 4
|
|
||||||
|
|
||||||
Plugin cílí na QGIS 3.44 i na QGIS 4 (`qgisMaximumVersion=4.99.0`), tedy na
|
|
||||||
Qt5 i Qt6 zároveň. **Tohle se drží rigorózně** – ne až před releasem, ale při
|
|
||||||
každé změně kódu. Chování obou větví se liší tiše: pod Qt5 projde i to, co
|
|
||||||
QGIS 4 odmítne, takže lokální „funguje mi to“ nic nedokazuje.
|
|
||||||
|
|
||||||
Závazná pravidla:
|
|
||||||
|
|
||||||
- **Nikdy neimportuj přímo z `PyQt5` ani z `PyQt6`.** Vždy přes shim
|
|
||||||
`qgis.PyQt.*`. Ten mimo jiné pod Qt6 přetahuje `QAction`, `QActionGroup`
|
|
||||||
a `QShortcut` z `QtGui`, takže import z `qgis.PyQt.QtWidgets` je správně.
|
|
||||||
- **Enumy vždy plně kvalifikované (scoped).** `Qgis.MessageLevel.Info`, ne
|
|
||||||
`Qgis.Info`; `QgsTask.Flag.CanCancel`, ne `QgsTask.CanCancel`;
|
|
||||||
`QgsWkbTypes.GeometryType.PointGeometry`, ne `QgsWkbTypes.PointGeometry`.
|
|
||||||
Totéž pro Qt: `Qt.CheckState.Checked`, `QDialogButtonBox.StandardButton.Ok`.
|
|
||||||
Zkrácené tvary sice v QGIS 4.2 zatím fungují, ale oficiální kontrola je
|
|
||||||
hlásí a do budoucna mizí.
|
|
||||||
- **Zdrojové `.py` soubory ukládej bez BOM.** Kontrolní skript čte soubor
|
|
||||||
jako UTF-8 bez `utf-8-sig` a na BOM spadne s
|
|
||||||
`SyntaxError: invalid non-printable character U+FEFF`, takže se takový
|
|
||||||
soubor **vůbec nezkontroluje**. (`codelists/heslar.csv` BOM mít smí, tam je
|
|
||||||
kvůli Excelu.)
|
|
||||||
- Nepoužívej API zrušená v Qt6: `exec_()`, `QRegExp`, `QDesktopWidget`,
|
|
||||||
`QApplication.desktop()`, `Qt.MidButton`, `QFontMetrics.width()`,
|
|
||||||
`setResizeMode`, atributy `AA_EnableHighDpiScaling` / `AA_UseHighDpiPixmaps`.
|
|
||||||
- `supportsQt6=True` v `metadata.txt` **nepatří** – bylo zrušeno; o zařazení
|
|
||||||
mezi „QGIS 4 Ready“ rozhoduje rozsah `qgisMinimumVersion` až
|
|
||||||
`qgisMaximumVersion`.
|
|
||||||
|
|
||||||
Ověření před PR, který mění Python kód:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
# oficiální kontrola, kterou pouští i plugins.qgis.org (pyqgis4-checker)
|
|
||||||
docker run --rm --pull always --user $(id -u):$(id -g) \
|
|
||||||
--workdir /workspace/ -v "$(pwd):/workspace/" \
|
|
||||||
ghcr.io/qgis/pyqgis4-checker:main-ubuntu \
|
|
||||||
pyqt5_to_pyqt6.py --dry_run --logfile /workspace/pyqt6_checker.log .
|
|
||||||
```
|
|
||||||
|
|
||||||
Prázdný log = čisté. Kontrola je na plugins.qgis.org informativní
|
|
||||||
(neblokuje schválení), ale nález znamená, že plugin v QGIS 4 dříve nebo
|
|
||||||
později přestane fungovat.
|
|
||||||
|
|
||||||
Když je po ruce QGIS 4 (např. flatpak `org.qgis.qgis`), ověř navíc, že se
|
|
||||||
plugin pod Qt6 opravdu načte:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
flatpak run --command=sh org.qgis.qgis -c \
|
|
||||||
'PYTHONPATH=/app/share/qgis/python python3 -c "import qgis.core"'
|
|
||||||
```
|
|
||||||
|
|
||||||
## Verzování a release
|
## Verzování a release
|
||||||
|
|
||||||
- Verze pluginu žije v **`amcr_viewer/metadata.txt`** (`version=`).
|
- Verze pluginu žije v **`amcr_viewer/metadata.txt`** (`version=`).
|
||||||
@@ -142,16 +90,10 @@ flatpak run --command=sh org.qgis.qgis -c \
|
|||||||
`changelog=` v `metadata.txt` (formát `vX.Y.Z (RRRR-MM-DD)` + odrážky).
|
`changelog=` v `metadata.txt` (formát `vX.Y.Z (RRRR-MM-DD)` + odrážky).
|
||||||
- Datum v changelogu ber z **deterministického zdroje**, ne z paměti, např.
|
- Datum v changelogu ber z **deterministického zdroje**, ne z paměti, např.
|
||||||
`python -c "import datetime; print(datetime.date.today().isoformat())"`.
|
`python -c "import datetime; print(datetime.date.today().isoformat())"`.
|
||||||
- Release se spouští **pushnutím tagu `vX.Y.Z`**, ne publikací releasu
|
- Release se vytváří publikací GitHub Release; workflow
|
||||||
v UI. Workflow `.github/workflows/release_plugin.yml` zabalí složku
|
`.github/workflows/release_plugin.yml` zabalí složku `amcr_viewer/` do
|
||||||
`amcr_viewer/` do `amcr_viewer.zip` a založí **koncept** releasu i s touto
|
`amcr_viewer.zip` a přiloží ji k releasu. Do ZIPu se nesmí dostat `.git*`
|
||||||
přílohou; text se dopíše a release zveřejní ručně. Do ZIPu se nesmí dostat
|
soubory.
|
||||||
`.git*` soubory.
|
|
||||||
- Organizace má zapnuté **immutable releases** – k publikovanému releasu už
|
|
||||||
nelze nic přiložit. Proto příloha vzniká na konceptu, ještě před
|
|
||||||
zveřejněním; workflow spouštěný na `release: published` by vždy selhal.
|
|
||||||
- Workflow se čte z commitu, na který **tag ukazuje**. Tag proto zakládej až
|
|
||||||
na commitu, který obsahuje aktuální podobu workflow – jinak se nespustí nic.
|
|
||||||
|
|
||||||
## Pull requesty
|
## Pull requesty
|
||||||
|
|
||||||
@@ -176,57 +118,5 @@ flatpak run --command=sh org.qgis.qgis -c \
|
|||||||
|
|
||||||
Plugin se testuje načtením do QGIS (Plugins → Manage and Install Plugins →
|
Plugin se testuje načtením do QGIS (Plugins → Manage and Install Plugins →
|
||||||
Install from ZIP, nebo nasazením složky `amcr_viewer/` do adresáře pluginů
|
Install from ZIP, nebo nasazením složky `amcr_viewer/` do adresáře pluginů
|
||||||
QGIS). **Ruční test v QGIS nic nenahrazuje** – automatické kontroly ověřují,
|
QGIS). Automatizované testy zatím repozitář neobsahuje – změny ověřuj ručně
|
||||||
že se plugin načte a že projde kontrolami kvality, ne že dělá správnou věc.
|
v QGIS na podporované verzi.
|
||||||
|
|
||||||
### Automatické kontroly
|
|
||||||
|
|
||||||
Workflow `.github/workflows/code_quality.yml` pouští při každém PR do `main`
|
|
||||||
tohle:
|
|
||||||
|
|
||||||
| job | co dělá |
|
|
||||||
|---|---|
|
|
||||||
| **Lint a bezpečnost** | `check_sources.py`, bandit, detect-secrets, flake8, ruff |
|
|
||||||
| **Kompatibilita s Qt6** | `pyqgis4-checker` v dockeru |
|
|
||||||
| **Smoke test** | `smoke_test.py` v `qgis/qgis:ltr` i `qgis/qgis:stable` |
|
|
||||||
| **Balíček pluginu** | sestaví ZIP, ověří obsah, přiloží jako artefakt |
|
|
||||||
|
|
||||||
Smoke test běží v obou podporovaných řadách: `ltr` je QGIS 3.44 na Qt5,
|
|
||||||
`stable` je QGIS 4.x na Qt6.
|
|
||||||
|
|
||||||
Artefakt z posledního jobu se dá stáhnout ze stránky běhu a rovnou
|
|
||||||
nainstalovat přes *Install from ZIP* – recenzent nemusí nic balit ručně.
|
|
||||||
|
|
||||||
Totéž lokálně:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
pip install bandit detect-secrets flake8 ruff
|
|
||||||
|
|
||||||
python3 tests/check_sources.py
|
|
||||||
bandit -r amcr_viewer/
|
|
||||||
detect-secrets scan --all-files amcr_viewer/
|
|
||||||
flake8 --config amcr_viewer/.flake8 amcr_viewer/
|
|
||||||
ruff check .
|
|
||||||
|
|
||||||
# smoke test v obou verzích QGIS (docker, bez instalace čehokoli)
|
|
||||||
for tag in ltr stable; do
|
|
||||||
docker run --rm -v "$PWD:/work:ro" -w /work \
|
|
||||||
--user "$(id -u):$(id -g)" -e HOME=/tmp \
|
|
||||||
"qgis/qgis:$tag" python3 tests/smoke_test.py
|
|
||||||
done
|
|
||||||
```
|
|
||||||
|
|
||||||
Na co si dát pozor:
|
|
||||||
|
|
||||||
- **`pyqgis4-checker` končí kódem 0, i když něco najde** – výsledek je jen
|
|
||||||
v logu. Workflow proto kontroluje, že log obsahuje jen hlavičku.
|
|
||||||
- **`detect-secrets` bez `--all-files` prohledá jen soubory sledované
|
|
||||||
gitem** a o nesledovaném souboru mlčí. Vypadá to jako čistý výsledek.
|
|
||||||
- **Konfigurace lintů je rozdělená schválně.** `amcr_viewer/.flake8` leží
|
|
||||||
vedle `metadata.txt`, protože scanner na plugins.qgis.org hledá config
|
|
||||||
soubory jen v kořeni balíčku uvnitř ZIPu; díky tomu platí stejná pravidla
|
|
||||||
v CI, lokálně i při uploadu. Konfigurace ruffu je naopak v kořenovém
|
|
||||||
`pyproject.toml` – ruff se do balíčku pluginu nedistribuuje.
|
|
||||||
Viz https://plugins.qgis.org/docs/security-scanning/config-files
|
|
||||||
- **Verze nástrojů jsou v workflow napevno.** Výchozí sada pravidel ruffu se
|
|
||||||
mezi verzemi mění, takže bez pinu by CI začalo padat samo od sebe.
|
|
||||||
+2
-2
@@ -25,5 +25,5 @@ abstract: >-
|
|||||||
the Digital archive of the Archaeological Map of the
|
the Digital archive of the Archaeological Map of the
|
||||||
Czech Republic (https://digiarchiv.aiscr.cz/).
|
Czech Republic (https://digiarchiv.aiscr.cz/).
|
||||||
license: GPL-3.0
|
license: GPL-3.0
|
||||||
version: '2.1.2'
|
version: '2.0.0'
|
||||||
date-released: '2026-09-01'
|
date-released: '2026-06-05'
|
||||||
@@ -1 +1,6 @@
|
|||||||
@AGENTS.md
|
# CLAUDE.md
|
||||||
|
|
||||||
|
Pokyny pro tento repozitář jsou v [`AGENTS.md`](./AGENTS.md).
|
||||||
|
|
||||||
|
Tento soubor je záměrně jen odkaz, aby existoval jeden zdroj pravdy a obsah se
|
||||||
|
nerozjel. Cokoli platí pro AI agenty v tomto projektu, najdeš v `AGENTS.md`.
|
||||||
@@ -1,433 +1,182 @@
|
|||||||
# AMČR Viewer — QGIS plugin
|
# AMCR Viewer: QGIS Plugin Documentation
|
||||||
|
|
||||||
[](https://www.gnu.org/licenses/gpl-3.0)
|
[](https://www.gnu.org/licenses/gpl-3.0)
|
||||||
[](https://qgis.org/)
|
|
||||||
[](https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/actions/workflows/code_quality.yml)
|
|
||||||
[](https://doi.org/10.5281/zenodo.18609813)
|
|
||||||
|
|
||||||
**AMČR Viewer** queries the Digital Archive of the Archaeological Map of the
|
**Platform:** QGIS 3.44.0–4.99.0
|
||||||
Czech Republic (AMČR) and turns the result into ordinary QGIS vector layers.
|
|
||||||
It removes the manual export/import round trip: you filter the archive from
|
|
||||||
inside QGIS and the matching records arrive as point, line and polygon layers
|
|
||||||
with a full attribute table.
|
|
||||||
|
|
||||||
| | |
|
**Module Type:** Data Acquisition & Visualization
|
||||||
|
|
||||||
|
**Source Data:** Archaeological Map of the Czech Republic (AIS CR)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Overview
|
||||||
|
|
||||||
|
**AMCR Viewer** is a QGIS plugin designed to facilitate direct access to the Digital Archive of the Archaeological Map of the Czech Republic (AMČR). It allows researchers to **query, retrieve, and visualize *Fieldwork events* and *Sites* data (metadata and geometry) directly within the GIS environment**, eliminating the need to manually export data from the web interface. Both *Fieldwork events* and *Sites* layers may optionally include component-level data (period and activity area) embedded directly in the attribute table. The plugin supports both **anonymous (public) access** and **authenticated access** for users with an AMČR account.
|
||||||
|
|
||||||
|
### Key Features
|
||||||
|
|
||||||
|
* **Spatial Querying:** Option to filter records based on the current map canvas extent (Bounding Box).
|
||||||
|
* **Advanced Attribute Filtering:** Supports multi-criteria filtering using controlled vocabularies.
|
||||||
|
* **Dynamic Geometry Retrieval:** Automatically downloads and categorizes spatial data into Point, Line, and Polygon layers.
|
||||||
|
* **Semantic Interoperability:** Automatically translates internal system codes into human-readable labels using the AIS CR API.
|
||||||
|
* **Authenticated Access:** Users with an AMČR account can log in to access non-public records.
|
||||||
|
|
||||||
|
## 2. Installation Guide
|
||||||
|
|
||||||
|
**Install the latest version of the plugin from the QGIS plugin repository.**
|
||||||
|
|
||||||
|
**OR** (*in case you need older version*)
|
||||||
|
|
||||||
|
1. *Obtain the [plugin distribution package](https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/releases) (ZIP archive containing the `amcr_viewer` directory).*
|
||||||
|
2. *Launch QGIS.*
|
||||||
|
3. *Navigate to Plugins → Manage and Install Plugins...*
|
||||||
|
4. *Select the Install from ZIP tab.*
|
||||||
|
5. *Locate the source ZIP file and click Install Plugin.*
|
||||||
|
6. *Upon successful installation, the AMCR Viewer button will appear in the toolbar.*
|
||||||
|
|
||||||
|
## 3. User Manual
|
||||||
|
|
||||||
|
### 3.1 Authentication (Optional)
|
||||||
|
|
||||||
|
By default, the plugin accesses only publicly available records (accessibility = anonymous). To access non-public data, log in using your AMČR account:
|
||||||
|
|
||||||
|
* Click the dropdown arrow on the AMCR Viewer toolbar button and select **Přihlásit se**.
|
||||||
|
* Enter your e-mail and password. Credentials are encrypted and stored securely in the **QGIS Authentication Manager** (DPAPI on Windows, Keychain on macOS, encrypted SQLite on Linux).
|
||||||
|
* Stored credentials are reused automatically across sessions. To update or remove them, open the login dialog again.
|
||||||
|
|
||||||
|
### 3.2 Data Retrieval
|
||||||
|
|
||||||
|
To initiate a search query, click either the **Stáhnout data akcí** or the **Stáhnout data lokalit** option from the dropdown menu. The filter dialog provides the following options. Shown options vary based on the chosen tool.
|
||||||
|
|
||||||
|
* **Spatial Filter:** *Checkbox "Omezit vyhledávání rozsahem okna":* If checked, the query is restricted to the geographical area currently visible in the QGIS canvas. If unchecked, the query searches the entire database (use with caution regarding data volume).
|
||||||
|
* **Positive findings only:** If checked, only *PIANs* belonging to Documentation units marked as "Type of evidence" = "positive" are included. *(Fieldwork events only.)*
|
||||||
|
|
||||||
|
* **Attribute Filters:**
|
||||||
|
* The dialog uses "Picker" widgets for controlled vocabularies (common: Region, District, Cadastral area, Period, Activity Area, *PIAN* accuracy, Accessibility; *events* related: Organisation, Researcher, Event type; *sites* related: Site type and class, Level of confidence, State of preservation).
|
||||||
|
* Click **Vybrat...** to open a searchable selection window. Multiple values can be selected simultaneously (Logic: OR).
|
||||||
|
|
||||||
|
* **Codelists (Hesláře):**
|
||||||
|
* Controlled vocabularies are downloaded from the AMČR OAI-PMH API and cached locally in `codelists/heslar.csv`.
|
||||||
|
* To refresh all codelists, click the **Aktualizovat hesláře 🔄** button in the filter dialog. This runs as a background task and may take a few minutes.
|
||||||
|
|
||||||
|
* **Components:** Check **Načíst komponenty** to include period and activity area data directly in the output layers.
|
||||||
|
> ⚠ When components are loaded, spatial features are duplicated — each feature corresponds to one component. Spatial analyses (areas, counts) may be inaccurate.
|
||||||
|
|
||||||
|
* If no filter is used, all accessible Fieldwork events/PIANs are returned (the number of records is capped at 20 000; it is advisable to set at least one filter).
|
||||||
|
|
||||||
|
For a more in-depth tutorial refer to the [AMČR Documentation](https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html) (only in Czech).
|
||||||
|
|
||||||
|
### 3.3 Layer Structure & Attributes
|
||||||
|
|
||||||
|
Upon successful retrieval, the plugin generates up to three temporary memory layers:
|
||||||
|
|
||||||
|
1. **AMCR\_[Akce|Lokalita]\_Polygony**
|
||||||
|
2. **AMCR\_[Akce|Lokalita]\_Linie**
|
||||||
|
3. **AMCR\_[Akce|Lokalita]\_Body**
|
||||||
|
|
||||||
|
Layers are only created if the query returns features of the corresponding geometry type. All layers share the same attribute schema.
|
||||||
|
|
||||||
|
#### 3.3.1 Common fields
|
||||||
|
|
||||||
|
| Field | Description |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| **Source data** | [Digital Archive AMČR](https://digiarchiv.aiscr.cz/) (AIS CR) |
|
| pian | PIAN (spatial identifier) ID |
|
||||||
| **Supported QGIS** | 3.44.0 – 4.99.0 (Qt 5 and Qt 6) |
|
| presnost | Spatial deviation \[units/tens/hundreds of meters/defined by cadastre\] |
|
||||||
| **Output** | temporary `memory` layers, S-JTSK / **EPSG:5514** |
|
| pian\_typ | \[point/line/polygon\] |
|
||||||
| **Access** | anonymous by default; optional login for non-public records |
|
| dj | Documentation unit ID |
|
||||||
| **UI language** | Czech |
|
| typ\_dj | \[trench/event part/whole event/cadastral territory\] |
|
||||||
| **Licence** | GPL-3.0 |
|
| definicni\_body | Feature centroid in WGS-84 coordinate system |
|
||||||
|
| akce / lokalita | Fieldwork event / Site ID |
|
||||||
|
| odkaz\_do\_digiarchivu | Link to the record in the Digital Archive |
|
||||||
|
| okres | District |
|
||||||
|
| katastr | Main cadastral area |
|
||||||
|
| dalsi\_katastry | Other cadastral areas, if the event extends beyond the main cadastre |
|
||||||
|
| Přístupnost | Record accessibility \[A/B/C/D\] |
|
||||||
|
|
||||||
---
|
#### 3.3.2 Fields related to *Fieldwork events*
|
||||||
|
|
||||||
## 1. What it can download
|
| Field | Description |
|
||||||
|
|
||||||
The plugin covers three AMČR record types. Each has its own menu entry, its
|
|
||||||
own set of filters and its own attribute table.
|
|
||||||
|
|
||||||
| Entity | Menu entry | What it is |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| **Fieldwork events** (`akce`) | *Stáhnout data akcí* | Records of archaeological finds and observations tied to a place, a responsible body and a time of execution. |
|
|
||||||
| **Sites** (`lokalita`) | *Stáhnout data lokalit* | Records tied to a site, its characteristic archaeological manifestation and presumed function. |
|
|
||||||
| **Individual finds** (`samostatny_nalez`) | *Stáhnout data samostatných nálezů* | Records of individual movable finds reported through **AMČR-PAS**, the portal for amateur collaborators. |
|
|
||||||
|
|
||||||
Fieldwork events and Sites can additionally carry **component** data (period
|
|
||||||
and activity area) directly in the attribute table. Individual finds have no
|
|
||||||
components — period and dating are attributes of the find itself.
|
|
||||||
|
|
||||||
### Key features
|
|
||||||
|
|
||||||
* **Spatial querying** — restrict the query to the current map canvas extent.
|
|
||||||
* **Multi-criteria attribute filtering** driven by AMČR controlled
|
|
||||||
vocabularies (*hesláře*), with a searchable multi-select picker per filter.
|
|
||||||
* **Date range filtering** for fieldwork start/end and for the date of finding.
|
|
||||||
* **Automatic geometry retrieval**, split into Point, Line and Polygon layers
|
|
||||||
and reprojected to S-JTSK.
|
|
||||||
* **Human-readable labels** — internal codes (`HES-xxxxxx`) are translated via
|
|
||||||
the AIS CR translation dictionary.
|
|
||||||
* **Authenticated access** — an AMČR account unlocks non-public records;
|
|
||||||
credentials are stored encrypted in the QGIS Authentication Manager.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. Installation
|
|
||||||
|
|
||||||
### From the QGIS plugin repository (recommended)
|
|
||||||
|
|
||||||
*Plugins → Manage and Install Plugins… → search for* **AMČR Viewer** *→
|
|
||||||
Install*.
|
|
||||||
|
|
||||||
### From a ZIP archive (older versions, or a build from source)
|
|
||||||
|
|
||||||
1. Download a [release package](https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/releases)
|
|
||||||
(a ZIP containing the `amcr_viewer` directory).
|
|
||||||
2. In QGIS go to *Plugins → Manage and Install Plugins… → Install from ZIP*.
|
|
||||||
3. Select the archive and click *Install Plugin*.
|
|
||||||
|
|
||||||
Every successful CI run also publishes a ready-to-install `amcr_viewer.zip`
|
|
||||||
as a build artifact, which is handy for testing a branch before release.
|
|
||||||
|
|
||||||
After installation the **AMČR Viewer** button appears in the toolbar as a
|
|
||||||
dropdown.
|
|
||||||
|
|
||||||
### Requirements
|
|
||||||
|
|
||||||
The plugin needs the **`requests`** library. It ships with the QGIS installers
|
|
||||||
for Windows and macOS. On Linux distribution packages it may have to be
|
|
||||||
installed separately (e.g. `python3-requests`).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. User manual
|
|
||||||
|
|
||||||
### 3.1 Toolbar and menu
|
|
||||||
|
|
||||||
The toolbar button is a dropdown; the default action is *Stáhnout data akcí*.
|
|
||||||
|
|
||||||
| Menu entry | Action |
|
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| *Stáhnout data akcí* | Opens the filter dialog for Fieldwork events. |
|
| akce\_lokalizace | Verbal description of the event location |
|
||||||
| *Stáhnout data samostatných nálezů* | Opens the filter dialog for Individual finds. |
|
| vedouci | Main fieldwork manager |
|
||||||
| *Stáhnout data lokalit* | Opens the filter dialog for Sites. |
|
| organizace | Organisation conducting the research |
|
||||||
| *Přihlásit se* | Opens the login dialog (see 3.2). |
|
| specifikace\_data | \[exact date/exact years/sometime in years\] |
|
||||||
| *Nápověda AMČR Help* | Opens the online documentation in a browser. |
|
| zahajeni | Event start date |
|
||||||
|
| ukonceni | Event end date |
|
||||||
|
| hlavni\_typ | Primary research method |
|
||||||
|
| vedlejsi\_typ | Secondary research method |
|
||||||
|
| zjisteni | Did the research reveal archaeological contexts? \[positive/negative\] |
|
||||||
|
| nahrazuje\_NZ | Replaces a fieldwork report? \[yes/no\] |
|
||||||
|
|
||||||
### 3.2 Authentication (optional)
|
#### 3.3.3 Fields related to *Sites*
|
||||||
|
|
||||||
By default the plugin sees only publicly accessible records. Logging in with
|
| Field | Description |
|
||||||
an AMČR account extends the result set to everything the account is allowed
|
|
||||||
to see.
|
|
||||||
|
|
||||||
* The credentials are **verified against the API before they are stored** —
|
|
||||||
a wrong password never reaches the Authentication Manager. If the server is
|
|
||||||
unreachable, the plugin offers to store them unverified.
|
|
||||||
* They are then saved encrypted in the **QGIS Authentication Manager** (DPAPI
|
|
||||||
on Windows, Keychain on macOS, encrypted SQLite on Linux). QGIS will ask for
|
|
||||||
its master password.
|
|
||||||
* Stored credentials are reused across QGIS sessions. If the session cookie
|
|
||||||
expires mid-download, the plugin re-authenticates automatically and repeats
|
|
||||||
the request.
|
|
||||||
* Reopening the login dialog lets you change the e-mail (leave the password
|
|
||||||
blank to keep the stored one) or remove the credentials entirely
|
|
||||||
(*Odebrat uložené přihlašovací údaje*).
|
|
||||||
|
|
||||||
### 3.3 The filter dialog
|
|
||||||
|
|
||||||
Filters of different categories are combined with **AND**; multiple values
|
|
||||||
inside one filter are combined with **OR**. A filter left empty means "no
|
|
||||||
restriction". Click *Vybrat…* to open a searchable, checkable list.
|
|
||||||
|
|
||||||
#### Availability per entity
|
|
||||||
|
|
||||||
| Filter (Czech UI label) | Events | Sites | Ind. finds | API parameter |
|
|
||||||
| --- | :---: | :---: | :---: | --- |
|
|
||||||
| Omezit vyhledávání rozsahem okna | ✓ | ✓ | ✓ | `loc_rpt` |
|
|
||||||
| Pouze pozitivní zjištění | ✓ | — | — | `posevidence` |
|
|
||||||
| Pouze projektové akce | ✓ | — | — | `proj_akce` |
|
|
||||||
| Kraj | ✓ | ✓ | ✓ | `f_kraj` |
|
|
||||||
| Okres | ✓ | ✓ | ✓ | `f_okres` |
|
|
||||||
| Katastr | ✓ | ✓ | ✓ | `f_katastr` |
|
|
||||||
| Přístupnost | ✓ | ✓ | ✓ | `pristupnost` |
|
|
||||||
| PIAN – přesnost | ✓ | ✓ | — | `f_pian_presnost` |
|
|
||||||
| Organizace | ✓ | — | ✓ | `f_organizace` |
|
|
||||||
| Vedoucí výzkumu | ✓ | — | — | `f_vedouci` |
|
|
||||||
| Typ výzkumu | ✓ | — | — | `f_typ_vyzkumu` |
|
|
||||||
| Datum — *Zahájení* / *Ukončení* | ✓ | — | — | `akce_datum_zahajeni`, `akce_datum_ukonceni` |
|
|
||||||
| Lokalita – typ | — | ✓ | — | `f_typ_lokality` |
|
|
||||||
| Lokalita – druh | — | ✓ | — | `f_druh_lokality` |
|
|
||||||
| Lokalita – jistota určení | — | ✓ | — | `f_jistota` |
|
|
||||||
| Lokalita - stav dochování | — | ✓ | — | `f_lokalita_zachovalost` |
|
|
||||||
| Období | ✓ | ✓ | ✓ | `f_obdobi` |
|
|
||||||
| Kategorie nálezu | — | — | ✓ | `f_kategorie` |
|
|
||||||
| Druh nálezu | — | — | ✓ | `f_druh_nalezu` |
|
|
||||||
| Specifikace nálezu | — | — | ✓ | `f_specifikace` |
|
|
||||||
| Okolnosti nálezu | — | — | ✓ | `f_nalezove_okolnosti` |
|
|
||||||
| Nálezce | — | — | ✓ | `f_nalezce` |
|
|
||||||
| Datum nálezu | — | — | ✓ | `samostatny_nalez_datum_nalezu` |
|
|
||||||
| Areál | ✓ | ✓ | — | `f_areal` |
|
|
||||||
| Načíst komponenty | ✓ | ✓ | — | — |
|
|
||||||
|
|
||||||
#### Spatial restriction
|
|
||||||
|
|
||||||
*Omezit vyhledávání rozsahem okna* is **checked by default**. The canvas
|
|
||||||
extent is transformed from the project CRS to WGS-84 and sent as a bounding
|
|
||||||
box. Unchecking it queries the whole database — do so with an attribute
|
|
||||||
filter in place, otherwise you will hit the record cap (see 4.5).
|
|
||||||
|
|
||||||
#### PIAN accuracy has a non-empty default
|
|
||||||
|
|
||||||
> ⚠ *PIAN – přesnost* is the one filter that is **pre-selected**. For
|
|
||||||
> Fieldwork events and Sites the dialog starts with *odchylka jednotky metrů*,
|
|
||||||
> *odchylka desítky metrů* and *odchylka stovky metrů* checked, so an
|
|
||||||
> otherwise untouched dialog already sends `f_pian_presnost`. Records
|
|
||||||
> localised only to a cadastral territory are excluded until you open the
|
|
||||||
> picker and add that level yourself.
|
|
||||||
|
|
||||||
#### Date ranges
|
|
||||||
|
|
||||||
Each date block has a *from* and a *to* picker; an empty picker shows
|
|
||||||
*neomezeno* and means an open bound. The API rejects a one-sided range, so the
|
|
||||||
plugin substitutes a sentinel (`0001-01-01` / `9999-12-31`) for the empty
|
|
||||||
side. A block with **both** pickers empty adds no filter at all.
|
|
||||||
|
|
||||||
A reversed range (start later than end) is refused when you confirm the
|
|
||||||
dialog — such a query would come back empty and would be indistinguishable
|
|
||||||
from a genuinely empty result.
|
|
||||||
|
|
||||||
#### Codelists (hesláře)
|
|
||||||
|
|
||||||
The controlled vocabularies behind the pickers are cached in
|
|
||||||
`amcr_viewer/codelists/heslar.csv` and ship with the plugin. Click
|
|
||||||
**Aktualizovat hesláře 🔄** to rebuild the file from the live APIs; it runs as
|
|
||||||
a background QGIS task with a progress bar and takes a few minutes.
|
|
||||||
|
|
||||||
Most codelists come from the AMČR **OAI-PMH** endpoint. Two are built from
|
|
||||||
Digiarchiv **search facets** instead, because they are lists of people rather
|
|
||||||
than a published vocabulary: *Vedoucí výzkumu* (`f_vedouci`, faceted over
|
|
||||||
fieldwork events) and *Nálezce* (`f_nalezce`, faceted over individual finds).
|
|
||||||
|
|
||||||
#### Components
|
|
||||||
|
|
||||||
Check **Načíst komponenty** (Events and Sites only) to bring the period and
|
|
||||||
activity area of each component into the output layer.
|
|
||||||
|
|
||||||
> ⚠ With components loaded, spatial features are **duplicated** — one feature
|
|
||||||
> per component. Areas and feature counts computed on such a layer are
|
|
||||||
> misleading.
|
|
||||||
|
|
||||||
Note that *Období* and *Areál* also act as component filters even when the
|
|
||||||
box is unchecked: a documentation unit whose components match nothing is
|
|
||||||
dropped from the result.
|
|
||||||
|
|
||||||
### 3.4 Output layers
|
|
||||||
|
|
||||||
Up to three temporary `memory` layers are created per download, in **S-JTSK
|
|
||||||
(EPSG:5514)**:
|
|
||||||
|
|
||||||
* `AMCR_Akce_Body` / `_Linie` / `_Polygony`
|
|
||||||
* `AMCR_Lokalita_Body` / `_Linie` / `_Polygony`
|
|
||||||
* `AMCR_Samostatný_nález_Body` / `_Linie` / `_Polygony`
|
|
||||||
|
|
||||||
A layer is only created if the query actually returned that geometry type.
|
|
||||||
All layers of one download share the same attribute schema. Field names are
|
|
||||||
ASCII; the human-readable names visible in the attribute table are QGIS field
|
|
||||||
aliases.
|
|
||||||
|
|
||||||
> Memory layers are **not persistent** — export them (GeoPackage, Shapefile,
|
|
||||||
> …) before closing the project.
|
|
||||||
|
|
||||||
Geometry is taken from the record's S-JTSK WKT when present; otherwise the
|
|
||||||
WGS-84 fallback is reprojected. Invalid geometries are repaired rather than
|
|
||||||
dropped.
|
|
||||||
|
|
||||||
The tables below group the fields by meaning. In the layer they appear in the
|
|
||||||
order *common → entity-specific → `pristupnost` → component fields*.
|
|
||||||
|
|
||||||
#### Common fields
|
|
||||||
|
|
||||||
| Field | Alias | Description |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `pian` | PIAN | Spatial unit (PIAN) identifier. *Events and Sites only.* |
|
|
||||||
| `presnost` | Přesnost | Spatial accuracy \[units / tens / hundreds of metres / defined by cadastre\]. *Events and Sites only.* |
|
|
||||||
| `pian_typ` | PIAN – typ | \[point / line / polygon\]. *Events and Sites only.* |
|
|
||||||
| `dj` | Dokumentační jednotka | Documentation unit identifier. *Events and Sites only.* |
|
|
||||||
| `typ_dj` | Typ dokumentační jednotky | \[trench / event part / whole event / cadastral territory\]. *Events and Sites only.* |
|
|
||||||
| `akce` / `lokalita` / `samostatny_nalez` | Akce / Lokalita / Samostatný nález | Record identifier. |
|
|
||||||
| `definicni_body` | Definiční bod(y) (WGS-84) | Feature centroid(s) in WGS-84. |
|
|
||||||
| `odkaz_do_digiarchivu` | Odkaz do Digitálního archivu AMČR | Permalink to the record. |
|
|
||||||
| `okres` | Okres | District. |
|
|
||||||
| `katastr` | Katastr | Main cadastral area. |
|
|
||||||
| `dalsi_katastry` | Další katastry | Other cadastral areas. *Always empty for individual finds.* |
|
|
||||||
| `pristupnost` | Přístupnost | Record accessibility \[A/B/C/D\]. |
|
|
||||||
|
|
||||||
#### Fieldwork event fields
|
|
||||||
|
|
||||||
| Field | Alias | Description |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `akce_lokalizace` | Akce – lokalizace | Verbal description of the location. |
|
|
||||||
| `vedouci` | Vedoucí akce | Main fieldwork manager. |
|
|
||||||
| `organizace` | Organizace | Organisation conducting the research. |
|
|
||||||
| `specifikace_data` | Specifikace data | \[exact date / exact years / sometime in years\]. |
|
|
||||||
| `zahajeni` | Datum zahájeni | Start date. |
|
|
||||||
| `ukonceni` | Datum ukončení | End date. |
|
|
||||||
| `hlavni_typ` | Hlavní typ | Primary research method. |
|
|
||||||
| `vedlejsi_typ` | Vedlejší typ | Secondary research methods. |
|
|
||||||
| `zjisteni` | Zjištění | Whether the **documentation unit** is positive or negative evidence \[Pozitivní / Negativní\]. |
|
|
||||||
| `nahrazuje_NZ` | Akce – nahrazuje NZ | Replaces a fieldwork report \[Ano / Ne\]. |
|
|
||||||
| `projekt` | Projekt | Identifier of the related project, if any. |
|
|
||||||
|
|
||||||
#### Site fields
|
|
||||||
|
|
||||||
| Field | Alias | Description |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `nazev_lokality` | Název lokality | Site name. |
|
|
||||||
| `popis_lokality` | Popis lokality | Site description. |
|
|
||||||
| `typ_lokality` | Typ lokality | Site classification by definition method. |
|
|
||||||
| `druh_lokality` | Druh lokality | Site classification by the nature of the field relics. |
|
|
||||||
| `zachovalost` | Zachovalost | State of preservation. |
|
|
||||||
|
|
||||||
#### Individual find fields
|
|
||||||
|
|
||||||
| Field | Alias | Description |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `projekt` | Projekt | Identifier of the related project. |
|
|
||||||
| `nalezce` | Nálezce | Finder. |
|
|
||||||
| `datum` | Datum nálezu | Date of finding. |
|
|
||||||
| `okolnosti` | Nálezové okolnosti | Finding context. |
|
|
||||||
| `hloubka_cm` | Hloubka (cm) | Depth below surface. |
|
|
||||||
| `lokalizace` | Lokalizace | Verbal description of the find spot. |
|
|
||||||
| `obdobi` | Období | Period. |
|
|
||||||
| `presna_datace` | Přesná datace | Precise dating, if known. |
|
|
||||||
| `nalez` | Nález | Find class. |
|
|
||||||
| `material` | Materiál | Find specification / material. |
|
|
||||||
| `pocet` | Počet předmětů | Number of objects. |
|
|
||||||
| `poznamka` | Poznámka/bližší popis | Note or closer description. |
|
|
||||||
| `pred_org` | Předáno organizaci | Organisation the find was handed over to. |
|
|
||||||
| `evidencni` | Evidenční číslo | Reference number. |
|
|
||||||
|
|
||||||
#### Component fields (only with *Načíst komponenty*)
|
|
||||||
|
|
||||||
| Field | Alias | Description |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `komponenta` | Komponenta | Component identifier. |
|
|
||||||
| `komponenta_areal` | Areál | Activity area \[settlement / burial area / field / …\]. |
|
|
||||||
| `komponenta_obdobi` | Období | Period \[Neolithic / High Middle Ages–Modern Period / …\]. |
|
|
||||||
|
|
||||||
### 3.5 When a query returns nothing
|
|
||||||
|
|
||||||
Progress and errors are written to the QGIS *Messages* panel, tab **AMČR**
|
|
||||||
(login goes to **AMČR login**). The log contains the **exact request URL**,
|
|
||||||
so a suspicious query can be replayed in a browser instead of being
|
|
||||||
reconstructed from the code. Distinct messages tell apart an empty result, an
|
|
||||||
API error, a network failure and a result without any geometry.
|
|
||||||
|
|
||||||
Only one download can run at a time; starting a second one while the first is
|
|
||||||
still running is refused with a message.
|
|
||||||
|
|
||||||
For a step-by-step tutorial see the
|
|
||||||
[AMČR documentation](https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html)
|
|
||||||
(Czech only).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. Technical notes
|
|
||||||
|
|
||||||
The plugin is plain **Python 3** with **`requests`** for HTTP. The GUI is
|
|
||||||
built through the **`qgis.PyQt`** compatibility layer rather than importing
|
|
||||||
`PyQt5`/`PyQt6` directly, which is what lets a single source tree run on both
|
|
||||||
QGIS 3.44 (Qt 5) and QGIS 4 (Qt 6). Every enum is referenced in its scoped
|
|
||||||
form (`Qt.CheckState.Checked`, …), as required by Qt 6.
|
|
||||||
|
|
||||||
### 4.1 Repository layout
|
|
||||||
|
|
||||||
```
|
|
||||||
amcr_viewer/ the plugin package (this is what gets zipped)
|
|
||||||
__init__.py classFactory() entry point for QGIS
|
|
||||||
amcr_viewer.py toolbar/menu integration, login flow, dispatch
|
|
||||||
amcr_dialog.py AmcrFilterDialog, FilterableSelectionDialog,
|
|
||||||
LoginDialog, UpdateCodelistsTask
|
|
||||||
amcr_tools.py API access, pagination, parsing, layer building
|
|
||||||
amcr_codelists.py codelist download and CSV cache
|
|
||||||
codelists/heslar.csv cached controlled vocabularies
|
|
||||||
i18n/ Qt translation files
|
|
||||||
*.png toolbar and menu icons
|
|
||||||
resources.py generated by pyrcc, currently unused
|
|
||||||
metadata.txt plugin metadata and changelog
|
|
||||||
.flake8 lint config, read by the plugins.qgis.org scanner
|
|
||||||
tests/
|
|
||||||
check_sources.py source hygiene checks (no QGIS needed)
|
|
||||||
smoke_test.py loads the plugin in a real, headless QGIS
|
|
||||||
.github/workflows/ CI (code quality, release packaging)
|
|
||||||
pyproject.toml ruff configuration
|
|
||||||
AGENTS.md contributor and AI-agent guidelines
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4.2 API endpoints
|
|
||||||
|
|
||||||
| Purpose | Endpoint | Notes |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| Login | `POST https://digiarchiv.aiscr.cz/api/user/login` | Returns a session cookie. Errors arrive with HTTP 200 and an `error` key. |
|
|
||||||
| Search | `GET https://digiarchiv.aiscr.cz/api/search/query` | `entity=akce\|lokalita\|samostatny_nalez\|pian`, `mapa=true`, paginated. |
|
|
||||||
| Translations | `GET https://digiarchiv.aiscr.cz/api/assets/i18n/cs.json` | Code → Czech label; cached in memory for the session. |
|
|
||||||
| Codelists | `GET https://api.aiscr.cz/2.2/oai` | OAI-PMH `ListRecords`, with resumption tokens. |
|
|
||||||
|
|
||||||
### 4.3 Processing pipeline
|
|
||||||
|
|
||||||
1. **Metadata** are paged in batches of **500** records, deduplicated by
|
|
||||||
`ident_cely`, until the reported `numFound` is reached or the cap is hit.
|
|
||||||
2. Records **without geometry are skipped**; the rest are expanded into
|
|
||||||
documentation units and — if requested — into components.
|
|
||||||
3. **Geometries** (PIAN) are fetched separately in batches of **200**
|
|
||||||
identifiers, to stay under URL length limits.
|
|
||||||
4. Features are built, reprojected to EPSG:5514, sorted by geometry type and
|
|
||||||
added to the project in a single batch per layer.
|
|
||||||
|
|
||||||
### 4.4 Data persistence
|
|
||||||
|
|
||||||
* **Codelists** — `amcr_viewer/codelists/heslar.csv`, rewritten only when the
|
|
||||||
user asks for an update.
|
|
||||||
* **Credentials** — QGIS Authentication Manager; the config ID is kept in
|
|
||||||
`QSettings` under `amcr_viewer/auth_config_id`.
|
|
||||||
* **Layers** — `memory` only, lost when QGIS closes.
|
|
||||||
|
|
||||||
### 4.5 Limits
|
|
||||||
|
|
||||||
* **20 000 records** per query (safety cap; QGIS would otherwise freeze).
|
|
||||||
* **500** records per metadata request, **200** identifiers per geometry
|
|
||||||
request.
|
|
||||||
* With components loaded, one output feature equals one component, so a
|
|
||||||
single PIAN can appear several times in the layer.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. Development
|
|
||||||
|
|
||||||
Contributor rules, branch naming and the manual QGIS test checklist live in
|
|
||||||
[`AGENTS.md`](./AGENTS.md).
|
|
||||||
|
|
||||||
Every pull request runs
|
|
||||||
[`.github/workflows/code_quality.yml`](.github/workflows/code_quality.yml),
|
|
||||||
which mirrors what plugins.qgis.org checks on upload and adds what it does
|
|
||||||
not:
|
|
||||||
|
|
||||||
| Job | What it does |
|
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| **Lint a bezpečnost** | `tests/check_sources.py`, bandit, detect-secrets, flake8, ruff |
|
| nazev\_lokality | Site name |
|
||||||
| **Kompatibilita s Qt6** | `pyqgis4-checker` in dry-run mode |
|
| popis\_lokality | Site description |
|
||||||
| **Smoke test** | loads the plugin in headless QGIS — both `ltr` (Qt 5) and `stable` (Qt 6) |
|
| typ\_lokality | Site classification by definition method |
|
||||||
| **Balíček pluginu** | builds `amcr_viewer.zip`, asserts its contents, uploads it as an artifact |
|
| druh\_lokality | Site classification by the nature of identified field relics |
|
||||||
|
| zachovalost | Site preservation state |
|
||||||
|
|
||||||
Reproducing them locally:
|
#### 3.3.4 Component fields (only when *Načíst komponenty* is checked)
|
||||||
|
|
||||||
```bash
|
| Field | Description |
|
||||||
python3 tests/check_sources.py
|
| --- | --- |
|
||||||
ruff check .
|
| komponenta | Component ID |
|
||||||
flake8 --config amcr_viewer/.flake8 amcr_viewer/
|
| komponenta\_areal | Activity area \[settlement/burial area/field/…\] |
|
||||||
bandit -r amcr_viewer/
|
| komponenta\_obdobi | Period \[Neolithic/High Middle Ages–Modern Period/…\] |
|
||||||
docker run --rm -v "$PWD:/work:ro" -w /work --user "$(id -u):$(id -g)" \
|
|
||||||
-e HOME=/tmp qgis/qgis:stable python3 tests/smoke_test.py
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
## 4. Technical Architecture
|
||||||
|
|
||||||
## 6. Links and resources
|
The plugin is developed in **Python 3** using the **PyQt6** framework for the GUI and the **Requests** library for HTTP communication.
|
||||||
|
|
||||||
* [AMČR / Digiarchiv documentation](https://amcr-help.aiscr.cz/) (Czech only)
|
> **Note:** The `requests` library is bundled with the QGIS installers for Windows and macOS. On Linux (distribution packages), it may need to be installed separately (e.g. `python3-requests`).
|
||||||
* [AMČR Viewer tutorial](https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html)
|
|
||||||
(Czech only)
|
|
||||||
* [AMČR-PAS](https://amcr-info.aiscr.cz/amcr-pas/) — the amateur collaborator
|
|
||||||
portal behind the Individual finds records
|
|
||||||
* [Import/Export. Pluginy propojující QGIS s AMČR \[poster\]](https://zenodo.org/records/20504909)
|
|
||||||
(Czech only; describes v1.3.2)
|
|
||||||
|
|
||||||
## Citing
|
### 4.1 File Structure
|
||||||
|
|
||||||
Cite the plugin using [`CITATION.cff`](./CITATION.cff) or the concept DOI
|
* `amcr_viewer.py`: Entry point; handles GUI integration, toolbar/menu setup, and login flow.
|
||||||
[10.5281/zenodo.18609813](https://doi.org/10.5281/zenodo.18609813), which
|
* `amcr_dialog.py`: Manages the UI logic, including `AmcrFilterDialog`, `FilterableSelectionDialog`, and `LoginDialog`.
|
||||||
always resolves to the latest release.
|
* `amcr_tools.py`: Core logic module. Handles authentication, API requests, pagination, data parsing, and vector layer generation.
|
||||||
|
* `amcr_codelists.py`: Manages local caching of controlled vocabularies (`codelists/heslar.csv`) downloaded via OAI-PMH.
|
||||||
|
|
||||||
## Licence
|
### 4.2 Data Flow & API Integration
|
||||||
|
|
||||||
GPL-3.0 — see [`LICENSE`](./LICENSE).
|
The plugin interacts with the following endpoints:
|
||||||
|
|
||||||
|
1. **Login API:**
|
||||||
|
* Endpoint: `https://digiarchiv.aiscr.cz/api/user/login`
|
||||||
|
* Method: `POST`
|
||||||
|
* Returns a session cookie used for subsequent authenticated requests.
|
||||||
|
* Credentials are stored in the QGIS Authentication Manager; the session is restored automatically if it expires mid-download.
|
||||||
|
|
||||||
|
2. **Search API (Solr):**
|
||||||
|
* Endpoint: `https://digiarchiv.aiscr.cz/api/search/query`
|
||||||
|
* Method: `GET`
|
||||||
|
* Parameters: `entity=akce|lokalita|pian`, `rows/page` (pagination), `mapa=true`.
|
||||||
|
* Logic: Paginated in batches of 500 records (metadata) and 200 records (geometries). A safety cap of 20 000 records is enforced.
|
||||||
|
|
||||||
|
3. **Translation API:**
|
||||||
|
* Endpoint: `https://digiarchiv.aiscr.cz/api/assets/i18n/cs.json`
|
||||||
|
* Function: Retrieves the mapping between system codes (e.g. `HES-xxxx`) and Czech labels. Cached in memory for the session.
|
||||||
|
|
||||||
|
4. **Codelists API (OAI-PMH):**
|
||||||
|
* Endpoint: `https://api.aiscr.cz/2.2/oai`
|
||||||
|
* Used for downloading controlled vocabularies (periods, regions, organisations, etc.) on demand.
|
||||||
|
|
||||||
|
### 4.3 Data Persistence
|
||||||
|
|
||||||
|
* **Vocabularies:** Stored in `codelists/heslar.csv`; updated on user request via the background task.
|
||||||
|
* **Layers:** Output layers are created as `memory` layers. They are non-persistent and will be lost if QGIS is closed without saving.
|
||||||
|
|
||||||
|
### 4.4 Constraints
|
||||||
|
|
||||||
|
* **Record Limit:** A safety cap of 20 000 records is enforced.
|
||||||
|
* **Batch Processing:** Geometry fetching is batched (200 IDs per request) to comply with URL length limitations and server load balancing.
|
||||||
|
* **Component duplication:** When components are loaded, each output feature corresponds to one component rather than one documentation unit. A single PIAN may therefore appear multiple times in the layer.
|
||||||
|
|
||||||
|
## 5. Links and resources
|
||||||
|
|
||||||
|
* [AMCR/Digiarchive Documentation](https://amcr-help.aiscr.cz/) (only in Czech).
|
||||||
|
* [AMCR Viewer tutorial](https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html) (only in Czech).
|
||||||
|
* [Import/Export. Pluginy propojující QGIS s AMČR \[poster\]](https://zenodo.org/records/20504909) (only in Czech; valid for v1.3.2).
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
# Konfigurace flake8 pro plugin AMČR Viewer.
|
|
||||||
#
|
|
||||||
# Soubor leží vedle metadata.txt schválně: scanner na plugins.qgis.org
|
|
||||||
# hledá .flake8 pouze v kořeni balíčku uvnitř ZIPu, takže stejná pravidla
|
|
||||||
# platí v CI, lokálně i při uploadu.
|
|
||||||
# https://plugins.qgis.org/docs/security-scanning/config-files
|
|
||||||
[flake8]
|
|
||||||
# resources.py je vygenerovaný výstup pyrcc ("All changes made in this
|
|
||||||
# file will be lost"), není nikde importovaný a zdrojový .qrc v repu není.
|
|
||||||
# Ručně se neformátuje.
|
|
||||||
per-file-ignores =
|
|
||||||
*resources.py: E302,E305,E501
|
|
||||||
@@ -31,5 +31,6 @@ def classFactory(iface): # pylint: disable=invalid-name
|
|||||||
:param iface: A QGIS interface instance.
|
:param iface: A QGIS interface instance.
|
||||||
:type iface: QgsInterface
|
:type iface: QgsInterface
|
||||||
"""
|
"""
|
||||||
|
#
|
||||||
from .amcr_viewer import AmcrViewer
|
from .amcr_viewer import AmcrViewer
|
||||||
return AmcrViewer(iface)
|
return AmcrViewer(iface)
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
import csv
|
|
||||||
import os
|
import os
|
||||||
import time
|
import csv
|
||||||
import xml.etree.ElementTree as ET # nosec
|
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
from qgis.core import Qgis, QgsMessageLog
|
import xml.etree.ElementTree as ET # nosec
|
||||||
|
import time
|
||||||
|
from qgis.core import QgsMessageLog, Qgis
|
||||||
|
|
||||||
# Define paths for the plugin and its codelists directory
|
# Define paths for the plugin and its codelists directory
|
||||||
PLUGIN_DIR = os.path.dirname(__file__)
|
PLUGIN_DIR = os.path.dirname(__file__)
|
||||||
@@ -65,7 +64,7 @@ def parse_codelist_file(filename, target_dict=None):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
# Open the file using standard UTF-8 encoding
|
# Open the file using standard UTF-8 encoding
|
||||||
with open(path, encoding='utf-8') as f:
|
with open(path, 'r', encoding='utf-8') as f:
|
||||||
reader = csv.reader(f, delimiter=';')
|
reader = csv.reader(f, delimiter=';')
|
||||||
|
|
||||||
# Skip the CSV header row
|
# Skip the CSV header row
|
||||||
@@ -91,7 +90,7 @@ def parse_codelist_file(filename, target_dict=None):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
f"AMČR Codelist Read Error for {filename}: {e}",
|
f"AMČR Codelist Read Error for {filename}: {e}",
|
||||||
"AMČR", Qgis.MessageLevel.Critical)
|
"AMČR", Qgis.Critical)
|
||||||
|
|
||||||
return target_dict
|
return target_dict
|
||||||
|
|
||||||
@@ -99,7 +98,7 @@ def parse_codelist_file(filename, target_dict=None):
|
|||||||
def load_all_data():
|
def load_all_data():
|
||||||
"""Loads the codelist during plugin startup."""
|
"""Loads the codelist during plugin startup."""
|
||||||
ensure_codelists_dir()
|
ensure_codelists_dir()
|
||||||
categorized_data = {k: {} for k in slovnicek}
|
categorized_data = {k: {} for k in slovnicek.keys()}
|
||||||
parse_codelist_file('heslar.csv', categorized_data)
|
parse_codelist_file('heslar.csv', categorized_data)
|
||||||
return categorized_data
|
return categorized_data
|
||||||
|
|
||||||
@@ -125,9 +124,7 @@ def fetch_set(base_url, internal_name, api_set, task=None):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
if "digiarchiv" not in base_url:
|
if "digiarchiv" not in base_url:
|
||||||
response = requests.get(
|
response = requests.get(base_url, params=params_amcr, timeout=30)
|
||||||
base_url, params=params_amcr, timeout=30
|
|
||||||
)
|
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
root = ET.fromstring(response.content) # nosec
|
root = ET.fromstring(response.content) # nosec
|
||||||
|
|
||||||
@@ -196,7 +193,7 @@ def fetch_set(base_url, internal_name, api_set, task=None):
|
|||||||
time.sleep(0.5)
|
time.sleep(0.5)
|
||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
|
|
||||||
else:
|
else:
|
||||||
response = requests.get(base_url, params=params_da, timeout=30)
|
response = requests.get(base_url, params=params_da, timeout=30)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
@@ -213,13 +210,13 @@ def fetch_set(base_url, internal_name, api_set, task=None):
|
|||||||
'Kód': nazev,
|
'Kód': nazev,
|
||||||
'Kategorie': internal_name
|
'Kategorie': internal_name
|
||||||
})
|
})
|
||||||
|
|
||||||
break
|
break
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
f"Chyba u setu {api_set}: {e}",
|
f"Chyba u setu {api_set}: {e}",
|
||||||
"AMČR", Qgis.MessageLevel.Warning)
|
"AMČR", Qgis.Warning)
|
||||||
break
|
break
|
||||||
|
|
||||||
return dataset
|
return dataset
|
||||||
@@ -243,7 +240,7 @@ def download_heslare(task=None):
|
|||||||
|
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
f"Zpracovávám kategorii: {interni}...",
|
f"Zpracovávám kategorii: {interni}...",
|
||||||
"AMČR", Qgis.MessageLevel.Info)
|
"AMČR", Qgis.Info)
|
||||||
|
|
||||||
# Pass the task correctly to the updated fetch function
|
# Pass the task correctly to the updated fetch function
|
||||||
data = fetch_set(base_url, interni, api_nazev, task=task)
|
data = fetch_set(base_url, interni, api_nazev, task=task)
|
||||||
|
|||||||
+37
-242
@@ -1,67 +1,20 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
from qgis.core import (
|
from qgis.PyQt.QtWidgets import (QDialog, QVBoxLayout,
|
||||||
Qgis,
|
QLineEdit, QDialogButtonBox,
|
||||||
QgsApplication,
|
QCheckBox, QGroupBox, QPushButton,
|
||||||
QgsAuthMethodConfig,
|
QListWidget, QListWidgetItem, QHBoxLayout,
|
||||||
QgsMessageLog,
|
QMessageBox, QLabel, QFormLayout)
|
||||||
QgsTask,
|
from qgis.PyQt.QtCore import Qt, QSettings
|
||||||
)
|
from qgis.core import (QgsTask, QgsApplication,
|
||||||
from qgis.gui import QgsDateEdit
|
QgsMessageLog, Qgis, QgsAuthMethodConfig)
|
||||||
from qgis.PyQt.QtCore import QSettings, Qt
|
|
||||||
from qgis.PyQt.QtWidgets import (
|
|
||||||
QCheckBox,
|
|
||||||
QDialog,
|
|
||||||
QDialogButtonBox,
|
|
||||||
QFormLayout,
|
|
||||||
QFrame,
|
|
||||||
QGridLayout,
|
|
||||||
QGroupBox,
|
|
||||||
QHBoxLayout,
|
|
||||||
QLabel,
|
|
||||||
QLineEdit,
|
|
||||||
QListWidget,
|
|
||||||
QListWidgetItem,
|
|
||||||
QMessageBox,
|
|
||||||
QPushButton,
|
|
||||||
QScrollArea,
|
|
||||||
QVBoxLayout,
|
|
||||||
QWidget,
|
|
||||||
)
|
|
||||||
from qgis.utils import iface
|
from qgis.utils import iface
|
||||||
|
from .amcr_codelists import (OBDOBI, TYP_AKCE, KRAJE, AREAL, ORGANIZACE,
|
||||||
from .amcr_codelists import (
|
OKRESY, KATASTRY, VEDOUCI, PIAN_PRESNOST,
|
||||||
AREAL,
|
TYP_LOKALITY, DRUH_LOKALITY, JISTOTA,
|
||||||
DRUH_LOKALITY,
|
LOKALITA_ZACHOVALOST, PRISTUPNOST,
|
||||||
DRUH_NALEZU,
|
NALEZ_KATEGORIE, DRUH_NALEZU, SPECIFIKACE,
|
||||||
JISTOTA,
|
NALEZOVE_OKOLNOSTI, NALEZCE,
|
||||||
KATASTRY,
|
download_heslare, refresh_globals)
|
||||||
KRAJE,
|
|
||||||
LOKALITA_ZACHOVALOST,
|
|
||||||
NALEZ_KATEGORIE,
|
|
||||||
NALEZCE,
|
|
||||||
NALEZOVE_OKOLNOSTI,
|
|
||||||
OBDOBI,
|
|
||||||
OKRESY,
|
|
||||||
ORGANIZACE,
|
|
||||||
PIAN_PRESNOST,
|
|
||||||
PRISTUPNOST,
|
|
||||||
SPECIFIKACE,
|
|
||||||
TYP_AKCE,
|
|
||||||
TYP_LOKALITY,
|
|
||||||
VEDOUCI,
|
|
||||||
download_heslare,
|
|
||||||
refresh_globals,
|
|
||||||
)
|
|
||||||
|
|
||||||
# The date filter of the API requires both bounds; a one-sided range makes
|
|
||||||
# the server fail with an ArrayIndexOutOfBoundsException and '*' is not
|
|
||||||
# accepted either. An empty picker is therefore replaced by these sentinels,
|
|
||||||
# which are also the default limits of QgsDateEdit.
|
|
||||||
DATE_OPEN_FROM = "0001-01-01"
|
|
||||||
DATE_OPEN_TO = "9999-12-31"
|
|
||||||
|
|
||||||
# Shown by a date picker that is left empty
|
|
||||||
DATE_NULL_TEXT = "neomezeno"
|
|
||||||
|
|
||||||
|
|
||||||
# Keep Python references to running tasks. QgsTaskManager only holds the
|
# Keep Python references to running tasks. QgsTaskManager only holds the
|
||||||
@@ -72,7 +25,7 @@ _ACTIVE_TASKS = []
|
|||||||
|
|
||||||
class UpdateCodelistsTask(QgsTask):
|
class UpdateCodelistsTask(QgsTask):
|
||||||
def __init__(self, description):
|
def __init__(self, description):
|
||||||
super().__init__(description, QgsTask.Flag.CanCancel)
|
super().__init__(description, QgsTask.CanCancel)
|
||||||
self.success = False
|
self.success = False
|
||||||
self.exception = None
|
self.exception = None
|
||||||
|
|
||||||
@@ -93,18 +46,18 @@ class UpdateCodelistsTask(QgsTask):
|
|||||||
refresh_globals()
|
refresh_globals()
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
"Hesláře AMČR byly úspěšně aktualizovány.",
|
"Hesláře AMČR byly úspěšně aktualizovány.",
|
||||||
"AMČR", Qgis.MessageLevel.Info
|
"AMČR", Qgis.Info
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
if self.isCanceled():
|
if self.isCanceled():
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
"Aktualizace heslářů byla zrušena.",
|
"Aktualizace heslářů byla zrušena.",
|
||||||
"AMČR", Qgis.MessageLevel.Warning
|
"AMČR", Qgis.Warning
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
f"Chyba aktualizace: {self.exception}",
|
f"Chyba aktualizace: {self.exception}",
|
||||||
"AMČR", Qgis.MessageLevel.Critical
|
"AMČR", Qgis.Critical
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -224,10 +177,6 @@ class AmcrFilterDialog(QDialog):
|
|||||||
'nalezce': [],
|
'nalezce': [],
|
||||||
}
|
}
|
||||||
|
|
||||||
# Date range pickers, filled by setup_date_range():
|
|
||||||
# (API field, label for messages, 'from' widget, 'to' widget)
|
|
||||||
self.date_ranges = []
|
|
||||||
|
|
||||||
layout = QVBoxLayout()
|
layout = QVBoxLayout()
|
||||||
|
|
||||||
# Filter by current map canvas extent
|
# Filter by current map canvas extent
|
||||||
@@ -260,6 +209,13 @@ class AmcrFilterDialog(QDialog):
|
|||||||
)
|
)
|
||||||
layout.addWidget(self.picker_katastr)
|
layout.addWidget(self.picker_katastr)
|
||||||
|
|
||||||
|
self.picker_presnost = self.setup_picker(
|
||||||
|
"PIAN – přesnost",
|
||||||
|
'pian_presnost',
|
||||||
|
PIAN_PRESNOST
|
||||||
|
)
|
||||||
|
layout.addWidget(self.picker_presnost)
|
||||||
|
|
||||||
self.picker_pristupnost = self.setup_picker(
|
self.picker_pristupnost = self.setup_picker(
|
||||||
"Přístupnost",
|
"Přístupnost",
|
||||||
'pristupnost',
|
'pristupnost',
|
||||||
@@ -269,14 +225,6 @@ class AmcrFilterDialog(QDialog):
|
|||||||
|
|
||||||
# Filters valid for Akce
|
# Filters valid for Akce
|
||||||
|
|
||||||
if self.typ_dat in ["lokalita", "akce"]:
|
|
||||||
self.picker_presnost = self.setup_picker(
|
|
||||||
"PIAN – přesnost",
|
|
||||||
'pian_presnost',
|
|
||||||
PIAN_PRESNOST
|
|
||||||
)
|
|
||||||
layout.addWidget(self.picker_presnost)
|
|
||||||
|
|
||||||
if self.typ_dat in ["samostatny_nalez", "akce"]:
|
if self.typ_dat in ["samostatny_nalez", "akce"]:
|
||||||
self.picker_org = self.setup_picker(
|
self.picker_org = self.setup_picker(
|
||||||
"Organizace",
|
"Organizace",
|
||||||
@@ -302,12 +250,6 @@ class AmcrFilterDialog(QDialog):
|
|||||||
)
|
)
|
||||||
layout.addWidget(self.picker_typ)
|
layout.addWidget(self.picker_typ)
|
||||||
|
|
||||||
self.box_datum = self.setup_date_range("Datum", [
|
|
||||||
("akce_datum_zahajeni", "Zahájení", "Datum zahájení"),
|
|
||||||
("akce_datum_ukonceni", "Ukončení", "Datum ukončení"),
|
|
||||||
])
|
|
||||||
layout.addWidget(self.box_datum)
|
|
||||||
|
|
||||||
# Filters valid for Lokality
|
# Filters valid for Lokality
|
||||||
|
|
||||||
if self.typ_dat == "lokalita":
|
if self.typ_dat == "lokalita":
|
||||||
@@ -380,13 +322,6 @@ class AmcrFilterDialog(QDialog):
|
|||||||
)
|
)
|
||||||
layout.addWidget(self.picker_nalezce)
|
layout.addWidget(self.picker_nalezce)
|
||||||
|
|
||||||
# Lokalita has no date field in the index at all, so the block
|
|
||||||
# is built only for the two entities that do
|
|
||||||
self.box_datum = self.setup_date_range("Datum nálezu", [
|
|
||||||
("samostatny_nalez_datum_nalezu", "", "Datum nálezu"),
|
|
||||||
])
|
|
||||||
layout.addWidget(self.box_datum)
|
|
||||||
|
|
||||||
if self.typ_dat != "samostatny_nalez":
|
if self.typ_dat != "samostatny_nalez":
|
||||||
self.picker_areal = self.setup_picker("Areál", 'areal', AREAL)
|
self.picker_areal = self.setup_picker("Areál", 'areal', AREAL)
|
||||||
layout.addWidget(self.picker_areal)
|
layout.addWidget(self.picker_areal)
|
||||||
@@ -417,21 +352,6 @@ class AmcrFilterDialog(QDialog):
|
|||||||
# Pushes everything above to the top
|
# Pushes everything above to the top
|
||||||
layout.addStretch(1)
|
layout.addStretch(1)
|
||||||
|
|
||||||
# The filter stack is taller than the window on every entity
|
|
||||||
# (over 1000 px for 'akce'), so it scrolls. The buttons stay
|
|
||||||
# outside the scroll area, otherwise the user would have to
|
|
||||||
# scroll to the bottom just to confirm the dialog.
|
|
||||||
content = QWidget()
|
|
||||||
content.setLayout(layout)
|
|
||||||
|
|
||||||
scroll = QScrollArea()
|
|
||||||
scroll.setWidgetResizable(True)
|
|
||||||
scroll.setFrameShape(QFrame.Shape.NoFrame)
|
|
||||||
scroll.setWidget(content)
|
|
||||||
|
|
||||||
outer = QVBoxLayout()
|
|
||||||
outer.addWidget(scroll)
|
|
||||||
|
|
||||||
# Main dialog OK/Cancel/Update buttons
|
# Main dialog OK/Cancel/Update buttons
|
||||||
|
|
||||||
buttons = QDialogButtonBox()
|
buttons = QDialogButtonBox()
|
||||||
@@ -452,9 +372,9 @@ class AmcrFilterDialog(QDialog):
|
|||||||
|
|
||||||
buttons.accepted.connect(self.accept)
|
buttons.accepted.connect(self.accept)
|
||||||
buttons.rejected.connect(self.reject)
|
buttons.rejected.connect(self.reject)
|
||||||
outer.addWidget(buttons)
|
layout.addWidget(buttons)
|
||||||
|
|
||||||
self.setLayout(outer)
|
self.setLayout(layout)
|
||||||
|
|
||||||
def setup_picker(self, label_text, cache_key, data_source, extra_btn=None):
|
def setup_picker(self, label_text, cache_key, data_source, extra_btn=None):
|
||||||
"""
|
"""
|
||||||
@@ -517,94 +437,6 @@ class AmcrFilterDialog(QDialog):
|
|||||||
row_widget.setLayout(row_layout)
|
row_widget.setLayout(row_layout)
|
||||||
return row_widget
|
return row_widget
|
||||||
|
|
||||||
def setup_date_range(self, title, rows):
|
|
||||||
"""
|
|
||||||
Creates a compact date range block: one row per API date field,
|
|
||||||
each with a 'from' and a 'to' picker.
|
|
||||||
|
|
||||||
rows is a list of (api_field, row_label, name_for_messages).
|
|
||||||
An empty row_label is used when the group box title already names
|
|
||||||
the field, which keeps the single-row variant from repeating itself.
|
|
||||||
|
|
||||||
A picker left empty means an open bound; the sentinel is
|
|
||||||
substituted in get_filters(), not here, so that an untouched
|
|
||||||
block adds no filter at all.
|
|
||||||
"""
|
|
||||||
row_widget = QGroupBox(title)
|
|
||||||
grid = QGridLayout()
|
|
||||||
grid.setContentsMargins(5, 5, 5, 5)
|
|
||||||
grid.setVerticalSpacing(3)
|
|
||||||
grid.setHorizontalSpacing(6)
|
|
||||||
|
|
||||||
for row, (api_field, row_label, name) in enumerate(rows):
|
|
||||||
if row_label:
|
|
||||||
grid.addWidget(QLabel(row_label), row, 0)
|
|
||||||
|
|
||||||
date_from = self._date_edit(
|
|
||||||
f"{name} – od (prázdné = bez dolní meze)"
|
|
||||||
)
|
|
||||||
date_to = self._date_edit(
|
|
||||||
f"{name} – do (prázdné = bez horní meze)"
|
|
||||||
)
|
|
||||||
|
|
||||||
separator = QLabel("–")
|
|
||||||
separator.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
|
||||||
|
|
||||||
grid.addWidget(date_from, row, 1)
|
|
||||||
grid.addWidget(separator, row, 2)
|
|
||||||
grid.addWidget(date_to, row, 3)
|
|
||||||
|
|
||||||
self.date_ranges.append((api_field, name, date_from, date_to))
|
|
||||||
|
|
||||||
grid.setColumnStretch(1, 1)
|
|
||||||
grid.setColumnStretch(3, 1)
|
|
||||||
|
|
||||||
row_widget.setLayout(grid)
|
|
||||||
return row_widget
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _date_edit(tooltip):
|
|
||||||
"""
|
|
||||||
A date picker that may stay empty.
|
|
||||||
|
|
||||||
clear() is essential here – setEmpty() looks empty but leaves
|
|
||||||
isNull() False with today's date, which would silently apply
|
|
||||||
a filter the user never set.
|
|
||||||
"""
|
|
||||||
widget = QgsDateEdit()
|
|
||||||
widget.setAllowNull(True)
|
|
||||||
widget.setNullRepresentation(DATE_NULL_TEXT)
|
|
||||||
widget.setDisplayFormat("d. M. yyyy")
|
|
||||||
widget.setCalendarPopup(True)
|
|
||||||
widget.clear()
|
|
||||||
widget.setToolTip(tooltip)
|
|
||||||
return widget
|
|
||||||
|
|
||||||
def accept(self):
|
|
||||||
"""
|
|
||||||
Blocks the dialog on a reversed date range. The API answers such
|
|
||||||
a query with zero records and no error, which is indistinguishable
|
|
||||||
from a genuinely empty result.
|
|
||||||
"""
|
|
||||||
reversed_ranges = [
|
|
||||||
name for _, name, date_from, date_to in self.date_ranges
|
|
||||||
if not date_from.isNull() and not date_to.isNull()
|
|
||||||
and date_from.date() > date_to.date()
|
|
||||||
]
|
|
||||||
|
|
||||||
if reversed_ranges:
|
|
||||||
QMessageBox.warning(
|
|
||||||
self,
|
|
||||||
"Neplatné rozmezí",
|
|
||||||
"U těchto filtrů je počáteční datum novější než koncové:\n"
|
|
||||||
+ "\n".join(f"• {name}" for name in reversed_ranges)
|
|
||||||
+ "\n\nDotaz by nevrátil žádný záznam. Opravte rozmezí, "
|
|
||||||
"nebo jedno z polí vyprázdněte."
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
super().accept()
|
|
||||||
|
|
||||||
def action_update_heslare(self):
|
def action_update_heslare(self):
|
||||||
# Create the task instance and keep a reference so the Python
|
# Create the task instance and keep a reference so the Python
|
||||||
# wrapper survives until the task finishes
|
# wrapper survives until the task finishes
|
||||||
@@ -642,7 +474,7 @@ class AmcrFilterDialog(QDialog):
|
|||||||
# This will show exactly what went wrong (e.g. PermissionError)
|
# This will show exactly what went wrong (e.g. PermissionError)
|
||||||
msg = (
|
msg = (
|
||||||
"Aktualizace selhala z důvodu chyby:\n"
|
"Aktualizace selhala z důvodu chyby:\n"
|
||||||
f"{task.exception!s}"
|
f"{str(task.exception)}"
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
msg = "Aktualizace byla zrušena uživatelem."
|
msg = "Aktualizace byla zrušena uživatelem."
|
||||||
@@ -657,9 +489,7 @@ class AmcrFilterDialog(QDialog):
|
|||||||
return "true" if self.chk_bbox.isChecked() else "false"
|
return "true" if self.chk_bbox.isChecked() else "false"
|
||||||
|
|
||||||
def get_komponenty(self):
|
def get_komponenty(self):
|
||||||
if self.typ_dat in ["akce", "lokalita"]:
|
return "true" if self.chk_komponenty.isChecked() else "false"
|
||||||
return "true" if self.chk_komponenty.isChecked() else "false"
|
|
||||||
return "false"
|
|
||||||
|
|
||||||
def get_filters(self):
|
def get_filters(self):
|
||||||
"""Compiles the user selections from the cache into
|
"""Compiles the user selections from the cache into
|
||||||
@@ -693,7 +523,7 @@ class AmcrFilterDialog(QDialog):
|
|||||||
filters['f_vedouci'] = self.selection_cache['vedouci']
|
filters['f_vedouci'] = self.selection_cache['vedouci']
|
||||||
|
|
||||||
if self.selection_cache['organizace']:
|
if self.selection_cache['organizace']:
|
||||||
filters['f_organizace'] = self.selection_cache['organizace']
|
filters['f_organizace'] = self.selection_cache['organizace']
|
||||||
|
|
||||||
if self.selection_cache['typ_lokality']:
|
if self.selection_cache['typ_lokality']:
|
||||||
filters['f_typ_lokality'] = self.selection_cache['typ_lokality']
|
filters['f_typ_lokality'] = self.selection_cache['typ_lokality']
|
||||||
@@ -702,38 +532,7 @@ class AmcrFilterDialog(QDialog):
|
|||||||
if self.selection_cache['jistota']:
|
if self.selection_cache['jistota']:
|
||||||
filters['f_jistota'] = self.selection_cache['jistota']
|
filters['f_jistota'] = self.selection_cache['jistota']
|
||||||
if self.selection_cache['lokalita_zachovalost']:
|
if self.selection_cache['lokalita_zachovalost']:
|
||||||
filters['f_lokalita_zachovalost'] = (
|
filters['f_lokalita_zachovalost'] = self.selection_cache['lokalita_zachovalost']
|
||||||
self.selection_cache['lokalita_zachovalost']
|
|
||||||
)
|
|
||||||
|
|
||||||
# Samostatné nálezy
|
|
||||||
if self.selection_cache['nalez_kategorie']:
|
|
||||||
filters['f_kategorie'] = self.selection_cache['nalez_kategorie']
|
|
||||||
if self.selection_cache['druh_nalezu']:
|
|
||||||
filters['f_druh_nalezu'] = self.selection_cache['druh_nalezu']
|
|
||||||
if self.selection_cache['specifikace']:
|
|
||||||
filters['f_specifikace'] = self.selection_cache['specifikace']
|
|
||||||
if self.selection_cache['nalezove_okolnosti']:
|
|
||||||
filters['f_nalezove_okolnosti'] = (
|
|
||||||
self.selection_cache['nalezove_okolnosti']
|
|
||||||
)
|
|
||||||
if self.selection_cache['nalezce']:
|
|
||||||
filters['f_nalezce'] = self.selection_cache['nalezce']
|
|
||||||
|
|
||||||
# Date ranges – the API needs both bounds, so an empty picker is
|
|
||||||
# replaced by a sentinel. A block with both pickers empty adds no
|
|
||||||
# filter at all; sending the full 0001–9999 range would only
|
|
||||||
# clutter the log without narrowing anything.
|
|
||||||
for api_field, _, date_from, date_to in self.date_ranges:
|
|
||||||
if date_from.isNull() and date_to.isNull():
|
|
||||||
continue
|
|
||||||
|
|
||||||
od = (DATE_OPEN_FROM if date_from.isNull()
|
|
||||||
else date_from.date().toString("yyyy-MM-dd"))
|
|
||||||
do = (DATE_OPEN_TO if date_to.isNull()
|
|
||||||
else date_to.date().toString("yyyy-MM-dd"))
|
|
||||||
|
|
||||||
filters[api_field] = f"{od},{do}"
|
|
||||||
|
|
||||||
return filters
|
return filters
|
||||||
|
|
||||||
@@ -755,8 +554,7 @@ class LoginDialog(QDialog):
|
|||||||
- storeAuthenticationConfig() and loadAuthenticationConfig() both have
|
- storeAuthenticationConfig() and loadAuthenticationConfig() both have
|
||||||
SIP_INOUT on their config parameter, so Python bindings return a tuple
|
SIP_INOUT on their config parameter, so Python bindings return a tuple
|
||||||
(bool, QgsAuthMethodConfig) rather than just bool. Always unpack both.
|
(bool, QgsAuthMethodConfig) rather than just bool. Always unpack both.
|
||||||
- loadAuthenticationConfig() with full=False loads only metadata
|
- loadAuthenticationConfig() with full=False loads only metadata (name, method,
|
||||||
(name, method,
|
|
||||||
id) but NOT the config() values like username/password. Use full=True to
|
id) but NOT the config() values like username/password. Use full=True to
|
||||||
access those.
|
access those.
|
||||||
"""
|
"""
|
||||||
@@ -987,7 +785,7 @@ class LoginDialog(QDialog):
|
|||||||
# We skip hasConfigId() as it may return False
|
# We skip hasConfigId() as it may return False
|
||||||
# despite the config existing
|
# despite the config existing
|
||||||
# (in-memory cache may not be populated yet in QGIS 4).
|
# (in-memory cache may not be populated yet in QGIS 4).
|
||||||
ok_load, _ = (
|
ok_load, existing_cfg = (
|
||||||
self._load_config(existing_id, full=False)
|
self._load_config(existing_id, full=False)
|
||||||
if existing_id
|
if existing_id
|
||||||
else (False, None)
|
else (False, None)
|
||||||
@@ -1016,9 +814,7 @@ class LoginDialog(QDialog):
|
|||||||
settings = QSettings()
|
settings = QSettings()
|
||||||
existing_id = settings.value(self.SETTINGS_KEY, "")
|
existing_id = settings.value(self.SETTINGS_KEY, "")
|
||||||
if existing_id:
|
if existing_id:
|
||||||
QgsApplication.authManager().removeAuthenticationConfig(
|
QgsApplication.authManager().removeAuthenticationConfig(existing_id)
|
||||||
existing_id
|
|
||||||
)
|
|
||||||
settings.remove(self.SETTINGS_KEY)
|
settings.remove(self.SETTINGS_KEY)
|
||||||
QMessageBox.information(
|
QMessageBox.information(
|
||||||
self,
|
self,
|
||||||
@@ -1053,5 +849,4 @@ class LoginDialog(QDialog):
|
|||||||
if not ok:
|
if not ok:
|
||||||
return "", ""
|
return "", ""
|
||||||
|
|
||||||
return (cfg.config("username", ""),
|
return cfg.config("username", ""), cfg.config("password", "") # nosec B106
|
||||||
cfg.config("password", "")) # nosec B106
|
|
||||||
+159
-452
@@ -1,23 +1,14 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
import json
|
from qgis.core import (QgsProject, QgsVectorLayer, QgsFeature, QgsGeometry,
|
||||||
|
QgsField, QgsCoordinateReferenceSystem,
|
||||||
import requests
|
QgsCoordinateTransform, QgsWkbTypes, Qgis,
|
||||||
from qgis.core import (
|
QgsMessageLog)
|
||||||
Qgis,
|
|
||||||
QgsCoordinateReferenceSystem,
|
|
||||||
QgsCoordinateTransform,
|
|
||||||
QgsFeature,
|
|
||||||
QgsField,
|
|
||||||
QgsGeometry,
|
|
||||||
QgsMessageLog,
|
|
||||||
QgsProject,
|
|
||||||
QgsVectorLayer,
|
|
||||||
QgsWkbTypes,
|
|
||||||
)
|
|
||||||
from qgis.PyQt.QtCore import QMetaType, Qt
|
|
||||||
from qgis.PyQt.QtGui import QCursor
|
|
||||||
from qgis.PyQt.QtWidgets import QApplication
|
|
||||||
from qgis.utils import iface
|
from qgis.utils import iface
|
||||||
|
from qgis.PyQt.QtCore import Qt, QMetaType
|
||||||
|
from qgis.PyQt.QtWidgets import QApplication
|
||||||
|
from qgis.PyQt.QtGui import QCursor
|
||||||
|
import requests
|
||||||
|
import json
|
||||||
|
|
||||||
# Global cache to store translated terms from the Digital Archive
|
# Global cache to store translated terms from the Digital Archive
|
||||||
TRANSLATIONS = {}
|
TRANSLATIONS = {}
|
||||||
@@ -43,7 +34,7 @@ archeologicky_zaznam_l = [
|
|||||||
typ_dat_vocab = {
|
typ_dat_vocab = {
|
||||||
"akce": "Akce",
|
"akce": "Akce",
|
||||||
"lokalita": "Lokalita",
|
"lokalita": "Lokalita",
|
||||||
"samostatny_nalez": "Samostatný nález",
|
"samostatny_nalez": "PAS",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -55,14 +46,6 @@ def _log(msg: str, level=Qgis.MessageLevel.Info):
|
|||||||
QgsMessageLog.logMessage(msg, "AMČR login", level)
|
QgsMessageLog.logMessage(msg, "AMČR login", level)
|
||||||
|
|
||||||
|
|
||||||
def _log_data(msg: str, level=Qgis.MessageLevel.Info):
|
|
||||||
"""
|
|
||||||
Shortcut: writes a message to the QGIS log used by the data download
|
|
||||||
(Messages panel → AMČR tab).
|
|
||||||
"""
|
|
||||||
QgsMessageLog.logMessage(msg, "AMČR", level)
|
|
||||||
|
|
||||||
|
|
||||||
def login_to_api(username: str, password: str):
|
def login_to_api(username: str, password: str):
|
||||||
"""
|
"""
|
||||||
Logs in to the Digiarchiv API using a username and password.
|
Logs in to the Digiarchiv API using a username and password.
|
||||||
@@ -118,9 +101,8 @@ def login_to_api(username: str, password: str):
|
|||||||
|
|
||||||
except requests.exceptions.HTTPError as e:
|
except requests.exceptions.HTTPError as e:
|
||||||
status = e.response.status_code if e.response is not None else None
|
status = e.response.status_code if e.response is not None else None
|
||||||
telo = (e.response.text[:300] if e.response is not None
|
_log(f"CHYBA HTTP {status if status else '?'}: "
|
||||||
else "žádná odpověď")
|
f"{e.response.text[:300] if e.response is not None else 'žádná odpověď'}",
|
||||||
_log(f"CHYBA HTTP {status if status else '?'}: {telo}",
|
|
||||||
Qgis.MessageLevel.Critical)
|
Qgis.MessageLevel.Critical)
|
||||||
LAST_LOGIN_ERROR = 'auth' if status in (401, 403) else 'network'
|
LAST_LOGIN_ERROR = 'auth' if status in (401, 403) else 'network'
|
||||||
return None
|
return None
|
||||||
@@ -208,21 +190,6 @@ def _api_get_json(url, params, timeout=30) -> dict:
|
|||||||
_log("Přihlašovací údaje nejsou uloženy – pokračuji anonymně.",
|
_log("Přihlašovací údaje nejsou uloženy – pokračuji anonymně.",
|
||||||
Qgis.MessageLevel.Warning)
|
Qgis.MessageLevel.Warning)
|
||||||
|
|
||||||
# Log the URL that was actually sent, so a query returning nothing can
|
|
||||||
# be replayed in a browser instead of being reconstructed from the code
|
|
||||||
url_log = resp.url
|
|
||||||
if len(url_log) > 500:
|
|
||||||
url_log = f"{url_log[:500]}… (celkem {len(resp.url)} znaků)"
|
|
||||||
_log_data(f"GET {url_log}")
|
|
||||||
|
|
||||||
# The API reports errors with HTTP 200 and an 'error' key instead of
|
|
||||||
# a 'response' block – without this the caller sees only empty results
|
|
||||||
if isinstance(body, dict) and body.get("error"):
|
|
||||||
_log_data(
|
|
||||||
f"API vrátilo chybu: {body['error']}",
|
|
||||||
Qgis.MessageLevel.Critical
|
|
||||||
)
|
|
||||||
|
|
||||||
if body is None:
|
if body is None:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
f"API nevrátilo platný JSON (HTTP {resp.status_code})"
|
f"API nevrátilo platný JSON (HTTP {resp.status_code})"
|
||||||
@@ -345,14 +312,6 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
else:
|
else:
|
||||||
base_params[key] = str(value).strip()
|
base_params[key] = str(value).strip()
|
||||||
|
|
||||||
# Filters exactly as they arrived from the dialog – an empty result
|
|
||||||
# caused by a stray filter is otherwise indistinguishable from an
|
|
||||||
# empty map window
|
|
||||||
_log_data(
|
|
||||||
f"Stahuji '{typ_dat}' (bbox={bb}, komponenty={komponenty}), "
|
|
||||||
f"filtry: {filters if filters else 'žádné'}"
|
|
||||||
)
|
|
||||||
|
|
||||||
docs = []
|
docs = []
|
||||||
current_page = 0
|
current_page = 0
|
||||||
BATCH_DOCS = 500 # Records per API request
|
BATCH_DOCS = 500 # Records per API request
|
||||||
@@ -383,10 +342,6 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
# gets an explicit error/warning instead of a silent partial result
|
# gets an explicit error/warning instead of a silent partial result
|
||||||
network_error = False
|
network_error = False
|
||||||
|
|
||||||
# Set when the API answers with an error instead of a result set –
|
|
||||||
# keeps an invalid parameter distinguishable from an empty result
|
|
||||||
api_error = False
|
|
||||||
|
|
||||||
# --- API PAGINATION LOOP ---
|
# --- API PAGINATION LOOP ---
|
||||||
while True:
|
while True:
|
||||||
base_params['rows'] = BATCH_DOCS
|
base_params['rows'] = BATCH_DOCS
|
||||||
@@ -397,24 +352,11 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
resp_json = _api_get_json(url, params=base_params, timeout=30)
|
resp_json = _api_get_json(url, params=base_params, timeout=30)
|
||||||
|
data = resp_json.get('response', {})
|
||||||
# Errors arrive with HTTP 200 and no 'response' block;
|
|
||||||
# _api_get_json has already logged the reason
|
|
||||||
if 'response' not in resp_json:
|
|
||||||
api_error = True
|
|
||||||
break
|
|
||||||
|
|
||||||
data = resp_json['response']
|
|
||||||
batch_docs = data.get('docs', [])
|
batch_docs = data.get('docs', [])
|
||||||
num_found = data.get('numFound', 0)
|
num_found = data.get('numFound', 0)
|
||||||
|
|
||||||
if not batch_docs:
|
if not batch_docs:
|
||||||
if current_page == 0:
|
|
||||||
_log_data(
|
|
||||||
"Dotaz proběhl v pořádku, ale nevrátil žádný "
|
|
||||||
f"záznam (numFound={num_found}).",
|
|
||||||
Qgis.MessageLevel.Warning
|
|
||||||
)
|
|
||||||
break
|
break
|
||||||
|
|
||||||
fetched_total += len(batch_docs)
|
fetched_total += len(batch_docs)
|
||||||
@@ -474,15 +416,6 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
if api_error and not docs:
|
|
||||||
iface.messageBar().pushMessage(
|
|
||||||
"AMCR",
|
|
||||||
"Dotaz na API selhal – podrobnosti v panelu Zprávy, "
|
|
||||||
"záložka AMČR.",
|
|
||||||
level=Qgis.MessageLevel.Critical
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
if not docs:
|
if not docs:
|
||||||
iface.messageBar().pushMessage(
|
iface.messageBar().pushMessage(
|
||||||
"AMCR",
|
"AMCR",
|
||||||
@@ -499,7 +432,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
# to a list of its associated metadata
|
# to a list of its associated metadata
|
||||||
pian_lookup = {}
|
pian_lookup = {}
|
||||||
target_pian_ids = set()
|
target_pian_ids = set()
|
||||||
entries_with_geom = 0
|
actions_with_geom = 0
|
||||||
|
|
||||||
# Helper: safely extract a single value
|
# Helper: safely extract a single value
|
||||||
def g(doc, key, default=""):
|
def g(doc, key, default=""):
|
||||||
@@ -527,7 +460,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
if only_projektove_akce and not doc.get("akce_projekt", False):
|
if only_projektove_akce and not doc.get("akce_projekt", False):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
entries_with_geom += 1
|
actions_with_geom += 1
|
||||||
|
|
||||||
# Extract protected fields ('or {}' – key may hold None)
|
# Extract protected fields ('or {}' – key may hold None)
|
||||||
az_chranene = doc.get('az_chranene_udaje') or {}
|
az_chranene = doc.get('az_chranene_udaje') or {}
|
||||||
@@ -633,8 +566,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
|
|
||||||
for dj in djs:
|
for dj in djs:
|
||||||
# Skip negative evidence units if requested
|
# Skip negative evidence units if requested
|
||||||
if (skip_negativni
|
if skip_negativni and dj.get('dj_negativni_jednotka') is True:
|
||||||
and dj.get('dj_negativni_jednotka') is True):
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
komps = dj.get('dj_komponenta', [])
|
komps = dj.get('dj_komponenta', [])
|
||||||
@@ -654,8 +586,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
dj_id = dj.get('ident_cely')
|
dj_id = dj.get('ident_cely')
|
||||||
dj_typ = dj.get('dj_typ')
|
dj_typ = dj.get('dj_typ')
|
||||||
|
|
||||||
# Merge shared metadata with documentation
|
# Merge shared metadata with documentation unit-specific fields
|
||||||
# unit-specific fields
|
|
||||||
dj_meta = {
|
dj_meta = {
|
||||||
**meta,
|
**meta,
|
||||||
'dj_id': dj_id,
|
'dj_id': dj_id,
|
||||||
@@ -702,8 +633,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
or {}
|
or {}
|
||||||
).get('value', ""),
|
).get('value', ""),
|
||||||
}
|
}
|
||||||
pian_lookup[dj_pian_value].append(
|
pian_lookup[dj_pian_value].append(komp_meta)
|
||||||
komp_meta)
|
|
||||||
target_pian_ids_count += 1
|
target_pian_ids_count += 1
|
||||||
else:
|
else:
|
||||||
# DJ without components — still include
|
# DJ without components — still include
|
||||||
@@ -717,8 +647,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
'komponenta_areal': "",
|
'komponenta_areal': "",
|
||||||
'komponenta_obdobi': "",
|
'komponenta_obdobi': "",
|
||||||
}
|
}
|
||||||
pian_lookup[dj_pian_value].append(
|
pian_lookup[dj_pian_value].append(empty_meta)
|
||||||
empty_meta)
|
|
||||||
target_pian_ids_count += 1
|
target_pian_ids_count += 1
|
||||||
else:
|
else:
|
||||||
target_pian_ids_count += 1
|
target_pian_ids_count += 1
|
||||||
@@ -744,7 +673,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
|
|
||||||
iface.messageBar().pushMessage(
|
iface.messageBar().pushMessage(
|
||||||
"AMCR",
|
"AMCR",
|
||||||
f"Záznamů: {len(docs)} (z toho {entries_with_geom} s mapou). "
|
f"Záznamů: {len(docs)} (z toho {actions_with_geom} s mapou). "
|
||||||
f"Stahuji {total_pians} unikátních geometrií, "
|
f"Stahuji {total_pians} unikátních geometrií, "
|
||||||
f"vykresluji {target_pian_ids_count} geometrií...",
|
f"vykresluji {target_pian_ids_count} geometrií...",
|
||||||
level=Qgis.MessageLevel.Info
|
level=Qgis.MessageLevel.Info
|
||||||
@@ -772,14 +701,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
try:
|
try:
|
||||||
QApplication.processEvents()
|
QApplication.processEvents()
|
||||||
r_json = _api_get_json(url, params=params_pian, timeout=15)
|
r_json = _api_get_json(url, params=params_pian, timeout=15)
|
||||||
if 'response' not in r_json:
|
docs_pian.extend(r_json.get('response', {}).get('docs', []))
|
||||||
QgsMessageLog.logMessage(
|
|
||||||
"API nevrátilo geometrie PIAN pro dávku "
|
|
||||||
f"{i // BATCH_PIAN + 1} – viz chyba výše.",
|
|
||||||
"AMČR", Qgis.MessageLevel.Warning
|
|
||||||
)
|
|
||||||
continue
|
|
||||||
docs_pian.extend(r_json['response'].get('docs', []))
|
|
||||||
except requests.exceptions.RequestException as e:
|
except requests.exceptions.RequestException as e:
|
||||||
# Network is down – stop immediately instead of
|
# Network is down – stop immediately instead of
|
||||||
# uselessly retrying every remaining batch
|
# uselessly retrying every remaining batch
|
||||||
@@ -796,130 +718,16 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
)
|
)
|
||||||
|
|
||||||
elif typ_dat == "samostatny_nalez":
|
elif typ_dat == "samostatny_nalez":
|
||||||
nalezy = {}
|
|
||||||
|
|
||||||
for doc in docs:
|
for doc in docs:
|
||||||
sn_loc = g_list(doc, "loc")
|
loc = g(doc, "loc", [])
|
||||||
if not sn_loc:
|
if not loc:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
entries_with_geom += 1
|
actions_with_geom += 1
|
||||||
|
|
||||||
sn_id = g(
|
|
||||||
doc,
|
|
||||||
"ident_cely"
|
|
||||||
)
|
|
||||||
sn_nalezce = g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_nalezce"
|
|
||||||
)
|
|
||||||
sn_hloubka = g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_hloubka"
|
|
||||||
)
|
|
||||||
sn_pristupnost = g(
|
|
||||||
doc,
|
|
||||||
"pristupnost"
|
|
||||||
)
|
|
||||||
sn_datum = g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_datum_nalezu"
|
|
||||||
)
|
|
||||||
sn_poznamka = g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_poznamka"
|
|
||||||
)
|
|
||||||
sn_spec = tr_code(g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_specifikace"
|
|
||||||
))
|
|
||||||
sn_evidencni = g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_evidencni_cislo"
|
|
||||||
)
|
|
||||||
sn_obdobi = tr_code(g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_obdobi"
|
|
||||||
))
|
|
||||||
sn_presna = g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_presna_datace"
|
|
||||||
)
|
|
||||||
sn_okres = g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_okres"
|
|
||||||
)
|
|
||||||
sn_pocet = g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_pocet"
|
|
||||||
)
|
|
||||||
sn_druh = tr_code(g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_druh_nalezu"
|
|
||||||
))
|
|
||||||
sn_predano_org = tr_code(g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_predano_organizace"
|
|
||||||
))
|
|
||||||
sn_okolnosti = tr_code(g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_okolnosti"
|
|
||||||
))
|
|
||||||
sn_projekt = g(
|
|
||||||
doc,
|
|
||||||
"samostatny_nalez_projekt"
|
|
||||||
)
|
|
||||||
|
|
||||||
sn_chranene = doc.get("samostatny_nalez_chranene_udaje") or {}
|
sn_chranene = doc.get("samostatny_nalez_chranene_udaje") or {}
|
||||||
|
|
||||||
sn_lokalizace = g(
|
|
||||||
sn_chranene,
|
|
||||||
"lokalizace"
|
|
||||||
)
|
|
||||||
sn_katastr = sn_chranene.get('katastr', {}).get('value')
|
|
||||||
wkt = None
|
|
||||||
wkt_is_wgs = False
|
|
||||||
if sn_chranene.get('geom_sjtsk_wkt'):
|
|
||||||
wkt = sn_chranene.get('geom_sjtsk_wkt', {}).get('value')
|
|
||||||
elif sn_chranene.get('geom_wkt'):
|
|
||||||
# Fallback geometry is in WGS-84 and must be
|
|
||||||
# transformed to S-JTSK before use
|
|
||||||
wkt = sn_chranene.get('geom_wkt', {}).get('value')
|
|
||||||
wkt_is_wgs = True
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
"ident_cely": sn_id,
|
|
||||||
"projekt": sn_projekt,
|
|
||||||
"okres": sn_okres,
|
|
||||||
"katastr": sn_katastr,
|
|
||||||
"nalezce": sn_nalezce,
|
|
||||||
"datum": sn_datum,
|
|
||||||
"okolnosti": sn_okolnosti,
|
|
||||||
"hloubka_cm": sn_hloubka,
|
|
||||||
"loc": sn_loc,
|
|
||||||
"lokalizace": sn_lokalizace,
|
|
||||||
"obdobi": sn_obdobi,
|
|
||||||
"presna_datace": sn_presna,
|
|
||||||
"nalez": sn_druh,
|
|
||||||
"material": sn_spec,
|
|
||||||
"pocet": sn_pocet,
|
|
||||||
"poznamka": sn_poznamka,
|
|
||||||
"pred_org": sn_predano_org,
|
|
||||||
"evidencni": sn_evidencni,
|
|
||||||
"pristupnost": sn_pristupnost,
|
|
||||||
"wkt": wkt,
|
|
||||||
"wkt_is_wgs": wkt_is_wgs,
|
|
||||||
}
|
|
||||||
|
|
||||||
nalezy[sn_id] = meta
|
|
||||||
|
|
||||||
if not entries_with_geom:
|
|
||||||
iface.messageBar().pushMessage(
|
|
||||||
"AMCR",
|
|
||||||
f"Nalezeno {len(docs)} záznamů, ale žádný nemá geometrii.",
|
|
||||||
level=Qgis.MessageLevel.Warning
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
# ==========================================
|
# ==========================================
|
||||||
# D) LAYER CREATION (QGIS Memory Layers)
|
# D) LAYER CREATION (QGIS Memory Layers)
|
||||||
@@ -928,39 +736,32 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
archeologicky_zaznam = typ_dat_vocab[typ_dat]
|
archeologicky_zaznam = typ_dat_vocab[typ_dat]
|
||||||
|
|
||||||
# Initialize three layers for different geometry types (S-JTSK CRS)
|
# Initialize three layers for different geometry types (S-JTSK CRS)
|
||||||
archeologicky_zaznam_esc = archeologicky_zaznam.replace(" ", "_")
|
|
||||||
vl_poly = QgsVectorLayer(
|
vl_poly = QgsVectorLayer(
|
||||||
"Polygon?crs=epsg:5514",
|
"Polygon?crs=epsg:5514",
|
||||||
f"AMCR_{archeologicky_zaznam_esc}_Polygony",
|
f"AMCR_{archeologicky_zaznam}_Polygony",
|
||||||
"memory"
|
"memory"
|
||||||
)
|
)
|
||||||
vl_line = QgsVectorLayer(
|
vl_line = QgsVectorLayer(
|
||||||
"LineString?crs=epsg:5514",
|
"LineString?crs=epsg:5514",
|
||||||
f"AMCR_{archeologicky_zaznam_esc}_Linie",
|
f"AMCR_{archeologicky_zaznam}_Linie",
|
||||||
"memory"
|
"memory"
|
||||||
)
|
)
|
||||||
vl_point = QgsVectorLayer(
|
vl_point = QgsVectorLayer(
|
||||||
"Point?crs=epsg:5514",
|
"Point?crs=epsg:5514",
|
||||||
f"AMCR_{archeologicky_zaznam_esc}_Body",
|
f"AMCR_{archeologicky_zaznam}_Body",
|
||||||
"memory"
|
"memory"
|
||||||
)
|
)
|
||||||
layers = [vl_poly, vl_line, vl_point]
|
layers = [vl_poly, vl_line, vl_point]
|
||||||
|
|
||||||
# Define attribute table structure
|
# Define attribute table structure
|
||||||
cols = []
|
cols = [
|
||||||
|
QgsField("pian", QMetaType.Type.QString),
|
||||||
if typ_dat in ["akce", "lokalita"]:
|
QgsField("presnost", QMetaType.Type.QString),
|
||||||
cols = [
|
QgsField("pian_typ", QMetaType.Type.QString),
|
||||||
QgsField("pian", QMetaType.Type.QString),
|
QgsField("dj", QMetaType.Type.QString),
|
||||||
QgsField("presnost", QMetaType.Type.QString),
|
QgsField("typ_dj", QMetaType.Type.QString),
|
||||||
QgsField("pian_typ", QMetaType.Type.QString),
|
|
||||||
QgsField("dj", QMetaType.Type.QString),
|
|
||||||
QgsField("typ_dj", QMetaType.Type.QString),
|
|
||||||
]
|
|
||||||
|
|
||||||
cols += [
|
|
||||||
QgsField(typ_dat, QMetaType.Type.QString),
|
|
||||||
QgsField("definicni_body", QMetaType.Type.QString),
|
QgsField("definicni_body", QMetaType.Type.QString),
|
||||||
|
QgsField(typ_dat, QMetaType.Type.QString),
|
||||||
QgsField("odkaz_do_digiarchivu", QMetaType.Type.QString),
|
QgsField("odkaz_do_digiarchivu", QMetaType.Type.QString),
|
||||||
QgsField("okres", QMetaType.Type.QString),
|
QgsField("okres", QMetaType.Type.QString),
|
||||||
QgsField("katastr", QMetaType.Type.QString),
|
QgsField("katastr", QMetaType.Type.QString),
|
||||||
@@ -990,25 +791,8 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
QgsField("druh_lokality", QMetaType.Type.QString),
|
QgsField("druh_lokality", QMetaType.Type.QString),
|
||||||
QgsField("zachovalost", QMetaType.Type.QString),
|
QgsField("zachovalost", QMetaType.Type.QString),
|
||||||
]
|
]
|
||||||
elif typ_dat == "samostatny_nalez":
|
|
||||||
cols += [
|
|
||||||
QgsField("projekt", QMetaType.Type.QString),
|
|
||||||
QgsField("nalezce", QMetaType.Type.QString),
|
|
||||||
QgsField("datum", QMetaType.Type.QString),
|
|
||||||
QgsField("okolnosti", QMetaType.Type.QString),
|
|
||||||
QgsField("hloubka_cm", QMetaType.Type.QString),
|
|
||||||
QgsField("lokalizace", QMetaType.Type.QString),
|
|
||||||
QgsField("obdobi", QMetaType.Type.QString),
|
|
||||||
QgsField("presna_datace", QMetaType.Type.QString),
|
|
||||||
QgsField("nalez", QMetaType.Type.QString),
|
|
||||||
QgsField("material", QMetaType.Type.QString),
|
|
||||||
QgsField("pocet", QMetaType.Type.QString),
|
|
||||||
QgsField("poznamka", QMetaType.Type.QString),
|
|
||||||
QgsField("pred_org", QMetaType.Type.QString),
|
|
||||||
QgsField("evidencni", QMetaType.Type.QString),
|
|
||||||
]
|
|
||||||
|
|
||||||
cols.append(QgsField("pristupnost", QMetaType.Type.QString))
|
cols.append(QgsField("Přístupnost", QMetaType.Type.QString))
|
||||||
|
|
||||||
# Use aliases for technical field names
|
# Use aliases for technical field names
|
||||||
alias_map = {
|
alias_map = {
|
||||||
@@ -1042,20 +826,6 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
"komponenta_areal": "Areál",
|
"komponenta_areal": "Areál",
|
||||||
"komponenta_obdobi": "Období",
|
"komponenta_obdobi": "Období",
|
||||||
"projekt": "Projekt",
|
"projekt": "Projekt",
|
||||||
"pristupnost": "Přístupnost",
|
|
||||||
"nalezce": "Nálezce",
|
|
||||||
"datum": "Datum nálezu",
|
|
||||||
"okolnosti": "Nálezové okolnosti",
|
|
||||||
"hloubka_cm": "Hloubka (cm)",
|
|
||||||
"lokalizace": "Lokalizace",
|
|
||||||
"obdobi": "Období",
|
|
||||||
"presna_datace": "Přesná datace",
|
|
||||||
"nalez": "Nález",
|
|
||||||
"material": "Materiál",
|
|
||||||
"pocet": "Počet předmětů",
|
|
||||||
"poznamka": "Poznámka/bližší popis",
|
|
||||||
"pred_org": "Předáno organizaci",
|
|
||||||
"evidencni": "Evidenční číslo",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if komponenty == "true":
|
if komponenty == "true":
|
||||||
@@ -1085,202 +855,139 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
)
|
)
|
||||||
|
|
||||||
# --- FEATURE POPULATION ---
|
# --- FEATURE POPULATION ---
|
||||||
if typ_dat in ["akce", "lokalita"]:
|
for doc in docs_pian:
|
||||||
for doc in docs_pian:
|
try:
|
||||||
try:
|
pid = doc.get('ident_cely', '')
|
||||||
pid = doc.get('ident_cely', '')
|
if pid not in pian_lookup:
|
||||||
if pid not in pian_lookup:
|
continue
|
||||||
|
|
||||||
|
metas = pian_lookup[pid]
|
||||||
|
|
||||||
|
# Extract WKT geometry from protected JSON data
|
||||||
|
raw = doc.get('pian_chranene_udaje')
|
||||||
|
if isinstance(raw, list) and raw:
|
||||||
|
raw = raw[0]
|
||||||
|
jdata = (
|
||||||
|
json.loads(raw)
|
||||||
|
if isinstance(raw, str)
|
||||||
|
else (raw or {})
|
||||||
|
)
|
||||||
|
|
||||||
|
wkt = None
|
||||||
|
wkt_is_wgs = False
|
||||||
|
if jdata.get('geom_sjtsk_wkt'):
|
||||||
|
wkt = jdata.get('geom_sjtsk_wkt', {}).get('value')
|
||||||
|
elif jdata.get('geom_wkt'):
|
||||||
|
# Fallback geometry is in WGS-84 and must be
|
||||||
|
# transformed to S-JTSK before use
|
||||||
|
wkt = jdata.get('geom_wkt', {}).get('value')
|
||||||
|
wkt_is_wgs = True
|
||||||
|
|
||||||
|
# The API may return the value as a single-item list –
|
||||||
|
# normalize before comparing against filter codes
|
||||||
|
raw_presnost = doc.get('pian_presnost', '')
|
||||||
|
if isinstance(raw_presnost, list):
|
||||||
|
raw_presnost = raw_presnost[0] if raw_presnost else ''
|
||||||
|
raw_typ = doc.get('pian_typ', '')
|
||||||
|
if isinstance(raw_typ, list):
|
||||||
|
raw_typ = raw_typ[0] if raw_typ else ''
|
||||||
|
|
||||||
|
pian_presnost = tr_code(str(raw_presnost))
|
||||||
|
pian_typ = tr_code(str(raw_typ))
|
||||||
|
|
||||||
|
# Final precision filter check
|
||||||
|
if (
|
||||||
|
filters
|
||||||
|
and filters.get('f_pian_presnost')
|
||||||
|
and str(raw_presnost)
|
||||||
|
not in filters.get('f_pian_presnost')
|
||||||
|
):
|
||||||
|
continue
|
||||||
|
|
||||||
|
if wkt:
|
||||||
|
geom = QgsGeometry.fromWkt(wkt)
|
||||||
|
if geom.isNull():
|
||||||
continue
|
continue
|
||||||
|
if wkt_is_wgs:
|
||||||
|
geom.transform(xform_wgs_to_sjtsk)
|
||||||
|
if not geom.isGeosValid():
|
||||||
|
# Try to repair (e.g. self-intersections)
|
||||||
|
# instead of silently dropping the feature
|
||||||
|
geom = geom.makeValid()
|
||||||
|
if geom.isGeosValid():
|
||||||
|
t = geom.type()
|
||||||
|
target_list = None
|
||||||
|
if t == QgsWkbTypes.PolygonGeometry:
|
||||||
|
target_list = feats_p
|
||||||
|
elif t == QgsWkbTypes.LineGeometry:
|
||||||
|
target_list = feats_l
|
||||||
|
elif t == QgsWkbTypes.PointGeometry:
|
||||||
|
target_list = feats_pt
|
||||||
|
|
||||||
metas = pian_lookup[pid]
|
if target_list is None:
|
||||||
|
|
||||||
# Extract WKT geometry from protected JSON data
|
|
||||||
raw = doc.get('pian_chranene_udaje')
|
|
||||||
if isinstance(raw, list) and raw:
|
|
||||||
raw = raw[0]
|
|
||||||
jdata = (
|
|
||||||
json.loads(raw)
|
|
||||||
if isinstance(raw, str)
|
|
||||||
else (raw or {})
|
|
||||||
)
|
|
||||||
|
|
||||||
wkt = None
|
|
||||||
wkt_is_wgs = False
|
|
||||||
if jdata.get('geom_sjtsk_wkt'):
|
|
||||||
wkt = jdata.get('geom_sjtsk_wkt', {}).get('value')
|
|
||||||
elif jdata.get('geom_wkt'):
|
|
||||||
# Fallback geometry is in WGS-84 and must be
|
|
||||||
# transformed to S-JTSK before use
|
|
||||||
wkt = jdata.get('geom_wkt', {}).get('value')
|
|
||||||
wkt_is_wgs = True
|
|
||||||
|
|
||||||
# The API may return the value as a single-item list –
|
|
||||||
# normalize before comparing against filter codes
|
|
||||||
raw_presnost = doc.get('pian_presnost', '')
|
|
||||||
if isinstance(raw_presnost, list):
|
|
||||||
raw_presnost = raw_presnost[0] if raw_presnost else ''
|
|
||||||
raw_typ = doc.get('pian_typ', '')
|
|
||||||
if isinstance(raw_typ, list):
|
|
||||||
raw_typ = raw_typ[0] if raw_typ else ''
|
|
||||||
|
|
||||||
pian_presnost = tr_code(str(raw_presnost))
|
|
||||||
pian_typ = tr_code(str(raw_typ))
|
|
||||||
|
|
||||||
# Final precision filter check
|
|
||||||
if (
|
|
||||||
filters
|
|
||||||
and filters.get('f_pian_presnost')
|
|
||||||
and str(raw_presnost)
|
|
||||||
not in filters.get('f_pian_presnost')
|
|
||||||
):
|
|
||||||
continue
|
|
||||||
|
|
||||||
if wkt:
|
|
||||||
geom = QgsGeometry.fromWkt(wkt)
|
|
||||||
if geom.isNull():
|
|
||||||
continue
|
continue
|
||||||
if wkt_is_wgs:
|
|
||||||
geom.transform(xform_wgs_to_sjtsk)
|
|
||||||
if not geom.isGeosValid():
|
|
||||||
# Try to repair (e.g. self-intersections)
|
|
||||||
# instead of silently dropping the feature
|
|
||||||
geom = geom.makeValid()
|
|
||||||
if geom.isGeosValid():
|
|
||||||
t = geom.type()
|
|
||||||
target_list = None
|
|
||||||
if t == QgsWkbTypes.GeometryType.PolygonGeometry:
|
|
||||||
target_list = feats_p
|
|
||||||
elif t == QgsWkbTypes.GeometryType.LineGeometry:
|
|
||||||
target_list = feats_l
|
|
||||||
elif t == QgsWkbTypes.GeometryType.PointGeometry:
|
|
||||||
target_list = feats_pt
|
|
||||||
|
|
||||||
if target_list is None:
|
is_akce = (typ_dat == "akce")
|
||||||
continue
|
|
||||||
|
|
||||||
is_akce = (typ_dat == "akce")
|
|
||||||
|
|
||||||
# Create a QGIS feature for each documentation unit
|
|
||||||
# associated with this geometry
|
|
||||||
for meta in metas:
|
|
||||||
feat = QgsFeature()
|
|
||||||
feat.setGeometry(geom)
|
|
||||||
atributy = [
|
|
||||||
pid,
|
|
||||||
pian_presnost,
|
|
||||||
pian_typ,
|
|
||||||
meta['dj_id'],
|
|
||||||
meta['dj_typ_value'],
|
|
||||||
meta['ident_cely'],
|
|
||||||
meta['loc'],
|
|
||||||
"https://digiarchiv.aiscr.cz/id/"
|
|
||||||
+ meta['ident_cely'],
|
|
||||||
meta['az_okres'],
|
|
||||||
meta['katastr'],
|
|
||||||
meta['dalsi_katastr'],
|
|
||||||
]
|
|
||||||
if is_akce:
|
|
||||||
atributy.extend([
|
|
||||||
meta['lokalizace_okolnosti'],
|
|
||||||
meta['akce_hlavni_vedouci'],
|
|
||||||
meta['akce_organizace'],
|
|
||||||
meta['akce_specifikace_data'],
|
|
||||||
meta['akce_datum_zahajeni'],
|
|
||||||
meta['akce_datum_ukonceni'],
|
|
||||||
meta['akce_hlavni_typ'],
|
|
||||||
meta['akce_vedlejsi_typ'],
|
|
||||||
meta['dj_negativni'],
|
|
||||||
meta['akce_je_nz'],
|
|
||||||
meta['projekt'],
|
|
||||||
])
|
|
||||||
else:
|
|
||||||
atributy.extend([
|
|
||||||
meta['lokalita_nazev'],
|
|
||||||
meta['lokalita_popis'],
|
|
||||||
meta['lokalita_typ'],
|
|
||||||
meta['lokalita_druh'],
|
|
||||||
meta['lokalita_zachovalost'],
|
|
||||||
])
|
|
||||||
|
|
||||||
atributy.append(meta['pristupnost'])
|
|
||||||
|
|
||||||
if komponenty == "true":
|
|
||||||
atributy.extend([
|
|
||||||
meta.get('komponenta_id', ""),
|
|
||||||
meta.get('komponenta_areal', ""),
|
|
||||||
meta.get('komponenta_obdobi', ""),
|
|
||||||
])
|
|
||||||
|
|
||||||
feat.setAttributes(atributy)
|
|
||||||
target_list.append(feat)
|
|
||||||
|
|
||||||
except Exception as ex:
|
|
||||||
QgsMessageLog.logMessage(
|
|
||||||
f"Chyba při tvorbě feature: {ex}",
|
|
||||||
"AMČR", Qgis.MessageLevel.Warning
|
|
||||||
)
|
|
||||||
|
|
||||||
elif typ_dat == "samostatny_nalez":
|
|
||||||
for n in nalezy.values():
|
|
||||||
try:
|
|
||||||
wkt = n["wkt"]
|
|
||||||
wkt_is_wgs = n["wkt_is_wgs"]
|
|
||||||
|
|
||||||
if wkt:
|
|
||||||
geom = QgsGeometry.fromWkt(wkt)
|
|
||||||
if geom.isNull():
|
|
||||||
continue
|
|
||||||
if wkt_is_wgs:
|
|
||||||
geom.transform(xform_wgs_to_sjtsk)
|
|
||||||
if not geom.isGeosValid():
|
|
||||||
geom = geom.makeValid()
|
|
||||||
if geom.isGeosValid():
|
|
||||||
t = geom.type()
|
|
||||||
target_list = None
|
|
||||||
if t == QgsWkbTypes.GeometryType.PolygonGeometry:
|
|
||||||
target_list = feats_p
|
|
||||||
elif t == QgsWkbTypes.GeometryType.LineGeometry:
|
|
||||||
target_list = feats_l
|
|
||||||
elif t == QgsWkbTypes.GeometryType.PointGeometry:
|
|
||||||
target_list = feats_pt
|
|
||||||
|
|
||||||
if target_list is None:
|
|
||||||
continue
|
|
||||||
|
|
||||||
|
# Create a QGIS feature for each documentation unit
|
||||||
|
# associated with this geometry
|
||||||
|
for meta in metas:
|
||||||
feat = QgsFeature()
|
feat = QgsFeature()
|
||||||
feat.setGeometry(geom)
|
feat.setGeometry(geom)
|
||||||
atributy = [
|
atributy = [
|
||||||
n["ident_cely"],
|
pid,
|
||||||
n["loc"],
|
pian_presnost,
|
||||||
|
pian_typ,
|
||||||
|
meta['dj_id'],
|
||||||
|
meta['dj_typ_value'],
|
||||||
|
meta['loc'],
|
||||||
|
meta['ident_cely'],
|
||||||
"https://digiarchiv.aiscr.cz/id/"
|
"https://digiarchiv.aiscr.cz/id/"
|
||||||
+ n['ident_cely'],
|
+ meta['ident_cely'],
|
||||||
n["okres"],
|
meta['az_okres'],
|
||||||
n["katastr"],
|
meta['katastr'],
|
||||||
"",
|
meta['dalsi_katastr'],
|
||||||
n["projekt"],
|
|
||||||
n["nalezce"],
|
|
||||||
n["datum"],
|
|
||||||
n["okolnosti"],
|
|
||||||
n["hloubka_cm"],
|
|
||||||
n["lokalizace"],
|
|
||||||
n["obdobi"],
|
|
||||||
n["presna_datace"],
|
|
||||||
n["nalez"],
|
|
||||||
n["material"],
|
|
||||||
n["pocet"],
|
|
||||||
n["poznamka"],
|
|
||||||
n["pred_org"],
|
|
||||||
n["evidencni"],
|
|
||||||
n["pristupnost"],
|
|
||||||
]
|
]
|
||||||
|
if is_akce:
|
||||||
|
atributy.extend([
|
||||||
|
meta['lokalizace_okolnosti'],
|
||||||
|
meta['akce_hlavni_vedouci'],
|
||||||
|
meta['akce_organizace'],
|
||||||
|
meta['akce_specifikace_data'],
|
||||||
|
meta['akce_datum_zahajeni'],
|
||||||
|
meta['akce_datum_ukonceni'],
|
||||||
|
meta['akce_hlavni_typ'],
|
||||||
|
meta['akce_vedlejsi_typ'],
|
||||||
|
meta['dj_negativni'],
|
||||||
|
meta['akce_je_nz'],
|
||||||
|
meta['projekt'],
|
||||||
|
])
|
||||||
|
else:
|
||||||
|
atributy.extend([
|
||||||
|
meta['lokalita_nazev'],
|
||||||
|
meta['lokalita_popis'],
|
||||||
|
meta['lokalita_typ'],
|
||||||
|
meta['lokalita_druh'],
|
||||||
|
meta['lokalita_zachovalost'],
|
||||||
|
])
|
||||||
|
|
||||||
|
atributy.append(meta['pristupnost'])
|
||||||
|
|
||||||
|
if komponenty == "true":
|
||||||
|
atributy.extend([
|
||||||
|
meta.get('komponenta_id', ""),
|
||||||
|
meta.get('komponenta_areal', ""),
|
||||||
|
meta.get('komponenta_obdobi', ""),
|
||||||
|
])
|
||||||
|
|
||||||
feat.setAttributes(atributy)
|
feat.setAttributes(atributy)
|
||||||
target_list.append(feat)
|
target_list.append(feat)
|
||||||
|
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
f"Chyba při tvorbě feature: {ex}",
|
f"Chyba při tvorbě feature: {ex}",
|
||||||
"AMČR", Qgis.MessageLevel.Warning
|
"AMČR", Qgis.MessageLevel.Warning
|
||||||
)
|
)
|
||||||
|
|
||||||
# --- ADDING TO QGIS INTERFACE ---
|
# --- ADDING TO QGIS INTERFACE ---
|
||||||
proj = QgsProject.instance()
|
proj = QgsProject.instance()
|
||||||
@@ -1295,7 +1002,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
if f:
|
if f:
|
||||||
L.dataProvider().addFeatures(f)
|
L.dataProvider().addFeatures(f)
|
||||||
L.updateExtents()
|
L.updateExtents()
|
||||||
L.setName(f"AMCR_{archeologicky_zaznam_esc}_{n}")
|
L.setName(f"AMCR_{archeologicky_zaznam}_{n}")
|
||||||
proj.addMapLayer(L)
|
proj.addMapLayer(L)
|
||||||
added += len(f)
|
added += len(f)
|
||||||
|
|
||||||
@@ -1314,7 +1021,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
elif added > 0:
|
elif added > 0:
|
||||||
iface.messageBar().pushMessage(
|
iface.messageBar().pushMessage(
|
||||||
"AMCR",
|
"AMCR",
|
||||||
f"Hotovo. Záznamů: {len(docs)} (s geom: {entries_with_geom}). "
|
f"Hotovo. Záznamů: {len(docs)} (s geom: {actions_with_geom}). "
|
||||||
f"Vykresleno: {added} prvků.",
|
f"Vykresleno: {added} prvků.",
|
||||||
level=Qgis.MessageLevel.Success
|
level=Qgis.MessageLevel.Success
|
||||||
)
|
)
|
||||||
|
|||||||
+15
-17
@@ -1,13 +1,12 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
import os.path
|
from qgis.PyQt.QtCore import QSettings, QTranslator, QCoreApplication, QUrl
|
||||||
|
from qgis.PyQt.QtGui import QIcon, QDesktopServices
|
||||||
|
from qgis.PyQt.QtWidgets import QMenu, QAction, QToolButton, QDialog
|
||||||
from qgis.core import Qgis
|
from qgis.core import Qgis
|
||||||
from qgis.PyQt.QtCore import QCoreApplication, QSettings, QTranslator, QUrl
|
|
||||||
from qgis.PyQt.QtGui import QDesktopServices, QIcon
|
|
||||||
from qgis.PyQt.QtWidgets import QAction, QDialog, QMenu, QToolButton
|
|
||||||
|
|
||||||
from .amcr_dialog import AmcrFilterDialog, LoginDialog
|
|
||||||
from .amcr_tools import load_amcr_data, login_to_api
|
from .amcr_tools import load_amcr_data, login_to_api
|
||||||
|
from .amcr_dialog import AmcrFilterDialog, LoginDialog
|
||||||
|
import os.path
|
||||||
|
|
||||||
|
|
||||||
class AmcrViewer:
|
class AmcrViewer:
|
||||||
@@ -30,7 +29,7 @@ class AmcrViewer:
|
|||||||
locale_path = os.path.join(
|
locale_path = os.path.join(
|
||||||
self.plugin_dir,
|
self.plugin_dir,
|
||||||
'i18n',
|
'i18n',
|
||||||
f'AmcrViewer_{locale}.qm'
|
'AmcrViewer_{}.qm'.format(locale)
|
||||||
)
|
)
|
||||||
|
|
||||||
# Install the translator if a translation file
|
# Install the translator if a translation file
|
||||||
@@ -42,7 +41,7 @@ class AmcrViewer:
|
|||||||
|
|
||||||
# Initialize internal state
|
# Initialize internal state
|
||||||
self.actions = []
|
self.actions = []
|
||||||
self.menu = self.tr('&AMČR Viewer')
|
self.menu = self.tr(u'&AMČR Viewer')
|
||||||
self.first_start = None
|
self.first_start = None
|
||||||
|
|
||||||
def tr(self, message):
|
def tr(self, message):
|
||||||
@@ -91,7 +90,7 @@ class AmcrViewer:
|
|||||||
"""
|
"""
|
||||||
# Define paths for action-specific icons
|
# Define paths for action-specific icons
|
||||||
icon_akce_path = os.path.join(self.plugin_dir, 'akce.png')
|
icon_akce_path = os.path.join(self.plugin_dir, 'akce.png')
|
||||||
icon_pas_path = os.path.join(self.plugin_dir, 'sn.png')
|
icon_pas_path = os.path.join(self.plugin_dir, 'akce.png')
|
||||||
icon_lokality_path = os.path.join(self.plugin_dir, 'lokality.png')
|
icon_lokality_path = os.path.join(self.plugin_dir, 'lokality.png')
|
||||||
icon_amcr_help_path = os.path.join(self.plugin_dir, 'amcr-help.png')
|
icon_amcr_help_path = os.path.join(self.plugin_dir, 'amcr-help.png')
|
||||||
|
|
||||||
@@ -103,7 +102,7 @@ class AmcrViewer:
|
|||||||
# custom dropdown menu
|
# custom dropdown menu
|
||||||
self.action_download_akce = self.add_action(
|
self.action_download_akce = self.add_action(
|
||||||
icon_path=icon_akce_path,
|
icon_path=icon_akce_path,
|
||||||
text=self.tr('Stáhnout data akcí | AMČR Viewer'),
|
text=self.tr(u'Stáhnout data akcí | AMČR Viewer'),
|
||||||
callback=lambda checked=False: self.run_download('akce'),
|
callback=lambda checked=False: self.run_download('akce'),
|
||||||
parent=self.iface.mainWindow(),
|
parent=self.iface.mainWindow(),
|
||||||
add_to_menu=False,
|
add_to_menu=False,
|
||||||
@@ -113,9 +112,8 @@ class AmcrViewer:
|
|||||||
|
|
||||||
self.action_download_pas = self.add_action(
|
self.action_download_pas = self.add_action(
|
||||||
icon_path=icon_pas_path,
|
icon_path=icon_pas_path,
|
||||||
text=self.tr('Stáhnout data samostatných nálezů | AMČR Viewer'),
|
text=self.tr(u'Stáhnout data samostatných nálezů | AMČR Viewer'),
|
||||||
callback=lambda checked=False: self.run_download(
|
callback=lambda checked=False: self.run_download('samostatny_nalez'),
|
||||||
'samostatny_nalez'),
|
|
||||||
parent=self.iface.mainWindow(),
|
parent=self.iface.mainWindow(),
|
||||||
add_to_menu=False,
|
add_to_menu=False,
|
||||||
add_to_toolbar=False
|
add_to_toolbar=False
|
||||||
@@ -124,7 +122,7 @@ class AmcrViewer:
|
|||||||
|
|
||||||
self.action_download_lokality = self.add_action(
|
self.action_download_lokality = self.add_action(
|
||||||
icon_path=icon_lokality_path,
|
icon_path=icon_lokality_path,
|
||||||
text=self.tr('Stáhnout data lokalit | AMČR Viewer'),
|
text=self.tr(u'Stáhnout data lokalit | AMČR Viewer'),
|
||||||
callback=lambda checked=False: self.run_download('lokalita'),
|
callback=lambda checked=False: self.run_download('lokalita'),
|
||||||
parent=self.iface.mainWindow(),
|
parent=self.iface.mainWindow(),
|
||||||
add_to_menu=False,
|
add_to_menu=False,
|
||||||
@@ -133,8 +131,8 @@ class AmcrViewer:
|
|||||||
self.plugin_menu.addAction(self.action_download_lokality)
|
self.plugin_menu.addAction(self.action_download_lokality)
|
||||||
|
|
||||||
self.action_login_dialog = self.add_action(
|
self.action_login_dialog = self.add_action(
|
||||||
icon_path=icon_pas_path,
|
icon_path=icon_akce_path,
|
||||||
text=self.tr('Přihlásit se | AMČR Viewer'),
|
text=self.tr(u'Přihlásit se | AMČR Viewer'),
|
||||||
callback=lambda checked=False: self.login(),
|
callback=lambda checked=False: self.login(),
|
||||||
parent=self.iface.mainWindow(),
|
parent=self.iface.mainWindow(),
|
||||||
add_to_menu=False,
|
add_to_menu=False,
|
||||||
@@ -144,7 +142,7 @@ class AmcrViewer:
|
|||||||
|
|
||||||
self.action_amcr_help = self.add_action(
|
self.action_amcr_help = self.add_action(
|
||||||
icon_path=icon_amcr_help_path,
|
icon_path=icon_amcr_help_path,
|
||||||
text=self.tr('Nápověda AMČR Help | AMČR Viewer'),
|
text=self.tr(u'Nápověda AMČR Help | AMČR Viewer'),
|
||||||
callback=lambda checked=False: self.open_help(),
|
callback=lambda checked=False: self.open_help(),
|
||||||
parent=self.iface.mainWindow(),
|
parent=self.iface.mainWindow(),
|
||||||
add_to_menu=False,
|
add_to_menu=False,
|
||||||
|
|||||||
+178
-206
File diff suppressed because it is too large.
Load diff
@@ -8,7 +8,7 @@ name=AMČR Viewer
|
|||||||
qgisMinimumVersion=3.44.0
|
qgisMinimumVersion=3.44.0
|
||||||
qgisMaximumVersion=4.99.0
|
qgisMaximumVersion=4.99.0
|
||||||
description=Viewing and downloading the AMČR data.
|
description=Viewing and downloading the AMČR data.
|
||||||
version=2.1.2
|
version=2.0.2
|
||||||
author=David Spáčil
|
author=David Spáčil
|
||||||
email=spacil@arub.cz
|
email=spacil@arub.cz
|
||||||
|
|
||||||
@@ -23,19 +23,9 @@ repository=https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer
|
|||||||
hasProcessingProvider=no
|
hasProcessingProvider=no
|
||||||
# Uncomment the following line and add your changelog:
|
# Uncomment the following line and add your changelog:
|
||||||
changelog=
|
changelog=
|
||||||
Plný seznam změn v češtině je dostupný zde: https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/releases/tag/v2.1.1
|
Aktualizace na verzi 2.0.0 výrazně mění chování pluginu. Před updatem je doporučeno přečíst si seznam změn níže.
|
||||||
v2.1.2 (2026-09-01)
|
Version 2.0.0 changes the plugin behavior dramatically. It is advised to check the changelog below.
|
||||||
* Qt6 compatibility
|
Plný seznam změn v češtině je dostupný zde: https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/releases/tag/v2.0.0
|
||||||
* Code clean-up
|
|
||||||
v2.1.1 (2026-09-01)
|
|
||||||
* Added download of Individual finds (PAS), including a dedicated menu entry
|
|
||||||
* Added filtering by date
|
|
||||||
* Added filtering of project fieldwork events and a Project column in the attribute table
|
|
||||||
* Codelists are now built from the Digiarchiv API as well, not only from OAI-PMH; persons come from its facets by role (finder, fieldwork leader)
|
|
||||||
* Updated the bundled codelist file
|
|
||||||
* Filter dialog is now scrollable
|
|
||||||
* Empty API results are now diagnosable from the Messages panel: the query URL and API errors are logged
|
|
||||||
* Code clean-up
|
|
||||||
v2.0.2 (2026-06-13)
|
v2.0.2 (2026-06-13)
|
||||||
* Plugin-wide fixes and optimalizations (details https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/pull/49)
|
* Plugin-wide fixes and optimalizations (details https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/pull/49)
|
||||||
v2.0.1 (2026-06-10)
|
v2.0.1 (2026-06-10)
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 871 B |
@@ -1,44 +0,0 @@
|
|||||||
# Konfigurace lintů pro tento repozitář.
|
|
||||||
#
|
|
||||||
# Plugin se nedistribuuje jako Python balíček (do QGISu jde ZIP složky
|
|
||||||
# amcr_viewer/), takže tenhle soubor nic nebalí ani neinstaluje – slouží
|
|
||||||
# jen k tomu, aby ruff choval stejně v CI, lokálně i za rok. Bez explicitní
|
|
||||||
# konfigurace se výchozí sada pravidel mezi verzemi ruffu mění.
|
|
||||||
#
|
|
||||||
# Konfigurace flake8 je záměrně jinde: v amcr_viewer/.flake8, protože ji
|
|
||||||
# musí najít i scanner na plugins.qgis.org.
|
|
||||||
|
|
||||||
[tool.ruff]
|
|
||||||
line-length = 79
|
|
||||||
# QGIS 3.44 běží na Pythonu 3.9 a novějším
|
|
||||||
target-version = "py39"
|
|
||||||
# Generovaný výstup pyrcc, "All changes made in this file will be lost"
|
|
||||||
extend-exclude = ["amcr_viewer/resources.py"]
|
|
||||||
|
|
||||||
[tool.ruff.lint]
|
|
||||||
select = [
|
|
||||||
"E", # pycodestyle – chyby
|
|
||||||
"W", # pycodestyle – varování
|
|
||||||
"F", # pyflakes
|
|
||||||
"I", # pořadí importů
|
|
||||||
"UP", # zastaralé konstrukce
|
|
||||||
"B", # bugbear
|
|
||||||
"C4", # comprehensions
|
|
||||||
"SIM", # zjednodušení
|
|
||||||
"RET", # návratové hodnoty
|
|
||||||
"BLE", # holé except
|
|
||||||
]
|
|
||||||
ignore = [
|
|
||||||
# Hlavička "# -*- coding: utf-8 -*-" je konvence šablony Plugin
|
|
||||||
# Builderu a drží se v celém projektu jednotně.
|
|
||||||
"UP009",
|
|
||||||
# "except Exception" je v pluginu záměr: výjimka nesmí propadnout do
|
|
||||||
# QGISu, chyba se uživateli ukáže v liště zpráv.
|
|
||||||
"BLE001",
|
|
||||||
# Obě dotčená místa mají ke každé větvi vysvětlující komentář,
|
|
||||||
# sloučením do jednoho výrazu by se čitelnost zhoršila.
|
|
||||||
"SIM103",
|
|
||||||
# contextlib.suppress() by kvůli jednomu místu přidal import a odsunul
|
|
||||||
# komentář, který vysvětluje, proč tam ta výjimka je.
|
|
||||||
"SIM105",
|
|
||||||
]
|
|
||||||
+7
-23
@@ -9,7 +9,7 @@
|
|||||||
id="svg1"
|
id="svg1"
|
||||||
xml:space="preserve"
|
xml:space="preserve"
|
||||||
sodipodi:docname="icon.svg"
|
sodipodi:docname="icon.svg"
|
||||||
inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
|
inkscape:version="1.4.3 (0d15f75, 2025-12-25)"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
@@ -24,12 +24,12 @@
|
|||||||
inkscape:deskcolor="#d1d1d1"
|
inkscape:deskcolor="#d1d1d1"
|
||||||
inkscape:document-units="mm"
|
inkscape:document-units="mm"
|
||||||
inkscape:zoom="22.627417"
|
inkscape:zoom="22.627417"
|
||||||
inkscape:cx="0.57452426"
|
inkscape:cx="6.8059028"
|
||||||
inkscape:cy="15.556349"
|
inkscape:cy="14.606174"
|
||||||
inkscape:window-width="1920"
|
inkscape:window-width="1920"
|
||||||
inkscape:window-height="1131"
|
inkscape:window-height="1009"
|
||||||
inkscape:window-x="0"
|
inkscape:window-x="1912"
|
||||||
inkscape:window-y="0"
|
inkscape:window-y="-8"
|
||||||
inkscape:window-maximized="1"
|
inkscape:window-maximized="1"
|
||||||
inkscape:current-layer="layer1" /><defs
|
inkscape:current-layer="layer1" /><defs
|
||||||
id="defs1"><clipPath
|
id="defs1"><clipPath
|
||||||
@@ -96,20 +96,4 @@
|
|||||||
d="M 3.3486328 2.4970052 L 3.3486328 3.8323242 L 2.7424683 3.8323242 L 4.2085286 5.738151 L 5.674589 3.8323242 L 5.0684245 3.8323242 L 5.0684245 2.4970052 L 3.3486328 2.4970052 z "
|
d="M 3.3486328 2.4970052 L 3.3486328 3.8323242 L 2.7424683 3.8323242 L 4.2085286 5.738151 L 5.674589 3.8323242 L 5.0684245 3.8323242 L 5.0684245 2.4970052 L 3.3486328 2.4970052 z "
|
||||||
inkscape:export-filename="path32.png"
|
inkscape:export-filename="path32.png"
|
||||||
inkscape:export-xdpi="3000"
|
inkscape:export-xdpi="3000"
|
||||||
inkscape:export-ydpi="3000" /><rect
|
inkscape:export-ydpi="3000" /></g></svg>
|
||||||
style="opacity:1;fill:#85140e;fill-opacity:1;stroke:none;stroke-width:0.414999;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke fill markers"
|
|
||||||
id="rect1"
|
|
||||||
width="1.672105"
|
|
||||||
height="1.2511554"
|
|
||||||
x="-4.501821"
|
|
||||||
y="4.2814822" /><text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-size:0.705556px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';text-align:start;writing-mode:lr-tb;direction:ltr;text-anchor:start;opacity:1;fill:#85140e;fill-opacity:1;stroke:none;stroke-width:0.414999;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke fill markers"
|
|
||||||
x="-2.6360023"
|
|
||||||
y="5.1136947"
|
|
||||||
id="text1"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan1"
|
|
||||||
style="font-size:0.705556px;fill:#85140e;fill-opacity:1;stroke-width:0.415"
|
|
||||||
x="-2.6360023"
|
|
||||||
y="5.1136947">lokality</tspan></text></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 6.3 KiB |
@@ -1,85 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
"""
|
|
||||||
Repository hygiene rules that need no QGIS and therefore run first.
|
|
||||||
|
|
||||||
Each rule guards a mistake that has already happened here at least once,
|
|
||||||
or one the plugins.qgis.org file analysis reports:
|
|
||||||
|
|
||||||
* a UTF-8 BOM makes the official pyqgis4-checker skip the file entirely,
|
|
||||||
so a broken file looks clean – it is silent, which is what makes it bad
|
|
||||||
* a direct PyQt5/PyQt6 import breaks the other Qt version
|
|
||||||
* an executable or hidden file in the package is reported on upload
|
|
||||||
|
|
||||||
Run it from the repository root:
|
|
||||||
|
|
||||||
python3 tests/check_sources.py
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
import stat
|
|
||||||
import sys
|
|
||||||
|
|
||||||
ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
||||||
BALICEK = os.path.join(ROOT, "amcr_viewer")
|
|
||||||
|
|
||||||
# Files that belong in the plugin package even though the upload scanner
|
|
||||||
# would otherwise call them hidden
|
|
||||||
POVOLENE_SKRYTE = {".flake8", ".bandit", ".secrets.baseline"}
|
|
||||||
|
|
||||||
# Extensions that have no business inside a plugin package
|
|
||||||
PODEZRELE = {".exe", ".dll", ".so", ".dylib", ".sh", ".bat", ".cmd",
|
|
||||||
".pyc", ".pyd", ".jar", ".bin"}
|
|
||||||
|
|
||||||
PRIMY_IMPORT = re.compile(r"^\s*(?:from|import)\s+PyQt[56]\b", re.MULTILINE)
|
|
||||||
|
|
||||||
nalezy = []
|
|
||||||
|
|
||||||
|
|
||||||
def zdrojaky():
|
|
||||||
for adresar, _, soubory in os.walk(BALICEK):
|
|
||||||
for soubor in sorted(soubory):
|
|
||||||
if soubor.endswith(".py"):
|
|
||||||
yield os.path.join(adresar, soubor)
|
|
||||||
|
|
||||||
|
|
||||||
def vsechny_soubory():
|
|
||||||
for adresar, _, soubory in os.walk(BALICEK):
|
|
||||||
for soubor in sorted(soubory):
|
|
||||||
yield os.path.join(adresar, soubor)
|
|
||||||
|
|
||||||
|
|
||||||
def zkratka(cesta):
|
|
||||||
return os.path.relpath(cesta, ROOT)
|
|
||||||
|
|
||||||
|
|
||||||
for cesta in zdrojaky():
|
|
||||||
with open(cesta, "rb") as f:
|
|
||||||
zacatek = f.read(3)
|
|
||||||
if zacatek == b"\xef\xbb\xbf":
|
|
||||||
nalezy.append(f"{zkratka(cesta)}: UTF-8 BOM na začátku souboru")
|
|
||||||
|
|
||||||
with open(cesta, encoding="utf-8-sig") as f:
|
|
||||||
text = f.read()
|
|
||||||
for shoda in PRIMY_IMPORT.finditer(text):
|
|
||||||
radek = text[:shoda.start()].count("\n") + 1
|
|
||||||
nalezy.append(f"{zkratka(cesta)}:{radek}: přímý import z PyQt5/PyQt6, "
|
|
||||||
f"použij shim qgis.PyQt")
|
|
||||||
|
|
||||||
for cesta in vsechny_soubory():
|
|
||||||
jmeno = os.path.basename(cesta)
|
|
||||||
rezim = os.stat(cesta).st_mode
|
|
||||||
if rezim & (stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH):
|
|
||||||
nalezy.append(f"{zkratka(cesta)}: spustitelná práva "
|
|
||||||
f"({stat.filemode(rezim)})")
|
|
||||||
if jmeno.startswith(".") and jmeno not in POVOLENE_SKRYTE:
|
|
||||||
nalezy.append(f"{zkratka(cesta)}: skrytý soubor v balíčku pluginu")
|
|
||||||
if os.path.splitext(jmeno)[1].lower() in PODEZRELE:
|
|
||||||
nalezy.append(f"{zkratka(cesta)}: podezřelý typ souboru")
|
|
||||||
|
|
||||||
if nalezy:
|
|
||||||
print("Nálezy:")
|
|
||||||
for nalez in nalezy:
|
|
||||||
print(f" {nalez}")
|
|
||||||
sys.exit(1)
|
|
||||||
print("Kontrola zdrojáků: bez nálezů")
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
"""
|
|
||||||
Smoke test: loads the plugin inside a real QGIS and exercises the parts
|
|
||||||
that differ between Qt5 and Qt6.
|
|
||||||
|
|
||||||
It is deliberately offline – no request ever leaves the machine, so the
|
|
||||||
test says nothing about the AMCR API, only about the plugin loading and
|
|
||||||
its widgets being constructible.
|
|
||||||
|
|
||||||
Run it from the repository root:
|
|
||||||
|
|
||||||
python3 tests/smoke_test.py
|
|
||||||
|
|
||||||
QGIS must be importable (inside the qgis/qgis Docker image it already is).
|
|
||||||
The exit code is 0 when everything passed, 1 otherwise.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import traceback
|
|
||||||
|
|
||||||
# Offscreen, otherwise the dialogs need an X server
|
|
||||||
os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
|
|
||||||
|
|
||||||
ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
||||||
sys.path.insert(0, ROOT)
|
|
||||||
|
|
||||||
selhani = []
|
|
||||||
|
|
||||||
|
|
||||||
def zkouska(nazev, funkce):
|
|
||||||
"""Runs one check and keeps going even when it raises."""
|
|
||||||
try:
|
|
||||||
detail = funkce()
|
|
||||||
except Exception:
|
|
||||||
selhani.append(nazev)
|
|
||||||
print(f" FAIL {nazev}")
|
|
||||||
print(traceback.format_exc().rstrip())
|
|
||||||
else:
|
|
||||||
print(f" OK {nazev}" + (f" – {detail}" if detail else ""))
|
|
||||||
|
|
||||||
|
|
||||||
from qgis.core import ( # noqa: E402
|
|
||||||
Qgis,
|
|
||||||
QgsApplication,
|
|
||||||
QgsTask,
|
|
||||||
QgsWkbTypes,
|
|
||||||
)
|
|
||||||
from qgis.PyQt import QtCore # noqa: E402
|
|
||||||
from qgis.PyQt.QtCore import QDate # noqa: E402
|
|
||||||
|
|
||||||
print(f"QGIS {Qgis.QGIS_VERSION.split('-')[0]} | Qt {QtCore.QT_VERSION_STR} "
|
|
||||||
f"| PyQt {QtCore.PYQT_VERSION_STR}")
|
|
||||||
|
|
||||||
QgsApplication.setPrefixPath(os.environ.get("QGIS_PREFIX_PATH", "/usr"), True)
|
|
||||||
qgs = QgsApplication([], True)
|
|
||||||
qgs.initQgis()
|
|
||||||
|
|
||||||
import amcr_viewer.amcr_codelists # noqa: E402,F401
|
|
||||||
import amcr_viewer.amcr_dialog as dialog # noqa: E402
|
|
||||||
import amcr_viewer.amcr_tools # noqa: E402,F401
|
|
||||||
import amcr_viewer.amcr_viewer # noqa: E402,F401
|
|
||||||
|
|
||||||
print(" OK import všech modulů pluginu")
|
|
||||||
|
|
||||||
|
|
||||||
def enumy():
|
|
||||||
"""
|
|
||||||
The scoped enum forms must exist. Unscoped aliases still resolve in
|
|
||||||
QGIS 4.2, so a plain import proves nothing – these are read explicitly.
|
|
||||||
"""
|
|
||||||
return (f"QgsTask.Flag.CanCancel={int(QgsTask.Flag.CanCancel)}, "
|
|
||||||
f"PointGeometry={int(QgsWkbTypes.GeometryType.PointGeometry)}, "
|
|
||||||
f"MessageLevel.Info={int(Qgis.MessageLevel.Info)}")
|
|
||||||
|
|
||||||
|
|
||||||
def uloha():
|
|
||||||
ukol = dialog.UpdateCodelistsTask("smoke")
|
|
||||||
assert ukol.canCancel() is True
|
|
||||||
return "canCancel=True"
|
|
||||||
|
|
||||||
|
|
||||||
def dialogy():
|
|
||||||
# A modal warning would block the offscreen run forever
|
|
||||||
dialog.QMessageBox.warning = staticmethod(lambda *a, **k: None)
|
|
||||||
popis = []
|
|
||||||
for typ in ("akce", "lokalita", "samostatny_nalez"):
|
|
||||||
okno = dialog.AmcrFilterDialog(typ)
|
|
||||||
okno.show()
|
|
||||||
QgsApplication.processEvents()
|
|
||||||
popis.append(f"{typ}: {len(okno.date_ranges)} rozmezí")
|
|
||||||
okno.close()
|
|
||||||
return ", ".join(popis)
|
|
||||||
|
|
||||||
|
|
||||||
def filtr_datumu():
|
|
||||||
"""
|
|
||||||
A half-filled range must be completed with the sentinel. The API
|
|
||||||
rejects a one-sided range, so this is the part worth guarding.
|
|
||||||
|
|
||||||
The expected value is written out on purpose – comparing against
|
|
||||||
dialog.DATE_OPEN_TO would only prove the module agrees with itself.
|
|
||||||
"""
|
|
||||||
okno = dialog.AmcrFilterDialog("samostatny_nalez")
|
|
||||||
pole, _, od, _do = okno.date_ranges[0]
|
|
||||||
od.setDate(QDate(2016, 1, 1))
|
|
||||||
hodnota = okno.get_filters()[pole]
|
|
||||||
assert hodnota == "2016-01-01,9999-12-31", hodnota
|
|
||||||
|
|
||||||
# A range left completely empty must add no filter at all
|
|
||||||
prazdne = dialog.AmcrFilterDialog("samostatny_nalez")
|
|
||||||
pole_prazdne = prazdne.date_ranges[0][0]
|
|
||||||
assert pole_prazdne not in prazdne.get_filters()
|
|
||||||
prazdne.close()
|
|
||||||
|
|
||||||
okno.close()
|
|
||||||
return hodnota
|
|
||||||
|
|
||||||
|
|
||||||
zkouska("scoped enumy", enumy)
|
|
||||||
zkouska("UpdateCodelistsTask", uloha)
|
|
||||||
zkouska("filtrační dialogy", dialogy)
|
|
||||||
zkouska("filtr podle data", filtr_datumu)
|
|
||||||
|
|
||||||
qgs.exitQgis()
|
|
||||||
|
|
||||||
if selhani:
|
|
||||||
print(f"\nNEPROŠLO: {', '.join(selhani)}")
|
|
||||||
sys.exit(1)
|
|
||||||
print("\nVše prošlo")
|
|
||||||
Reference in new issue
Block a user