mirror of
https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer.git
synced 2026-10-11 13:27:33 +02:00
Compare commits
8
Commits
70aba60d12
...
v2.1.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dfb3a9ef9b | ||
|
|
48e0e2a3b5 | ||
|
|
5841fc15de | ||
|
|
f8d938e353 | ||
|
|
2b783cd13b | ||
|
|
06036f2af0 | ||
|
|
8fa81394f2 | ||
|
|
1d5220ee61 |
No files matched your search
@@ -25,7 +25,7 @@ Nepotřebné body můžeš smazat. Komentáře (<!-- ... -->) se v PR nezobrazuj
|
||||
|
||||
## Kontrolní seznam
|
||||
- [ ] Změny jsou v souladu se stylem projektu (viz `AGENTS.md`)
|
||||
- [ ] Při změně funkcí povýšena verze v `amcr_viewer/metadata.txt` a doplněn `changelog`
|
||||
- [ ] Při změně funkcí povýšena verze v `amcr_viewer/metadata.txt` (+ `changelog`) a v `CITATION.cff` (`version`, `date-released`)
|
||||
- [ ] Otestováno v QGIS (min. podporovaná verze 3.44)
|
||||
- [ ] PR míří do správné cílové větve
|
||||
- [ ] Větev odpovídá konvenci (`feat/ fix/ docs/ chore/<téma>`, AI `agents/<jméno>/<téma>`)
|
||||
|
||||
@@ -74,10 +74,10 @@ jobs:
|
||||
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.
|
||||
# Na plugins.qgis.org je informativní, tady blokuje. Bez konfigurace,
|
||||
# tj. se stejnými výchozími pravidly jako scanner.
|
||||
- name: Flake8
|
||||
run: flake8 --config amcr_viewer/.flake8 amcr_viewer/
|
||||
run: flake8 --isolated amcr_viewer/
|
||||
|
||||
# Nad rámec plugins.qgis.org; konfigurace v pyproject.toml
|
||||
- name: Ruff
|
||||
@@ -147,14 +147,27 @@ jobs:
|
||||
- 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í.
|
||||
# Verze v CITATION.cff se povyšuje ručně spolu s metadata.txt a snadno
|
||||
# se zapomene – tag by pak nesl v citaci jinou verzi než plugin
|
||||
- name: Verify CITATION.cff version
|
||||
run: |
|
||||
plugin=$(sed -n 's/^version=//p' amcr_viewer/metadata.txt \
|
||||
| tr -d "\r\"' ")
|
||||
citace=$(sed -n 's/^version://p' CITATION.cff \
|
||||
| tr -d "\r\"' ")
|
||||
echo "metadata.txt: '$plugin', CITATION.cff: '$citace'"
|
||||
if [ -z "$plugin" ] || [ "$plugin" != "$citace" ]; then
|
||||
echo "::error file=CITATION.cff::verze '$citace' neodpovídá" \
|
||||
"metadata.txt ('$plugin')"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Kontrola obsahu ZIPu: povinné soubory jsou uvnitř, git soubory ne.
|
||||
- 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
|
||||
amcr_viewer/LICENSE; do
|
||||
unzip -l amcr_viewer.zip | grep -qF " $soubor" \
|
||||
|| { echo "::error::v ZIPu chybí $soubor"; exit 1; }
|
||||
done
|
||||
|
||||
@@ -140,6 +140,9 @@ flatpak run --command=sh org.qgis.qgis -c \
|
||||
- Verze pluginu žije v **`amcr_viewer/metadata.txt`** (`version=`).
|
||||
- **Při každé změně chování / nové funkci** povyš verzi a doplň položku do
|
||||
`changelog=` v `metadata.txt` (formát `vX.Y.Z (RRRR-MM-DD)` + odrážky).
|
||||
- Současně povyš i **`CITATION.cff`** v kořeni repozitáře: `version:` na
|
||||
stejnou verzi jako v `metadata.txt` a `date-released:` na datum releasu.
|
||||
Oba soubory musí mít stejnou verzi, než se založí tag.
|
||||
- Datum v changelogu ber z **deterministického zdroje**, ne z paměti, např.
|
||||
`python -c "import datetime; print(datetime.date.today().isoformat())"`.
|
||||
- Release se spouští **pushnutím tagu `vX.Y.Z`**, ne publikací releasu
|
||||
@@ -189,7 +192,7 @@ tohle:
|
||||
| **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 |
|
||||
| **Balíček pluginu** | ověří shodu verze v `CITATION.cff` a `metadata.txt`, 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.
|
||||
@@ -205,7 +208,7 @@ 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/
|
||||
flake8 --isolated amcr_viewer/
|
||||
ruff check .
|
||||
|
||||
# smoke test v obou verzích QGIS (docker, bez instalace čehokoli)
|
||||
@@ -222,11 +225,12 @@ Na co si dát pozor:
|
||||
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.
|
||||
- **Flake8 běží bez konfigurace** (`--isolated`), tedy se stejnými
|
||||
výchozími pravidly jako scanner na plugins.qgis.org. Do balíčku nepatří
|
||||
`.flake8`, `.bandit` ani `.secrets.baseline`: scanner by plugin označil
|
||||
jako „Validated (configured)“ a nález je lepší opravit v kódu.
|
||||
Konfigurace ruffu je 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
|
||||
Czech Republic (https://digiarchiv.aiscr.cz/).
|
||||
license: GPL-3.0
|
||||
version: '2.0.0'
|
||||
date-released: '2026-06-05'
|
||||
version: '2.1.4'
|
||||
date-released: '2026-10-01'
|
||||
@@ -1,6 +1 @@
|
||||
# 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`.
|
||||
@AGENTS.md
|
||||
@@ -1,182 +1,431 @@
|
||||
# AMCR Viewer: QGIS Plugin Documentation
|
||||
# AMČR Viewer — QGIS plugin
|
||||
|
||||
[](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)
|
||||
|
||||
**Platform:** QGIS 3.44.0–4.99.0
|
||||
**AMČR Viewer** queries the Digital Archive of the Archaeological Map of the
|
||||
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)
|
||||
| | |
|
||||
| --- | --- |
|
||||
| **Source data** | [Digital Archive AMČR](https://digiarchiv.aiscr.cz/) (AIS CR) |
|
||||
| **Supported QGIS** | 3.44.0 – 4.99.0 (Qt 5 and Qt 6) |
|
||||
| **Output** | temporary `memory` layers, S-JTSK / **EPSG:5514** |
|
||||
| **Access** | anonymous by default; optional login for non-public records |
|
||||
| **UI language** | Czech |
|
||||
| **Licence** | GPL-3.0 |
|
||||
|
||||
---
|
||||
|
||||
## 1. Overview
|
||||
## 1. What it can download
|
||||
|
||||
**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.
|
||||
The plugin covers three AMČR record types. Each has its own menu entry, its
|
||||
own set of filters and its own attribute table.
|
||||
|
||||
### Key Features
|
||||
| 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. |
|
||||
|
||||
* **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.
|
||||
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.
|
||||
|
||||
## 2. Installation Guide
|
||||
### Key features
|
||||
|
||||
**Install the latest version of the plugin from the QGIS plugin repository.**
|
||||
* **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.
|
||||
|
||||
**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.*
|
||||
## 2. Installation
|
||||
|
||||
## 3. User Manual
|
||||
### From the QGIS plugin repository (recommended)
|
||||
|
||||
### 3.1 Authentication (Optional)
|
||||
*Plugins → Manage and Install Plugins… → search for* **AMČR Viewer** *→
|
||||
Install*.
|
||||
|
||||
By default, the plugin accesses only publicly available records (accessibility = anonymous). To access non-public data, log in using your AMČR account:
|
||||
### From a ZIP archive (older versions, or a build from source)
|
||||
|
||||
* 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.
|
||||
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*.
|
||||
|
||||
### 3.2 Data Retrieval
|
||||
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.
|
||||
|
||||
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.
|
||||
After installation the **AMČR Viewer** button appears in the toolbar as a
|
||||
dropdown.
|
||||
|
||||
* **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.)*
|
||||
### Requirements
|
||||
|
||||
* **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).
|
||||
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`).
|
||||
|
||||
* **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.
|
||||
## 3. User manual
|
||||
|
||||
* 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).
|
||||
### 3.1 Toolbar and menu
|
||||
|
||||
For a more in-depth tutorial refer to the [AMČR Documentation](https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html) (only in Czech).
|
||||
The toolbar button is a dropdown; the default action is *Stáhnout data akcí*.
|
||||
|
||||
### 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 |
|
||||
| Menu entry | Action |
|
||||
| --- | --- |
|
||||
| pian | PIAN (spatial identifier) ID |
|
||||
| presnost | Spatial deviation \[units/tens/hundreds of meters/defined by cadastre\] |
|
||||
| pian\_typ | \[point/line/polygon\] |
|
||||
| dj | Documentation unit ID |
|
||||
| typ\_dj | \[trench/event part/whole event/cadastral territory\] |
|
||||
| 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\] |
|
||||
| *Stáhnout data akcí* | Opens the filter dialog for Fieldwork events. |
|
||||
| *Stáhnout data samostatných nálezů* | Opens the filter dialog for Individual finds. |
|
||||
| *Stáhnout data lokalit* | Opens the filter dialog for Sites. |
|
||||
| *Přihlásit se* | Opens the login dialog (see 3.2). |
|
||||
| *Nápověda AMČR Help* | Opens the online documentation in a browser. |
|
||||
|
||||
#### 3.3.2 Fields related to *Fieldwork events*
|
||||
### 3.2 Authentication (optional)
|
||||
|
||||
| Field | Description |
|
||||
By default the plugin sees only publicly accessible records. Logging in with
|
||||
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
|
||||
metadata.txt plugin metadata and changelog
|
||||
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 |
|
||||
| --- | --- |
|
||||
| akce\_lokalizace | Verbal description of the event location |
|
||||
| vedouci | Main fieldwork manager |
|
||||
| organizace | Organisation conducting the research |
|
||||
| specifikace\_data | \[exact date/exact years/sometime in years\] |
|
||||
| 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\] |
|
||||
| **Lint a bezpečnost** | `tests/check_sources.py`, bandit, detect-secrets, flake8, ruff |
|
||||
| **Kompatibilita s Qt6** | `pyqgis4-checker` in dry-run mode |
|
||||
| **Smoke test** | loads the plugin in headless QGIS — both `ltr` (Qt 5) and `stable` (Qt 6) |
|
||||
| **Balíček pluginu** | builds `amcr_viewer.zip`, asserts its contents, uploads it as an artifact |
|
||||
|
||||
#### 3.3.3 Fields related to *Sites*
|
||||
Reproducing them locally:
|
||||
|
||||
| Field | Description |
|
||||
| --- | --- |
|
||||
| nazev\_lokality | Site name |
|
||||
| popis\_lokality | Site description |
|
||||
| typ\_lokality | Site classification by definition method |
|
||||
| druh\_lokality | Site classification by the nature of identified field relics |
|
||||
| zachovalost | Site preservation state |
|
||||
```bash
|
||||
python3 tests/check_sources.py
|
||||
ruff check .
|
||||
flake8 --isolated amcr_viewer/
|
||||
bandit -r amcr_viewer/
|
||||
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
|
||||
```
|
||||
|
||||
#### 3.3.4 Component fields (only when *Načíst komponenty* is checked)
|
||||
---
|
||||
|
||||
| Field | Description |
|
||||
| --- | --- |
|
||||
| komponenta | Component ID |
|
||||
| komponenta\_areal | Activity area \[settlement/burial area/field/…\] |
|
||||
| komponenta\_obdobi | Period \[Neolithic/High Middle Ages–Modern Period/…\] |
|
||||
## 6. Links and resources
|
||||
|
||||
## 4. Technical Architecture
|
||||
* [AMČR / Digiarchiv documentation](https://amcr-help.aiscr.cz/) (Czech only)
|
||||
* [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)
|
||||
|
||||
The plugin is developed in **Python 3** using the **PyQt6** framework for the GUI and the **Requests** library for HTTP communication.
|
||||
## Citing
|
||||
|
||||
> **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`).
|
||||
Cite the plugin using [`CITATION.cff`](./CITATION.cff) or the concept DOI
|
||||
[10.5281/zenodo.18609813](https://doi.org/10.5281/zenodo.18609813), which
|
||||
always resolves to the latest release.
|
||||
|
||||
### 4.1 File Structure
|
||||
## Licence
|
||||
|
||||
* `amcr_viewer.py`: Entry point; handles GUI integration, toolbar/menu setup, and login flow.
|
||||
* `amcr_dialog.py`: Manages the UI logic, including `AmcrFilterDialog`, `FilterableSelectionDialog`, and `LoginDialog`.
|
||||
* `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.
|
||||
|
||||
### 4.2 Data Flow & API Integration
|
||||
|
||||
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).
|
||||
GPL-3.0 — see [`LICENSE`](./LICENSE).
|
||||
@@ -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
|
||||
@@ -104,6 +104,21 @@ def load_all_data():
|
||||
return categorized_data
|
||||
|
||||
|
||||
def _facet_name(item):
|
||||
"""
|
||||
Returns the value of one facet item from the Digiarchive API.
|
||||
|
||||
Digiarchive v4.1.0 (Solr 10, json.nl=arrarr) returns facet items as
|
||||
["value", count] pairs; older versions returned {"name": "value", ...}
|
||||
objects. Both shapes are accepted so the plugin works against either.
|
||||
"""
|
||||
if isinstance(item, dict):
|
||||
return item.get("name")
|
||||
if isinstance(item, (list, tuple)) and item:
|
||||
return item[0]
|
||||
return None
|
||||
|
||||
|
||||
def fetch_set(base_url, internal_name, api_set, task=None):
|
||||
dataset = []
|
||||
params_amcr = {
|
||||
@@ -206,7 +221,9 @@ def fetch_set(base_url, internal_name, api_set, task=None):
|
||||
|
||||
for r in records:
|
||||
|
||||
nazev = r["name"]
|
||||
nazev = _facet_name(r)
|
||||
if not nazev:
|
||||
continue
|
||||
|
||||
dataset.append({
|
||||
'Název': nazev,
|
||||
@@ -217,17 +234,48 @@ def fetch_set(base_url, internal_name, api_set, task=None):
|
||||
break
|
||||
|
||||
except Exception as e:
|
||||
# A partial set (e.g. pagination interrupted halfway) would
|
||||
# silently drop codes – report the whole set as failed instead
|
||||
# and let the caller keep the previous values
|
||||
QgsMessageLog.logMessage(
|
||||
f"Chyba u setu {api_set}: {e}",
|
||||
"AMČR", Qgis.MessageLevel.Warning)
|
||||
break
|
||||
return []
|
||||
|
||||
return dataset
|
||||
|
||||
|
||||
def download_heslare(task=None):
|
||||
"""Fetches the codelists from the AMČR API and saves it to a CSV file."""
|
||||
def _read_existing_rows():
|
||||
"""
|
||||
Returns the rows of the current heslar.csv grouped by category, so a set
|
||||
that fails to download can keep its previous values.
|
||||
"""
|
||||
rows = {}
|
||||
if not os.path.exists(OUTPUT_FILE):
|
||||
return rows
|
||||
try:
|
||||
with open(OUTPUT_FILE, encoding='utf-8-sig', newline='') as f:
|
||||
for row in csv.DictReader(f, delimiter=';'):
|
||||
cat = (row.get('Kategorie') or '').strip()
|
||||
if cat:
|
||||
rows.setdefault(cat, []).append(row)
|
||||
except Exception as e:
|
||||
QgsMessageLog.logMessage(
|
||||
f"Nelze načíst stávající hesláře: {e}",
|
||||
"AMČR", Qgis.MessageLevel.Warning)
|
||||
return rows
|
||||
|
||||
|
||||
def download_heslare(task=None, failed=None):
|
||||
"""
|
||||
Fetches the codelists from the AMČR API and saves it to a CSV file.
|
||||
|
||||
A set that fails or comes back empty keeps its rows from the current
|
||||
heslar.csv instead of being wiped; its name is appended to ``failed``
|
||||
(if given) so the caller can warn the user.
|
||||
"""
|
||||
ensure_codelists_dir()
|
||||
existing = _read_existing_rows()
|
||||
all_data = []
|
||||
total_sets = len(slovnicek)
|
||||
# index, (interni, api_nazev)
|
||||
@@ -251,6 +299,18 @@ def download_heslare(task=None):
|
||||
if data is None:
|
||||
return False # Cancelled mid-download
|
||||
|
||||
if not data:
|
||||
# Never replace a working codelist with nothing – an API change
|
||||
# would otherwise silently empty the filter in the dialog
|
||||
old = existing.get(interni, [])
|
||||
QgsMessageLog.logMessage(
|
||||
f"Heslář '{interni}' se nepodařilo stáhnout, "
|
||||
f"ponechávám předchozí hodnoty ({len(old)} položek).",
|
||||
"AMČR", Qgis.MessageLevel.Warning)
|
||||
if failed is not None:
|
||||
failed.append(interni)
|
||||
data = old
|
||||
|
||||
all_data.extend(data)
|
||||
|
||||
# Report progress (0-100)
|
||||
@@ -261,7 +321,8 @@ def download_heslare(task=None):
|
||||
# Save to CSV
|
||||
with open(OUTPUT_FILE, 'w', newline='', encoding='utf-8-sig') as f:
|
||||
fieldnames = ['Název', 'Kód', 'Kategorie']
|
||||
writer = csv.DictWriter(f, fieldnames=fieldnames, delimiter=';')
|
||||
writer = csv.DictWriter(f, fieldnames=fieldnames, delimiter=';',
|
||||
extrasaction='ignore')
|
||||
writer.writeheader()
|
||||
writer.writerows(all_data)
|
||||
|
||||
|
||||
@@ -75,12 +75,15 @@ class UpdateCodelistsTask(QgsTask):
|
||||
super().__init__(description, QgsTask.Flag.CanCancel)
|
||||
self.success = False
|
||||
self.exception = None
|
||||
# Codelists that failed to download and kept their previous values
|
||||
self.failed_sets = []
|
||||
|
||||
def run(self):
|
||||
"""Runs in a background thread."""
|
||||
try:
|
||||
# Call the download function with the task reference
|
||||
self.success = download_heslare(task=self)
|
||||
self.success = download_heslare(
|
||||
task=self, failed=self.failed_sets)
|
||||
return self.success
|
||||
except Exception as e:
|
||||
self.exception = e
|
||||
@@ -91,6 +94,13 @@ class UpdateCodelistsTask(QgsTask):
|
||||
if result:
|
||||
# Safely update the global variables in the main thread
|
||||
refresh_globals()
|
||||
if self.failed_sets:
|
||||
QgsMessageLog.logMessage(
|
||||
"Hesláře AMČR aktualizovány částečně, beze změny "
|
||||
f"zůstaly: {', '.join(self.failed_sets)}",
|
||||
"AMČR", Qgis.MessageLevel.Warning
|
||||
)
|
||||
else:
|
||||
QgsMessageLog.logMessage(
|
||||
"Hesláře AMČR byly úspěšně aktualizovány.",
|
||||
"AMČR", Qgis.MessageLevel.Info
|
||||
@@ -629,6 +639,16 @@ class AmcrFilterDialog(QDialog):
|
||||
|
||||
def on_completed():
|
||||
_cleanup()
|
||||
if task.failed_sets:
|
||||
QMessageBox.warning(
|
||||
parent_win,
|
||||
"Hesláře aktualizovány částečně",
|
||||
"Některé hesláře se nepodařilo stáhnout, "
|
||||
"ponechány byly jejich předchozí hodnoty:\n"
|
||||
+ "\n".join(f"• {name}" for name in task.failed_sets)
|
||||
+ "\n\nPodrobnosti jsou v panelu Zprávy, záložka AMČR."
|
||||
)
|
||||
return
|
||||
QMessageBox.information(
|
||||
parent_win,
|
||||
"Hotovo",
|
||||
|
||||
@@ -8,7 +8,7 @@ name=AMČR Viewer
|
||||
qgisMinimumVersion=3.44.0
|
||||
qgisMaximumVersion=4.99.0
|
||||
description=Viewing and downloading the AMČR data.
|
||||
version=2.1.2
|
||||
version=2.1.4
|
||||
author=David Spáčil
|
||||
email=spacil@arub.cz
|
||||
|
||||
@@ -24,6 +24,11 @@ hasProcessingProvider=no
|
||||
# Uncomment the following line and add your 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
|
||||
v2.1.4 (2026-10-01)
|
||||
* Removed unused generated resources.py and the bundled flake8 config, so the plugin passes the plugins.qgis.org scan without custom configuration
|
||||
v2.1.3 (2026-10-01)
|
||||
* Fixed empty person codelists (excavation leaders, finders) after updating codelists against Digiarchive v4.1.0
|
||||
* A codelist that fails to download keeps its previous values and the user is warned
|
||||
v2.1.2 (2026-09-01)
|
||||
* Qt6 compatibility
|
||||
* Code clean-up
|
||||
|
||||
@@ -1,128 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Resource object code
|
||||
#
|
||||
# Created by: The Resource Compiler for PyQt5 (Qt v5.15.13)
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
||||
from qgis.PyQt import QtCore
|
||||
|
||||
qt_resource_data = b"\
|
||||
\x00\x00\x04\x0a\
|
||||
\x89\
|
||||
\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
|
||||
\x00\x00\x17\x00\x00\x00\x18\x08\x06\x00\x00\x00\x11\x7c\x66\x75\
|
||||
\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\
|
||||
\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\
|
||||
\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\
|
||||
\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xd9\x02\x15\
|
||||
\x16\x11\x2c\x9d\x48\x83\xbb\x00\x00\x03\x8a\x49\x44\x41\x54\x48\
|
||||
\xc7\xad\x95\x4b\x68\x5c\x55\x18\xc7\x7f\xe7\xdc\x7b\x67\xe6\xce\
|
||||
\x4c\x66\x26\x49\xd3\x24\x26\xa6\xc6\xf8\x40\x21\xa5\x04\xb3\x28\
|
||||
\xda\x98\x20\xa5\x0b\xad\x55\xa8\x2b\xc5\x50\x1f\xa0\x6e\x34\x2b\
|
||||
\x45\x30\x14\x02\xba\x52\x69\x15\x17\x66\x63\x45\x97\x95\xa0\xad\
|
||||
\x0b\xfb\xc0\x06\x25\xb6\x71\x61\x12\x41\x50\xdb\x2a\x21\xd1\xe2\
|
||||
\x24\xf3\x9e\xc9\xcc\xbd\xe7\x1c\x17\x35\x43\x1e\x33\x21\xb6\xfd\
|
||||
\x56\x87\xf3\x9d\xfb\xfb\x1e\xf7\xff\x9d\x23\x8c\x31\x43\x95\xf4\
|
||||
\x85\x1e\x3f\x3b\x35\xac\xfd\xcc\x43\xdc\xa4\x49\x3b\xfe\x9d\x1d\
|
||||
\xdb\x7b\x22\x90\x78\xf8\xb2\x28\xa7\xbe\x7d\xc1\x4b\x9d\x79\xdf\
|
||||
\x18\x15\xe5\x16\x99\x10\x56\xde\x69\xdc\x3f\x22\xfd\xec\xd4\xf0\
|
||||
\xad\x04\x03\x18\xa3\xa2\x7e\x76\x6a\x58\xde\x68\x2b\xb4\x36\xf8\
|
||||
\xbe\xc6\x18\x53\xdb\xef\xe7\xfa\xec\xed\x67\x63\x10\x42\x00\xf0\
|
||||
\xfb\xd5\x65\x2a\x15\x45\xc7\x6d\x0d\x00\xc4\xa2\xc1\xaa\x6f\x0d\
|
||||
\x3e\x6c\xab\xc2\x1c\x56\xa4\x77\x4b\xb0\xf2\x35\x15\x5f\x21\x85\
|
||||
\xe0\xc8\x6b\x5f\x92\x2d\x37\x33\x39\xf9\x03\x27\x8e\x1f\xa2\xf7\
|
||||
\xbe\x9d\x04\x1c\x0b\x37\xe4\xac\xff\xa6\x30\x87\xbd\xba\x00\x6a\
|
||||
\x06\x79\xe5\xf5\xaf\x89\xd9\x92\xc5\xcc\x0a\xd9\x7c\x19\xcf\xe9\
|
||||
\xe2\xe4\xa9\x2f\x78\x7c\xff\x01\x72\x85\x0a\x2b\x65\x1f\xa5\x4c\
|
||||
\xb5\xb2\x55\x16\x80\xbd\x31\xda\xda\x20\x1f\x7d\x3e\xcd\xc2\xfd\
|
||||
\x59\xa6\x93\x39\x92\xd1\x22\xea\x9b\x16\xce\x9d\x3f\xce\xe0\x83\
|
||||
\x03\x24\x82\x59\x3a\xdb\x7b\x88\xc7\x82\x68\x63\x58\xc9\xcc\x62\
|
||||
\x8c\x21\x18\xb0\x6a\xc3\x37\x06\x49\x16\xff\x24\x6b\xa5\x49\xbb\
|
||||
\x25\xbc\xa2\xa6\x21\xbb\x40\x7f\xdf\x00\x83\xbd\x01\x8e\x3c\xd5\
|
||||
\x45\xd7\x8e\x6b\x9c\x9c\x98\x25\x1a\xb6\xe8\xbe\x3d\xc2\xdd\x77\
|
||||
\x44\x48\xc4\x1c\x22\xe1\xeb\x58\x59\xaf\xcf\xd3\x33\x29\x2e\x34\
|
||||
\x2d\x91\x93\x3e\xbe\x34\x78\x01\xc5\xe2\x61\xc5\xae\x72\x8e\x70\
|
||||
\xc8\xc2\x0d\x5a\xbc\xf5\xee\x2f\x9c\xfa\x3e\x86\x69\x7a\x8e\xcf\
|
||||
\x26\xe6\xf9\x63\xa1\x44\xa1\xa4\xd0\xda\x6c\x0d\x2f\x15\x7c\xb4\
|
||||
\x67\x28\x59\x0a\xcf\xd6\x54\xe2\x06\x13\x87\x2b\x6f\x68\xa6\x27\
|
||||
\xaf\x31\x32\x36\xc7\xb2\x7f\x17\xef\x7d\x7c\x8c\x33\x67\xcf\x12\
|
||||
\x70\x24\x4a\x69\xd6\x6a\x46\xd6\xd3\x70\x72\xa9\x82\x67\x34\x45\
|
||||
\xad\x28\xdb\x1a\x15\x34\x98\xff\x46\xed\xef\x37\x0d\x99\xbf\x4a\
|
||||
\x3c\x30\x38\xc0\xc8\x4b\xaf\x92\x5a\x9c\xe2\xe0\x23\x6d\x74\xb4\
|
||||
\xba\x84\x5d\x0b\x29\x45\x7d\xb8\x94\x82\x96\xb6\x10\xf3\xc5\x12\
|
||||
\x2a\xef\x53\x11\x1a\x63\xad\x3f\x93\x19\x85\xf1\xb1\x77\x58\x5a\
|
||||
\xf8\x99\x97\x9f\xe9\xa6\x75\x47\x90\xc6\xb8\x43\xd8\xb5\xb6\xce\
|
||||
\xfc\xfa\xfd\x00\xfb\x3e\xf4\xc8\x05\x35\xba\x5e\xeb\x46\x21\xf9\
|
||||
\xcf\x0a\xa9\x8c\x87\xe3\x48\xdc\x90\xb5\x6e\x98\x6a\xaa\x65\xf2\
|
||||
\x52\x92\x43\x2f\x5e\xc2\x8c\x02\x1a\x10\xf5\x07\xac\xc3\x75\x70\
|
||||
\x83\x92\x80\xb3\xf9\xd0\x26\xf8\x8f\xb3\x29\xc6\x3e\xb8\x8c\x19\
|
||||
\x35\x75\x6b\x7b\x7e\x3c\xca\x45\x0c\x7e\x49\x31\xf4\x58\x3b\xf7\
|
||||
\xf6\x34\x90\x88\x39\x04\x1c\x59\x1f\xfe\xdb\xd5\x3c\x5f\x9d\x4b\
|
||||
\x32\xfd\x44\xb2\xba\xd7\xfa\xb6\x60\xcf\xde\x16\xdc\x90\x45\x4c\
|
||||
\x4a\x2a\x9e\x62\xfe\x4e\xc5\xc8\xc1\x4e\xda\x76\x86\xe8\xe9\x0a\
|
||||
\xe3\xd8\x92\x58\xd4\xc6\xb2\x44\x6d\x78\x2a\x53\xe1\xca\x7c\x99\
|
||||
\x63\x5d\xbf\x56\x9d\xbd\x9f\x44\x18\x7a\xba\x95\x27\x0f\xb4\xd3\
|
||||
\xdc\x18\xc0\xf3\x0d\x52\x40\xd8\xb5\xb0\xa4\x20\x14\xb2\x70\x6c\
|
||||
\x81\x63\xcb\xaa\x42\xd6\xfd\xb7\xf4\xec\xa3\x06\xa0\x50\x52\xd8\
|
||||
\x4e\x1b\x7e\x4a\xd3\x31\xf9\x29\xcf\xfe\xd4\x49\x7f\x5f\x13\xfb\
|
||||
\xfa\x9b\x71\x43\x92\x58\xd4\x21\x18\x90\xac\xde\xb0\x42\x50\x13\
|
||||
\x58\x33\xf3\x88\x6b\xa1\xfd\x65\x96\xf2\x79\xc6\x43\x7b\xd8\x75\
|
||||
\x38\xcc\x3d\xdd\xd1\xaa\xcf\x71\xe4\xff\x7f\x91\x56\x33\xaf\xea\
|
||||
\x37\xe7\xa1\x94\x21\x16\xb5\xd1\x06\x2c\x29\x36\xf5\x72\x9b\x96\
|
||||
\x95\xc0\xc4\xda\x9d\x78\x83\x43\x53\x22\x80\x65\x09\x1c\xfb\x86\
|
||||
\xc1\x00\xe7\x25\x70\x14\x48\x6f\x1e\x22\x51\xe3\x75\xd9\xb6\xa5\
|
||||
\x81\xa3\x32\xb1\xfb\xf4\x0c\x30\xb8\xb1\x82\x9b\xb0\x09\x60\x30\
|
||||
\xb1\xfb\xf4\xcc\xbf\xa0\xe9\x6e\xae\x5a\xdf\x4b\x81\x00\x00\x00\
|
||||
\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
|
||||
"
|
||||
|
||||
qt_resource_name = b"\
|
||||
\x00\x07\
|
||||
\x07\x3b\xe0\xb3\
|
||||
\x00\x70\
|
||||
\x00\x6c\x00\x75\x00\x67\x00\x69\x00\x6e\x00\x73\
|
||||
\x00\x0b\
|
||||
\x06\x1f\xb8\xc2\
|
||||
\x00\x61\
|
||||
\x00\x6d\x00\x63\x00\x72\x00\x5f\x00\x76\x00\x69\x00\x65\x00\x77\x00\x65\x00\x72\
|
||||
\x00\x08\
|
||||
\x0a\x61\x5a\xa7\
|
||||
\x00\x69\
|
||||
\x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
|
||||
"
|
||||
|
||||
qt_resource_struct_v1 = b"\
|
||||
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
|
||||
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
|
||||
\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
|
||||
\x00\x00\x00\x30\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
||||
"
|
||||
|
||||
qt_resource_struct_v2 = b"\
|
||||
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
|
||||
\x00\x00\x00\x00\x00\x00\x00\x00\
|
||||
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
|
||||
\x00\x00\x00\x00\x00\x00\x00\x00\
|
||||
\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
|
||||
\x00\x00\x00\x00\x00\x00\x00\x00\
|
||||
\x00\x00\x00\x30\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
|
||||
\x00\x00\x01\x9c\x23\xfd\x16\x70\
|
||||
"
|
||||
|
||||
qt_version = [int(v) for v in QtCore.qVersion().split('.')]
|
||||
if qt_version < [5, 8, 0]:
|
||||
rcc_version = 1
|
||||
qt_resource_struct = qt_resource_struct_v1
|
||||
else:
|
||||
rcc_version = 2
|
||||
qt_resource_struct = qt_resource_struct_v2
|
||||
|
||||
def qInitResources():
|
||||
QtCore.qRegisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
|
||||
|
||||
def qCleanupResources():
|
||||
QtCore.qUnregisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
|
||||
|
||||
qInitResources()
|
||||
+3
-4
@@ -5,15 +5,14 @@
|
||||
# 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.
|
||||
# Flake8 záměrně žádnou konfiguraci nemá a běží s výchozími pravidly – stejně
|
||||
# jako scanner na plugins.qgis.org. Config soubor v balíčku by plugin
|
||||
# označil jako „Validated (configured)“.
|
||||
|
||||
[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 = [
|
||||
|
||||
@@ -23,10 +23,6 @@ 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"}
|
||||
@@ -72,7 +68,9 @@ for cesta in vsechny_soubory():
|
||||
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:
|
||||
# No exceptions: scanner config files (.flake8, .bandit,
|
||||
# .secrets.baseline) would mark the upload "Validated (configured)"
|
||||
if jmeno.startswith("."):
|
||||
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")
|
||||
|
||||
Reference in new issue
Block a user