22 Commits

Author SHA1 Message Date
david ee558aa718 Merge pull request #49 from ARUP-CAS/agents/claude/fix-optim
Opravy chyb a optimalizace napříč pluginem

Souhrn revize celého kódu pluginu:

- Opravy pádů: chybějící locale při startu QGIS; životní cyklus
  úlohy aktualizace heslářů (GC reference, zákaz souběhu, message
  boxy nad hlavním oknem).
- Datová korektnost: transformace fallback geometrií WGS-84 do
  S-JTSK, oprava nevalidních polygonů přes makeValid(), normalizace
  hodnot pian_presnost/pian_typ, heslář přístupnosti bez záznamů
  s kódem None, ošetření null hodnot u komponent.
- Přihlašování a stahování: ověření údajů před uložením do správce
  autentizace, zřetelné hlášení síťových chyb a neúplných výsledků,
  jedno parsování JSON odpovědí, úspornější stránkování, guard proti
  souběžným stahováním, logování do QgsMessageLog.
- Metadata a CI: oprava ikony pluginu, akce ve workflow povýšeny na
  aktuální verze a připnuty na commit hash, poznámka o závislosti
  na requests v README.

Otestováno ručně v QGIS dle checklistu v PR (včetně hraničních
případů: výpadek sítě, expirovaná session, špatné heslo, zrušení
úlohy, prázdné výsledky, limit záznamů).
2026-06-12 13:59:46 +02:00
Claude eebd7668a5 Workflow: připnutí GitHub Actions na commit hash + aktualizace verzí
Reakce na CodeQL upozornění 'Unpinned tag for a non-immutable Action'.
Tag (v4/v2) může vlastník akce kdykoli přepsat na jiný commit; připnutí
na hash chrání release pipeline před podvržením závislosti.

Zároveň povýšeno na nejnovější verze: actions/checkout v6.0.3
a softprops/action-gh-release v3.0.0 (jen přechod na Node 24 runtime,
bez změn API; hashe ověřeny přes git ls-remote).
2026-06-12 13:46:47 +02:00
Claude fd11bee274 Ověření přihlašovacích údajů před uložením do správce autentizace
Špatné heslo zadané v přihlašovacím dialogu se dosud uložilo do QGIS
Authentication Manageru a chyba se ukázala až po zavření dialogu.

- Dialog nyní před uložením zkusí přihlášení k API; při neplatných
  údajích se nic neuloží a uživatel může údaje rovnou opravit.
- Pokud je server nedostupný (údaje nelze ověřit), uživatel si může
  zvolit, zda je uložit neověřené – změna hesla na webu u dříve
  uložených údajů tím není dotčena.
- login_to_api nově rozlišuje důvod selhání (LAST_LOGIN_ERROR:
  'auth' × 'network'), aby dialog uměl oba případy odlišit.
- Ověřuje se i změna samotného e-mailu (proti uloženému heslu).
2026-06-12 12:53:28 +02:00
Claude 93ed0ca810 Zřetelné hlášení síťových chyb během stahování
Při výpadku sítě uprostřed stahování se dosud chyba jen zapsala do logu:
stránkování se tiše ukončilo s částečnými daty a smyčka PIAN zkoušela
marně všechny zbývající dávky, takže uživatel skončil u hlášky 'Žádná
data k zobrazení' bez vysvětlení.

- Síťové chyby (requests.RequestException) se v obou smyčkách chytají
  zvlášť a stahování PIAN se po první z nich ihned ukončí.
- Pokud selže už stahování metadat, zobrazí se červená lišta
  'Stahování selhalo: chyba sítě'.
- Pokud se stihla vykreslit část dat, zobrazí se varování, že výsledek
  je neúplný a je třeba stahování zopakovat.
2026-06-12 12:35:51 +02:00
Claude 64ec1ea7fd Metadata, CI a dokumentace
- metadata.txt: icon ukazoval na neexistující download.png – plugin se
  ve správci zásuvných modulů zobrazoval bez ikony; nastaveno na akce.png.
- Workflow: actions/checkout v2→v4 (v2 je deprecated, Node 12)
  a softprops/action-gh-release v1→v2.
- README: poznámka, že knihovna requests nemusí být na Linuxu součástí
  systémové instalace QGIS.
2026-06-12 10:50:04 +02:00
Claude 27e5fe02ac Heslář pristupnost: přeskočení záznamů bez platného kódu
Pokud žádný titulek záznamu neprojde filtrem na jednopísmenný kód,
next() vrátil None a do heslar.csv se zapsal prázdný/None kód, který
se mohl dostat do API filtru jako hodnota 'None:or'. Takové záznamy
se nyní přeskakují.
2026-06-12 10:50:04 +02:00
Claude 46c09c4a09 Robustnější síťová vrstva a stahování dat
- login_to_api: ošetřena výjimka při parsování ne-JSON odpovědi
  (např. HTML chybová stránka za proxy) – dříve propadla až do QGIS.
- _api_get přejmenováno na _api_get_json: tělo odpovědi se parsuje jen
  jednou (kontrola expirované session ho znovu využije), místo dvojího
  json() na každé dávce.
- Stránkování porovnává počet stažených (ne unikátních) záznamů proti
  numFound – stránky plné duplicit už nevyvolávají zbytečné requesty.
- Přidán re-entrancy guard: během běžícího stahování (processEvents
  pumpuje event loop) nelze spustit druhé stahování.
- print() nahrazeno QgsMessageLog (záložka AMČR v panelu Zprávy).
2026-06-12 10:50:03 +02:00
Claude 444d1c4826 Oprava geometrií a filtrování PIAN
- Fallback geometrie z geom_wkt (WGS-84) se nyní transformuje do S-JTSK;
  dříve se souřadnice ve stupních vkládaly přímo do vrstvy EPSG:5514
  a prvek se vykreslil úplně mimo.
- Nevalidní geometrie (např. samoprůniky polygonů) se před zahozením
  zkusí opravit přes makeValid().
- Filtr přesnosti PIAN normalizuje hodnotu pian_presnost (API ji může
  vracet jako jednoprvkový seznam) – dříve mohl tiše zahazovat záznamy.
  Stejná normalizace pro pian_typ kvůli překladu kódu.
- Přístupy ke komponenta_areal/komponenta_obdobi a az_chranene_udaje
  ošetřeny proti hodnotě None (klíč existuje, ale je null).
2026-06-12 10:50:03 +02:00
Claude d9f5d2ae6e Oprava pádů: chybějící locale při startu a životní cyklus úlohy aktualizace heslářů
- amcr_viewer.py: QSettings().value('locale/userLocale') může být None na
  čisté instalaci QGIS – ošetřen fallback na 'en', jinak plugin spadne
  na TypeError hned při načtení.
- amcr_viewer.py: odstraněn nepoužívaný hvězdičkový import resources.
- amcr_dialog.py: úloha aktualizace heslářů se drží v modulové referenci,
  aby GC neuklidil Python wrapper QgsTask před dokončením (známá příčina
  pádů QGIS).
- amcr_dialog.py: tlačítko aktualizace se po spuštění zakáže – nelze už
  spustit několik stahování paralelně přepisujících heslar.csv.
- amcr_dialog.py: závěrečné QMessageBoxy se parentují na hlavní okno QGIS
  místo dialogu, který může být v době dokončení úlohy už zavřený
  (smazaný C++ objekt → pád).
2026-06-12 10:50:03 +02:00
david d417a78b85 Update metadata.txt 2026-06-10 13:40:14 +02:00
david ca827321d8 Update README.md 2026-06-10 13:33:33 +02:00
david b2001c625c Hotfix: oprava minimální podporované QGIS verze (3.4→3.44) (#48) 2026-06-10 13:31:55 +02:00
david 88018aa432 Update README.md 2026-06-10 13:16:33 +02:00
david 45b6ab09b2 Update CITATION.cff 2026-06-05 14:12:54 +02:00
david 89e596802f Update metadata.txt 2026-06-05 13:44:36 +02:00
david 4ea679ec9e Přidat odkaz na nápovědu do menu pluginu (#47)
* ikona amcr-help

* přidán kód pro otevření nápovědy
2026-06-05 13:27:01 +02:00
david 830537f1a4 readme update v2.0.0 (#45) 2026-06-05 11:40:15 +02:00
david 785b83c9c5 přidána varovná hláška do amcr_dialog (#44) 2026-06-05 10:45:32 +02:00
david 493696c67b Chore/code cleanup (#43)
* čištění kódu podle flake8

* Update .gitignore

* Update .gitignore (#41)

* oprava komentářů a překlad do angličtiny

* oprava přihlašování
2026-06-04 17:32:32 +02:00
david b313fc6db0 Update .gitignore 2026-06-04 16:20:11 +02:00
david 9a935261e6 Update metadata.txt 2026-06-03 13:42:46 +02:00
david a4e30bf334 hardcoded AND filtering when filtering by period AND activity area (#39) 2026-06-02 22:25:29 +02:00
10 changed files with 1158 additions and 491 deletions
+2 -2
View File
@@ -11,7 +11,7 @@ jobs:
steps: steps:
# 1. Stáhne kód z repozitáře # 1. Stáhne kód z repozitáře
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
# 2. Vytvoří ZIP (předpokládá, že kód je ve složce 'amcr_viewer') # 2. Vytvoří ZIP (předpokládá, že kód je ve složce 'amcr_viewer')
- name: Zip Plugin - name: Zip Plugin
@@ -22,7 +22,7 @@ jobs:
# 3. Nahraje ZIP k Releasu # 3. Nahraje ZIP k Releasu
- name: Upload Release Asset - name: Upload Release Asset
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
with: with:
files: amcr_viewer.zip files: amcr_viewer.zip
+1
View File
@@ -211,3 +211,4 @@ __marimo__/
README_files/ README_files/
README.html README.html
amcr_viewer.zip amcr_viewer.zip
pyrefly.toml
+6 -7
View File
@@ -20,11 +20,10 @@ identifiers:
value: 10.5281/zenodo.18609813 value: 10.5281/zenodo.18609813
repository-code: 'https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer' repository-code: 'https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer'
abstract: >- abstract: >-
This QGIS plugin is intended for downloading the data This plugin is intended for downloading the data
(Fieldwork events data only, at the time) from the (Fieldwork events, Sites, and their Components) from
Digiarchive of the Archaeological Map of the Czech the Digital archive of the Archaeological Map of the
Republic (AMCR). As of now, only publicly accessible data Czech Republic (https://digiarchiv.aiscr.cz/).
can be downloaded.
license: GPL-3.0 license: GPL-3.0
version: '1.0.1' version: '2.0.0'
date-released: '2026-02-11' date-released: '2026-06-05'
+99 -87
View File
@@ -2,7 +2,7 @@
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
**Platform:** QGIS 3.4.04.99.0 **Platform:** QGIS 3.44.04.99.0
**Module Type:** Data Acquisition & Visualization **Module Type:** Data Acquisition & Visualization
@@ -12,8 +12,7 @@
## 1. Overview ## 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 be accompanied by a *Components* layer with additional information. **Only publicly accessible data are supported at the time** (accessibility = anonymous). **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 ### Key Features
@@ -21,150 +20,163 @@
* **Advanced Attribute Filtering:** Supports multi-criteria filtering using controlled vocabularies. * **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. * **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. * **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 ## 2. Installation Guide
**Install the plugin from QGIS plugin repository.** **Install the latest version of the plugin from the QGIS plugin repository.**
**OR** **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).* 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.* 2. *Launch QGIS.*
*3. Navigate to Plugins → Manage and Install Plugins...* 3. *Navigate to Plugins → Manage and Install Plugins...*
*4. Select the Install from ZIP tab.* 4. *Select the Install from ZIP tab.*
*5. Locate the source ZIP file and click Install Plugin.* 5. *Locate the source ZIP file and click Install Plugin.*
*6. Upon successful installation, the AMCR download button (load AMCR data) will appear in the interface.* 6. *Upon successful installation, the AMCR Viewer button will appear in the toolbar.*
## 3. User Manual ## 3. User Manual
### 3.1 Data Retrieval ### 3.1 Authentication (Optional)
To initiate a search query, click either the **Stáhnout data akcí** or the **Stáhnout data lokalit** icon from the dropdown menu. The filter dialog provides the following options. Shown options vary based on the choosed tool. By default, the plugin accesses only publicly available records (accessibility = anonymous). To access non-public data, log in using your AMČR account:
* **Spatial Filter:** *Checkbox "Limit search to current map extent":* 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). * Click the dropdown arrow on the AMCR Viewer toolbar button and select **Přihlásit se**.
* It is possible to view only those Fieldwork events with positive outcome, if "Positive findings only" is checked. Only *PIANs* marked as (or rather *PIANs* belonging to Documentation units marked as) "Type of evidence" = "positive" are rendered. * 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:** * **Attribute Filters:**
* The dialog utilizes "Picker" widgets for controlled vocabularies (common: Region, District, Cadastral area, Period, Activity Area, *PIAN* accuracy; *events* related: Organisation, Researcher, Event type; *sites* related: Site type and class, Level of confidence, State of preservation). * 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 **Select...** to open a searchable selection window. Multiple values can be selected simultaneously (Logic: OR). * 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.
* **Fieldwork Manager (Dynamic List):** * **Components:** Check **Načíst komponenty** to include period and activity area data directly in the output layers.
* Due to the dynamic nature of the persons database, the list of Fieldwork Managers is retrieved from the AIS CR servers and needs to be updated the first time (and subsequently, if there is need). > ⚠ When components are loaded, spatial features are duplicated — each feature corresponds to one component. Spatial analyses (areas, counts) may be inaccurate.
* To refresh the list from the server, click the **Refresh (🔄)** button next to the selection field. This downloads the latest list of researchers from the API.
* **Components:** The *components* data are downloaded as well upon checking the corresponding check box. This enriches the main (*Events* and *Sites*) layers with additional information (period and activity area). * 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).
* If no filter is used, all accessible Fieldwork events/PIANs are returned (although the number of Fieldwork events to be loaded is capped at 20000 records; 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). 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.2 Layer Structure & Attributes ### 3.3 Layer Structure & Attributes
Upon successful retrieval, the plugin generates four temporary memory layers: Upon successful retrieval, the plugin generates up to three temporary memory layers:
1. **AMCR Plochy (Polygons)** 1. **AMCR\_[Akce|Lokalita]\_Polygony**
2. **AMČR Linie (Lines)** 2. **AMCR\_[Akce|Lokalita]\_Linie**
3. **AMČR Body (Points)** 3. **AMCR\_[Akce|Lokalita]\_Body**
4. **AMČR Komponenty (*Components*/no geometry)**
The Attribute Table includes standardized fields with important metadata. The components layer has no geometry on its own and depend solely on a relation with the other three layers. Layers are only created if the query returns features of the corresponding geometry type. All layers share the same attribute schema.
#### 3.2.1 Fields of the layers with geometry #### 3.3.1 Common fields
| Field | Description | | Field | Description |
| --- | --- | | --- | --- |
| PIAN | PIAN (spatial identifier) ID | | pian | PIAN (spatial identifier) ID |
| esnost | spatial deviation [in units/tens/hundreds of meters/defined by cadastre] | | presnost | Spatial deviation \[units/tens/hundreds of meters/defined by cadastre\] |
| PIAN typ | [point/line/polygon] | | pian\_typ | \[point/line/polygon\] |
| Dokumentační jednotka | Documentation unit ID | | dj | Documentation unit ID |
| Typ dokumentační jednotky | [trench/event part/whole event/cadastral territory] | | typ\_dj | \[trench/event part/whole event/cadastral territory\] |
| Definiční bod(y) (WGS-84) | feature centroid in WGS-84 coordinate system | | definicni\_body | Feature centroid in WGS-84 coordinate system |
| Akce/Lokalita | Event/Site ID | | akce / lokalita | Fieldwork event / Site ID |
| Odkaz do Digitálního archivu AMČR | link to the Event/Site record in the Digital Archive | | odkaz\_do\_digiarchivu | Link to the record in the Digital Archive |
| Okres | district | | okres | District |
| Katastr | main cadastre | | katastr | Main cadastral area |
| Další katastr | other cadastres, if the event extends beyond the main cadastre | | dalsi\_katastry | Other cadastral areas, if the event extends beyond the main cadastre |
| Přístupnost | record accessibility [A/B/C/D] | | Přístupnost | Record accessibility \[A/B/C/D\] |
> Common fields #### 3.3.2 Fields related to *Fieldwork events*
| Field | Description | | Field | Description |
| --- | --- | | --- | --- |
| Vedoucí akce | main fieldwork manager | | akce\_lokalizace | Verbal description of the event location |
| Organizace | organization conducting the research | | vedouci | Main fieldwork manager |
| Specifikace data | [exact date/exact years/sometime in years] | | organizace | Organisation conducting the research |
| Datum zahájení | Event start date | | specifikace\_data | \[exact date/exact years/sometime in years\] |
| Datum ukončení | Event end date | | zahajeni | Event start date |
| Hlavní typ | primary research method [total excavation/pit trench/surface collection survey/…] | | ukonceni | Event end date |
| Vedlejší typ | secondary research method [same options as in Hlavní typ] | | hlavni\_typ | Primary research method |
| Zjištění | did the research reveal archaeological contexts? [positive/negative] | | vedlejsi\_typ | Secondary research method |
| Akce lokalizace | verbal description of the event location | | zjisteni | Did the research reveal archaeological contexts? \[positive/negative\] |
| Akce nahrazuje NZ | replaces a fieldwork report? [yes/no] | | nahrazuje\_NZ | Replaces a fieldwork report? \[yes/no\] |
> Fields related to *Fieldwork events* #### 3.3.3 Fields related to *Sites*
| Field | Description | | Field | Description |
| --- | --- | | --- | --- |
| nazev_lokality | site name | | nazev\_lokality | Site name |
| popis_lokality | site description | | popis\_lokality | Site description |
| typ_lokality | site classification by definition method [survey polygon/heritage site/landscape] | | typ\_lokality | Site classification by definition method |
| druh_lokality | site classification by the nature of identified field relics [aerial survey polygon/landscape/remains of settlement/…] | | druh\_lokality | Site classification by the nature of identified field relics |
| zachovalost | site preservation state [buried site/ruin/aboveground remains/…] | | zachovalost | Site preservation state |
> Fields related to *Sites* #### 3.3.4 Component fields (only when *Načíst komponenty* is checked)
#### 3.2.2 Fields of the *Components* layer
| Field | Description | | Field | Description |
| --- | --- | | --- | --- |
| komponenta | Component ID | | komponenta | Component ID |
| dj_id | parent Documentation unit ID | | komponenta\_areal | Activity area \[settlement/burial area/field/…\] |
| komponenta_areal | Activity area [settlement/burial area/field/…] | | komponenta\_obdobi | Period \[Neolithic/High Middle AgesModern Period/…\] |
| komponenta_obdobi | Period [Neolithic/High Middle AgesModern Period/Middle La Tène (LtBC1)/…] |
| vrstva | system value linking to a specific geometry table with the corresponding documentation unit |
## 4. Technical Architecture ## 4. Technical Architecture
The plugin is developed in **Python 3** using the **PyQt6** framework for the GUI and the **Requests** library for HTTP communication. The plugin is developed in **Python 3** using the **PyQt6** framework for the GUI and the **Requests** library for HTTP communication.
> **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`).
### 4.1 File Structure ### 4.1 File Structure
* `amcr_viewer.py`: Entry point; handles GUI integration and initialization. * `amcr_viewer.py`: Entry point; handles GUI integration, toolbar/menu setup, and login flow.
* `amcr_dialog.py`: Manages the UI logic, including the custom `FilterableSelectionDialog` for handling large vocabularies. * `amcr_dialog.py`: Manages the UI logic, including `AmcrFilterDialog`, `FilterableSelectionDialog`, and `LoginDialog`.
* `amcr_tools.py`: Core logic module. Handles API requests, pagination, data parsing, and vector layer generation. * `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/*.csv`). * `amcr_codelists.py`: Manages local caching of controlled vocabularies (`codelists/heslar.csv`) downloaded via OAI-PMH.
### 4.2 Data Flow & API Integration ### 4.2 Data Flow & API Integration
The plugin interacts with three primary endpoints of the AIS CR infrastructure: The plugin interacts with the following endpoints:
1. **Search API (Solr):** 1. **Login API:**
* Endpoint: `https://digiarchiv.aiscr.cz/api/search/query` * Endpoint: `https://digiarchiv.aiscr.cz/api/user/login`
* Method: `GET` * Method: `POST`
* Parameters: `entity=akce`, `rows/page` (pagination). * Returns a session cookie used for subsequent authenticated requests.
* Logic: The plugin implements a `while True` loop to handle pagination, processing data in batches of 500 records to ensure stability. * Credentials are stored in the QGIS Authentication Manager; the session is restored automatically if it expires mid-download.
2. **Translation API:** 2. **Search API (Solr):**
* Endpoint: `https://digiarchiv.aiscr.cz/api/assets/i18n/cs.json` * Endpoint: `https://digiarchiv.aiscr.cz/api/search/query`
* Function: Retrieves the mapping between system codes (e.g., `HES-xxxx`) and Czech labels. This dictionary is cached in memory during the session. * 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 ### 4.3 Data Persistence
* **Vocabularies:** Static vocabularies (e.g., Periods, Regions) are stored in `codelists/heslar.csv`. * **Vocabularies:** Stored in `codelists/heslar.csv`; updated on user request via the background task.
* **Dynamic Data:** The list of researchers is downloaded on-demand and cached in `codelists/vedouci.csv`.
* **Layers:** Output layers are created as `memory` layers. They are non-persistent and will be lost if QGIS is closed without saving. * **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 ### 4.4 Constraints
* **Record Limit:** A safety cap of 20,000 records is enforced. * **Record Limit:** A safety cap of 20 000 records is enforced.
* **Batch Processing:** Geometry fetching is batched (50 IDs per request) to comply with URL length limitations and server load balancing. * **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.
### 4.5 Relational Data Linking
The plugin automatically utilizes advanced QGIS features for data relationship management, specifically Polymorphic Relations. The *Components* layer is dynamically linked within the project to the spatial layers of events and sites via the documentation unit identifier (dj_id). This allows users to immediately see all *components* belonging to a given geometry (point, line, or polygon) directly in the attribute form or the identify features tool, without the need to manually filter or join the data.
## 5. Links and resources ## 5. Links and resources
* [AMCR/Digiarchive Documentation](https://amcr-help.aiscr.cz/) (only in Czech). * [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). * [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).
Binary file not shown.

After

Width:  |  Height:  |  Size: 533 B

+76 -38
View File
@@ -13,20 +13,20 @@ BASE_URL = "https://api.aiscr.cz/2.2/oai"
OUTPUT_FILE = os.path.join(CODELISTS_DIR, 'heslar.csv') OUTPUT_FILE = os.path.join(CODELISTS_DIR, 'heslar.csv')
slovnicek = { slovnicek = {
'obdobi' : 'heslo:obdobi', 'obdobi': 'heslo:obdobi',
'typ_akce' : 'heslo:akce_typ', 'typ_akce': 'heslo:akce_typ',
'areal' : 'heslo:areal', 'areal': 'heslo:areal',
'kraj' : 'ruian_kraj', 'kraj': 'ruian_kraj',
'organizace' : 'organizace', 'organizace': 'organizace',
'okres' : 'ruian_okres', 'okres': 'ruian_okres',
'katastr' : 'ruian_katastr', 'katastr': 'ruian_katastr',
'vedouci' : 'osoba', 'vedouci': 'osoba',
'pian_presnost' : 'heslo:pian_presnost', 'pian_presnost': 'heslo:pian_presnost',
'typ_lokality' : 'heslo:lokalita_typ', 'typ_lokality': 'heslo:lokalita_typ',
'druh_lokality' : 'heslo:lokalita_druh', 'druh_lokality': 'heslo:lokalita_druh',
'jistota' : 'heslo:jistota_urceni', 'jistota': 'heslo:jistota_urceni',
'lokalita_zachovalost' : 'heslo:stav_dochovani', 'lokalita_zachovalost': 'heslo:stav_dochovani',
'pristupnost' : 'heslo:pristupnost' 'pristupnost': 'heslo:pristupnost'
} }
NS = { NS = {
@@ -35,13 +35,18 @@ NS = {
'oai_dc': 'http://www.openarchives.org/OAI/2.0/oai_dc/' 'oai_dc': 'http://www.openarchives.org/OAI/2.0/oai_dc/'
} }
def ensure_codelists_dir(): def ensure_codelists_dir():
"""Creates the codelists directory if it does not exist.""" """Creates the codelists directory if it does not exist."""
if not os.path.exists(CODELISTS_DIR): if not os.path.exists(CODELISTS_DIR):
os.makedirs(CODELISTS_DIR) os.makedirs(CODELISTS_DIR)
def parse_codelist_file(filename, target_dict=None): def parse_codelist_file(filename, target_dict=None):
"""Reads a CSV codelist file and populates the target dictionary grouped by categories.""" """
Reads a CSV codelist file and populates
the target dictionary grouped by categories.
"""
if target_dict is None: if target_dict is None:
target_dict = {} target_dict = {}
@@ -67,17 +72,23 @@ def parse_codelist_file(filename, target_dict=None):
cat = row[2].strip() cat = row[2].strip()
clean = code if code else None clean = code if code else None
# Initialize a new dictionary for a category if encountered for the first time # Initialize a new dictionary for a category if encountered
# for the first time
if cat not in target_dict: if cat not in target_dict:
target_dict[cat] = {} target_dict[cat] = {}
# Assign the extracted code to the corresponding label within the category # Assign the extracted code to the corresponding label
# within the category
target_dict[cat][label] = clean target_dict[cat][label] = clean
except Exception as e: except Exception as e:
QgsMessageLog.logMessage(f"AMČR Codelist Read Error for {filename}: {e}", "AMČR", Qgis.Critical) QgsMessageLog.logMessage(
f"AMČR Codelist Read Error for {filename}: {e}",
"AMČR", Qgis.Critical)
return target_dict return target_dict
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()
@@ -85,6 +96,7 @@ def load_all_data():
parse_codelist_file('heslar.csv', categorized_data) parse_codelist_file('heslar.csv', categorized_data)
return categorized_data return categorized_data
def fetch_set(internal_name, api_set, task=None): def fetch_set(internal_name, api_set, task=None):
dataset = [] dataset = []
params = { params = {
@@ -94,7 +106,7 @@ def fetch_set(internal_name, api_set, task=None):
} }
while True: while True:
# Kontrola zrušení v každém kroku # Check for cancellation at each iteration
if task and task.isCanceled(): if task and task.isCanceled():
return None return None
@@ -107,17 +119,27 @@ def fetch_set(internal_name, api_set, task=None):
for rec in records: for rec in records:
metadata = rec.find('.//oai_dc:dc', NS) metadata = rec.find('.//oai_dc:dc', NS)
if metadata is not None: if metadata is not None:
# Kód (identifier) # Code (identifier)
kod = metadata.find('dc:identifier', NS).text if metadata.find('dc:identifier', NS) is not None else "" identifier_el = metadata.find('dc:identifier', NS)
kod = (
identifier_el.text
if identifier_el is not None
else ""
)
# Název (title) - filtrujeme systémové popisky "AMČR - ..." # Title filter out system labels "AMČR - ..."
titles = metadata.findall('dc:title', NS) titles = metadata.findall('dc:title', NS)
nazev = "" nazev = ""
for t in titles: for t in titles:
if t.text and not t.text.startswith("AMČR -") and not t.text.startswith(" AMČR -"): if (
t.text
and not t.text.startswith("AMČR -")
and not t.text.startswith(" AMČR -")
):
nazev = t.text nazev = t.text
break break
# Pokud by náhodou žádný title neprošel filtrem, vezmeme první dostupný # If no title passed the filter, fall back
# to the first available one
if not nazev and titles: if not nazev and titles:
nazev = titles[0].text nazev = titles[0].text
@@ -127,7 +149,20 @@ def fetch_set(internal_name, api_set, task=None):
kod = nazev kod = nazev
if internal_name == 'pristupnost': if internal_name == 'pristupnost':
kod = next((t.text for t in titles if t.text and len(t.text) == 1 and t.text.isalpha()), None) kod = next(
(
t.text for t in titles
if t.text
and len(t.text) == 1
and t.text.isalpha()
),
None
)
# Skip records without a valid one-letter code
# a None code would end up in the CSV and later
# in the API filter as the string "None"
if not kod:
continue
dataset.append({ dataset.append({
'Název': nazev, 'Název': nazev,
@@ -135,7 +170,7 @@ def fetch_set(internal_name, api_set, task=None):
'Kategorie': internal_name 'Kategorie': internal_name
}) })
# Stránkování # Pagination
token = root.find('.//oai:resumptionToken', NS) token = root.find('.//oai:resumptionToken', NS)
if token is not None and token.text: if token is not None and token.text:
params = { params = {
@@ -147,11 +182,14 @@ def fetch_set(internal_name, api_set, task=None):
break break
except Exception as e: except Exception as e:
QgsMessageLog.logMessage(f"Chyba u setu {api_set}: {e}", "AMČR", Qgis.Warning) QgsMessageLog.logMessage(
f"Chyba u setu {api_set}: {e}",
"AMČR", Qgis.Warning)
break break
return dataset return dataset
def download_heslare(task=None): def download_heslare(task=None):
"""Fetches the codelists from the AMČR API and saves it to a CSV file.""" """Fetches the codelists from the AMČR API and saves it to a CSV file."""
ensure_codelists_dir() ensure_codelists_dir()
@@ -159,26 +197,28 @@ def download_heslare(task=None):
total_sets = len(slovnicek) total_sets = len(slovnicek)
for index, (interni, api_nazev) in enumerate(slovnicek.items()): for index, (interni, api_nazev) in enumerate(slovnicek.items()):
# Pokud uživatel task zrušil v liště QGISu # Check if the user cancelled the task via the QGIS taskbar
if task and task.isCanceled(): if task and task.isCanceled():
return False return False
QgsMessageLog.logMessage(f"Zpracovávám kategorii: {interni}...", "AMČR", Qgis.Info) QgsMessageLog.logMessage(
f"Zpracovávám kategorii: {interni}...",
"AMČR", Qgis.Info)
# Nyní předáváme task správně do upravené funkce # Pass the task correctly to the updated fetch function
data = fetch_set(interni, api_nazev, task=task) data = fetch_set(interni, api_nazev, task=task)
if data is None: if data is None:
return False # Bylo zrušeno uprostřed stahování return False # Cancelled mid-download
all_data.extend(data) all_data.extend(data)
# Reportování postupu (0-100) # Report progress (0-100)
if task: if task:
progress = (index + 1) / total_sets * 100 progress = (index + 1) / total_sets * 100
task.setProgress(progress) task.setProgress(progress)
# Uložení do CSV # Save to CSV
with open(OUTPUT_FILE, 'w', newline='', encoding='utf-8-sig') as f: with open(OUTPUT_FILE, 'w', newline='', encoding='utf-8-sig') as f:
fieldnames = ['Název', 'Kód', 'Kategorie'] fieldnames = ['Název', 'Kód', 'Kategorie']
writer = csv.DictWriter(f, fieldnames=fieldnames, delimiter=';') writer = csv.DictWriter(f, fieldnames=fieldnames, delimiter=';')
@@ -187,11 +227,9 @@ def download_heslare(task=None):
return True return True
def refresh_globals():
"""Znovu načte data ze souborů do globálních proměnných."""
global OBDOBI, TYP_AKCE, AREAL, KRAJE, ORGANIZACE, OKRESY, KATASTRY
global VEDOUCI, PIAN_PRESNOST, TYP_LOKALITY, DRUH_LOKALITY, JISTOTA, LOKALITA_ZACHOVALOST, PRISTUPNOST
def refresh_globals():
"""Reloads data from files into the global variables."""
data = load_all_data() data = load_all_data()
OBDOBI.clear() OBDOBI.clear()
@@ -224,7 +262,7 @@ def refresh_globals():
PRISTUPNOST.update(data.get('pristupnost', {})) PRISTUPNOST.update(data.get('pristupnost', {}))
# Inicializace prázdných diktů, které se naplní hned pod tím # Initialize empty dicts that will be populated immediately below
OBDOBI = {} OBDOBI = {}
TYP_AKCE = {} TYP_AKCE = {}
AREAL = {} AREAL = {}
+277 -70
View File
@@ -5,12 +5,22 @@ from qgis.PyQt.QtWidgets import (QDialog, QVBoxLayout,
QListWidget, QListWidgetItem, QHBoxLayout, QListWidget, QListWidgetItem, QHBoxLayout,
QMessageBox, QLabel, QFormLayout) QMessageBox, QLabel, QFormLayout)
from qgis.PyQt.QtCore import Qt, QSettings from qgis.PyQt.QtCore import Qt, QSettings
from qgis.core import QgsTask, QgsApplication, QgsMessageLog, Qgis, QgsAuthMethodConfig from qgis.core import (QgsTask, QgsApplication,
QgsMessageLog, Qgis, QgsAuthMethodConfig)
from qgis.utils import iface
from .amcr_codelists import (OBDOBI, TYP_AKCE, KRAJE, AREAL, ORGANIZACE, from .amcr_codelists import (OBDOBI, TYP_AKCE, KRAJE, AREAL, ORGANIZACE,
OKRESY, KATASTRY, VEDOUCI, PIAN_PRESNOST, TYP_LOKALITY, OKRESY, KATASTRY, VEDOUCI, PIAN_PRESNOST,
DRUH_LOKALITY, JISTOTA, LOKALITA_ZACHOVALOST, PRISTUPNOST, TYP_LOKALITY, DRUH_LOKALITY, JISTOTA,
LOKALITA_ZACHOVALOST, PRISTUPNOST,
download_heslare, refresh_globals) download_heslare, refresh_globals)
# Keep Python references to running tasks. QgsTaskManager only holds the
# C++ object; without a Python-side reference the wrapper can be garbage
# collected before the task finishes, which crashes QGIS.
_ACTIVE_TASKS = []
class UpdateCodelistsTask(QgsTask): class UpdateCodelistsTask(QgsTask):
def __init__(self, description): def __init__(self, description):
super().__init__(description, QgsTask.CanCancel) super().__init__(description, QgsTask.CanCancel)
@@ -18,9 +28,9 @@ class UpdateCodelistsTask(QgsTask):
self.exception = None self.exception = None
def run(self): def run(self):
"""Tato část běží ve vedlejším vlákně.""" """Runs in a background thread."""
try: try:
# Voláme upravenou funkci # Call the download function with the task reference
self.success = download_heslare(task=self) self.success = download_heslare(task=self)
return self.success return self.success
except Exception as e: except Exception as e:
@@ -28,20 +38,28 @@ class UpdateCodelistsTask(QgsTask):
return False return False
def finished(self, result): def finished(self, result):
"""Tato část běží v hlavním vlákně po skončení run().""" """Runs in the main thread after run() completes."""
if result: if result:
# Teď bezpečně aktualizujeme globální proměnné v hlavním vlákně # Safely update the global variables in the main thread
refresh_globals() refresh_globals()
QgsMessageLog.logMessage("Hesláře AMČR byly úspěšně aktualizovány.", "AMČR", Qgis.Info) QgsMessageLog.logMessage(
"Hesláře AMČR byly úspěšně aktualizovány.",
"AMČR", Qgis.Info)
else: else:
if self.isCanceled(): if self.isCanceled():
QgsMessageLog.logMessage("Aktualizace heslářů byla zrušena.", "AMČR", Qgis.Warning) QgsMessageLog.logMessage(
"Aktualizace heslářů byla zrušena.",
"AMČR", Qgis.Warning)
else: else:
QgsMessageLog.logMessage(f"Chyba aktualizace: {self.exception}", "AMČR", Qgis.Critical) QgsMessageLog.logMessage(
f"Chyba aktualizace: {self.exception}",
"AMČR", Qgis.Critical)
class FilterableSelectionDialog(QDialog): class FilterableSelectionDialog(QDialog):
""" """
A custom dialog for selecting multiple items from a list with a search filter. A custom dialog for selecting multiple items from
a list with a search filter.
Updated for PyQt6/Qt6 compatibility. Updated for PyQt6/Qt6 compatibility.
""" """
def __init__(self, title, data_dict, preselected_codes, parent=None): def __init__(self, title, data_dict, preselected_codes, parent=None):
@@ -68,7 +86,8 @@ class FilterableSelectionDialog(QDialog):
# Standard OK/Cancel dialog buttons # Standard OK/Cancel dialog buttons
buttons = QDialogButtonBox( buttons = QDialogButtonBox(
QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel QDialogButtonBox.StandardButton.Ok
| QDialogButtonBox.StandardButton.Cancel
) )
buttons.accepted.connect(self.accept) buttons.accepted.connect(self.accept)
buttons.rejected.connect(self.reject) buttons.rejected.connect(self.reject)
@@ -126,15 +145,16 @@ class AmcrFilterDialog(QDialog):
self.setWindowTitle("Filtr AMČR") self.setWindowTitle("Filtr AMČR")
self.resize(500, 750) self.resize(500, 750)
# Determines if we are fetching 'akce' (projects) or 'lokalita' (locations) # Determines if we are fetching 'akce' (events)
# or 'lokalita' (sites)
self.typ_dat = typ_dat self.typ_dat = typ_dat
# Cache dictionary to store selected codes for each category # Cache dictionary to store selected codes for each category
self.selection_cache = { self.selection_cache = {
'organizace': [], 'kraj': [], 'obdobi': [], 'areal': [], 'organizace': [], 'kraj': [], 'obdobi': [], 'areal': [],
'typ_akce': [], 'okres': [], 'katastr': [], 'vedouci': [], 'pian_presnost': [], 'pristupnost': [], 'typ_akce': [], 'okres': [], 'katastr': [], 'vedouci': [],
'typ_lokality': [], 'druh_lokality': [], 'jistota': [], 'lokalita_zachovalost': [] 'pian_presnost': [], 'pristupnost': [], 'typ_lokality': [],
'druh_lokality': [], 'jistota': [], 'lokalita_zachovalost': []
} }
layout = QVBoxLayout() layout = QVBoxLayout()
@@ -160,42 +180,82 @@ class AmcrFilterDialog(QDialog):
self.picker_okres = self.setup_picker("Okres", 'okres', OKRESY) self.picker_okres = self.setup_picker("Okres", 'okres', OKRESY)
layout.addWidget(self.picker_okres) layout.addWidget(self.picker_okres)
self.picker_katastr = self.setup_picker("Katastr", 'katastr', KATASTRY) self.picker_katastr = self.setup_picker(
"Katastr",
'katastr',
KATASTRY
)
layout.addWidget(self.picker_katastr) layout.addWidget(self.picker_katastr)
self.picker_presnost = self.setup_picker("PIAN přesnost", 'pian_presnost', PIAN_PRESNOST) self.picker_presnost = self.setup_picker(
"PIAN přesnost",
'pian_presnost',
PIAN_PRESNOST
)
layout.addWidget(self.picker_presnost) layout.addWidget(self.picker_presnost)
self.picker_pristupnost = self.setup_picker("Přístupnost", 'pristupnost', PRISTUPNOST) self.picker_pristupnost = self.setup_picker(
"Přístupnost",
'pristupnost',
PRISTUPNOST
)
layout.addWidget(self.picker_pristupnost) layout.addWidget(self.picker_pristupnost)
# Filters valid for Akce # Filters valid for Akce
if self.typ_dat == "akce": if self.typ_dat == "akce":
self.picker_org = self.setup_picker("Organizace", 'organizace', ORGANIZACE) self.picker_org = self.setup_picker(
"Organizace",
'organizace',
ORGANIZACE
)
layout.addWidget(self.picker_org) layout.addWidget(self.picker_org)
self.picker_vedouci = self.setup_picker("Vedoucí výzkumu", 'vedouci', VEDOUCI) self.picker_vedouci = self.setup_picker(
"Vedoucí výzkumu",
'vedouci',
VEDOUCI
)
layout.addWidget(self.picker_vedouci) layout.addWidget(self.picker_vedouci)
# Type of event # Type of event
self.picker_typ = self.setup_picker("Typ výzkumu", 'typ_akce', TYP_AKCE) self.picker_typ = self.setup_picker(
"Typ výzkumu",
'typ_akce',
TYP_AKCE
)
layout.addWidget(self.picker_typ) layout.addWidget(self.picker_typ)
# Filters valid for Lokality # Filters valid for Lokality
if self.typ_dat == "lokalita": if self.typ_dat == "lokalita":
self.picker_typ_lokality = self.setup_picker("Lokalita typ", 'typ_lokality', TYP_LOKALITY) self.picker_typ_lokality = self.setup_picker(
"Lokalita typ",
'typ_lokality',
TYP_LOKALITY
)
layout.addWidget(self.picker_typ_lokality) layout.addWidget(self.picker_typ_lokality)
self.picker_druh_lokality = self.setup_picker("Lokalita druh", 'druh_lokality', DRUH_LOKALITY) self.picker_druh_lokality = self.setup_picker(
"Lokalita druh",
'druh_lokality',
DRUH_LOKALITY
)
layout.addWidget(self.picker_druh_lokality) layout.addWidget(self.picker_druh_lokality)
self.picker_jistota = self.setup_picker("Lokalita jistota určení", 'jistota', JISTOTA) self.picker_jistota = self.setup_picker(
"Lokalita jistota určení",
'jistota',
JISTOTA
)
layout.addWidget(self.picker_jistota) layout.addWidget(self.picker_jistota)
self.picker_lokalita_zachovalost = self.setup_picker("Lokalita - stav dochování", 'lokalita_zachovalost', LOKALITA_ZACHOVALOST) self.picker_lokalita_zachovalost = self.setup_picker(
"Lokalita - stav dochování",
'lokalita_zachovalost',
LOKALITA_ZACHOVALOST
)
layout.addWidget(self.picker_lokalita_zachovalost) layout.addWidget(self.picker_lokalita_zachovalost)
# Contextual information # Contextual information
@@ -210,6 +270,24 @@ class AmcrFilterDialog(QDialog):
self.chk_komponenty = QCheckBox("Načíst komponenty") self.chk_komponenty = QCheckBox("Načíst komponenty")
layout.addWidget(self.chk_komponenty) layout.addWidget(self.chk_komponenty)
# Warning label
self.lbl_komponenty_warning = QLabel(
"⚠ Při načtení komponent jsou prostorové prvky duplikovány — "
"každý prvek odpovídá jedné komponentě. "
"Prostorové analýzy (plochy, počty) mohou být zkreslené."
)
self.lbl_komponenty_warning.setWordWrap(True)
self.lbl_komponenty_warning.setStyleSheet(
"color: #8a6d00; background-color: #fff8e1; "
"border: 1px solid #ffe082; border-radius: 4px; padding: 6px;"
)
self.lbl_komponenty_warning.setVisible(False)
layout.addWidget(self.lbl_komponenty_warning)
self.chk_komponenty.toggled.connect(
self.lbl_komponenty_warning.setVisible
)
# Pushes everything above to the top # Pushes everything above to the top
layout.addStretch(1) layout.addStretch(1)
@@ -218,10 +296,16 @@ class AmcrFilterDialog(QDialog):
buttons = QDialogButtonBox() buttons = QDialogButtonBox()
self.btn_update = QPushButton("Aktualizovat hesláře 🔄") self.btn_update = QPushButton("Aktualizovat hesláře 🔄")
self.btn_update.setToolTip("Provede kompletní aktualizaci heslářů AMČR. Toto bude trvat pár minut.") self.btn_update.setToolTip(
"Provede kompletní aktualizaci heslářů AMČR. "
"Toto bude trvat pár minut."
)
self.btn_update.clicked.connect(self.action_update_heslare) self.btn_update.clicked.connect(self.action_update_heslare)
buttons.addButton(self.btn_update, QDialogButtonBox.ButtonRole.ActionRole) buttons.addButton(
self.btn_update,
QDialogButtonBox.ButtonRole.ActionRole
)
buttons.addButton(QDialogButtonBox.StandardButton.Ok) buttons.addButton(QDialogButtonBox.StandardButton.Ok)
buttons.addButton(QDialogButtonBox.StandardButton.Cancel) buttons.addButton(QDialogButtonBox.StandardButton.Cancel)
@@ -234,7 +318,8 @@ class AmcrFilterDialog(QDialog):
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):
""" """
Creates a reusable UI component consisting of a label, a read-only Creates a reusable UI component consisting of a label, a read-only
text field showing selected items, and a button to open the selection dialog. text field showing selected items, and a button to open
the selection dialog.
""" """
row_widget = QGroupBox(label_text) row_widget = QGroupBox(label_text)
row_layout = QHBoxLayout() row_layout = QHBoxLayout()
@@ -249,30 +334,42 @@ class AmcrFilterDialog(QDialog):
btn = QPushButton("Vybrat...") btn = QPushButton("Vybrat...")
btn.setFixedWidth(80) btn.setFixedWidth(80)
# Nested function that handles opening the dialog and saving results # Nested handler: opens the selection dialog and saves the result
def open_dialog(): def open_dialog():
dlg = FilterableSelectionDialog(label_text, data_source, self.selection_cache[cache_key], self) dlg = FilterableSelectionDialog(
label_text,
data_source,
self.selection_cache[cache_key],
self
)
if dlg.exec() == QDialog.DialogCode.Accepted: if dlg.exec() == QDialog.DialogCode.Accepted:
codes, labels = dlg.get_selected_codes() codes, labels = dlg.get_selected_codes()
# Update local cache with selected IDs # Update the local cache with selected IDs
self.selection_cache[cache_key] = codes self.selection_cache[cache_key] = codes
# Update the UI text field with selected names # Update the display field with the selected item names
if labels: if labels:
display_field.setText(", ".join(labels)) display_field.setText(", ".join(labels))
else: else:
display_field.clear() display_field.clear()
# Special case: Pre-fill specific accuracy levels by default # Special case: pre-select default PIAN accuracy levels
if cache_key == 'pian_presnost': if cache_key == 'pian_presnost':
display_field.setText("odchylka jednotky metrů, odchylka desítky metrů, odchylka stovky metrů") display_field.setText(
self.selection_cache[cache_key] = ['HES-000861', 'HES-000862', 'HES-000863'] "odchylka jednotky metrů, odchylka desítky metrů, "
"odchylka stovky metrů"
)
self.selection_cache[cache_key] = [
'HES-000861',
'HES-000862',
'HES-000863'
]
btn.clicked.connect(open_dialog) btn.clicked.connect(open_dialog)
row_layout.addWidget(display_field) row_layout.addWidget(display_field)
row_layout.addWidget(btn) row_layout.addWidget(btn)
# Add an optional extra button (e.g., the refresh button for leaders) # Optionally append an extra button (e.g. a refresh button)
if extra_btn: if extra_btn:
row_layout.addWidget(extra_btn) row_layout.addWidget(extra_btn)
@@ -280,24 +377,49 @@ class AmcrFilterDialog(QDialog):
return row_widget return row_widget
def action_update_heslare(self): def action_update_heslare(self):
# Vytvoření instance tasku # Create the task instance and keep a reference so the Python
# wrapper survives until the task finishes
task = UpdateCodelistsTask("Aktualizace heslářů AMČR") task = UpdateCodelistsTask("Aktualizace heslářů AMČR")
_ACTIVE_TASKS.append(task)
# Povolíme tlačítko zpět bez ohledu na výsledek # Prevent parallel downloads overwriting heslar.csv
task.taskCompleted.connect(lambda: self.btn_update.setEnabled(True)) self.btn_update.setEnabled(False)
task.taskTerminated.connect(lambda: self.btn_update.setEnabled(True))
task.taskCompleted.connect(lambda: QMessageBox.information(self, "Hotovo", "Hesláře byly úspěšně aktualizovány.")) # Message boxes are parented to the main window, not to this dialog
# the dialog may already be closed (and its C++ object deleted)
# by the time the minute-long task finishes.
parent_win = iface.mainWindow() if iface else None
# Ošetření, aby se přesně ukázala případná chyba def _cleanup():
if task in _ACTIVE_TASKS:
_ACTIVE_TASKS.remove(task)
try:
self.btn_update.setEnabled(True)
except RuntimeError:
pass # dialog already closed
def on_completed():
_cleanup()
QMessageBox.information(
parent_win,
"Hotovo",
"Hesláře byly úspěšně aktualizovány."
)
# Show the exact error if the task fails
def on_error(): def on_error():
_cleanup()
if task.exception: if task.exception:
# Tohle ti přesně řekne, na čem to teď padá (např. PermissionError) # This will show exactly what went wrong (e.g. PermissionError)
msg = f"Aktualizace selhala z důvodu chyby:\n{str(task.exception)}" msg = (
"Aktualizace selhala z důvodu chyby:\n"
f"{str(task.exception)}"
)
else: else:
msg = "Aktualizace byla zrušena uživatelem." msg = "Aktualizace byla zrušena uživatelem."
QMessageBox.warning(self, "Chyba / Zrušeno", msg) QMessageBox.warning(parent_win, "Chyba / Zrušeno", msg)
task.taskCompleted.connect(on_completed)
task.taskTerminated.connect(on_error) task.taskTerminated.connect(on_error)
QgsApplication.taskManager().addTask(task) QgsApplication.taskManager().addTask(task)
@@ -309,7 +431,8 @@ class AmcrFilterDialog(QDialog):
return "true" if self.chk_komponenty.isChecked() else "false" return "true" if self.chk_komponenty.isChecked() else "false"
def get_filters(self): def get_filters(self):
"""Compiles the user selections from the cache into API-ready filter parameters.""" """Compiles the user selections from the cache into
API-ready filter parameters."""
filters = {} filters = {}
if self.selection_cache['kraj']: if self.selection_cache['kraj']:
@@ -349,9 +472,11 @@ class AmcrFilterDialog(QDialog):
return filters return filters
class LoginDialog(QDialog): class LoginDialog(QDialog):
""" """
Dialog for saving AMČR login credentials securely in the QGIS Authentication Manager. Dialog for saving AMČR login credentials securely in the
QGIS Authentication Manager.
Credentials are encrypted by the platform's native secret storage Credentials are encrypted by the platform's native secret storage
(DPAPI on Windows, Keychain on macOS, encrypted SQLite on Linux). (DPAPI on Windows, Keychain on macOS, encrypted SQLite on Linux).
@@ -365,6 +490,9 @@ 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 (name, method,
id) but NOT the config() values like username/password. Use full=True to
access those.
""" """
SETTINGS_KEY = "amcr_viewer/auth_config_id" SETTINGS_KEY = "amcr_viewer/auth_config_id"
@@ -379,17 +507,29 @@ class LoginDialog(QDialog):
# Check whether a config ID is already stored from a previous session. # Check whether a config ID is already stored from a previous session.
# We attempt a lightweight load (full=False) to confirm it is readable, # We attempt a lightweight load (full=False) to confirm it is readable,
# since hasConfigId() may return False even for valid configs (cache lag). # since hasConfigId() may return False even for valid configs
# (cache lag).
# The Auth Manager must be unlocked before we attempt to read from it;
# otherwise loadAuthenticationConfig() returns ok=False even for valid
# configs, causing _has_saved to be incorrectly set to False.
existing_id = QSettings().value(self.SETTINGS_KEY, "") existing_id = QSettings().value(self.SETTINGS_KEY, "")
self._has_saved = bool(existing_id) and bool(self._load_username_from_config(existing_id)) if existing_id:
QgsApplication.authManager().setMasterPassword(True)
username = self._load_username_from_config(existing_id)
self._has_saved = bool(existing_id) and bool(username)
if self._has_saved: if self._has_saved:
info = QLabel("✔ Přihlašovací údaje jsou bezpečně uloženy ve správci autentizace QGIS.\n" info = QLabel(
"Vyplňte pole níže pouze pokud je chcete změnit.") "✔ Přihlašovací údaje jsou bezpečně uloženy "
"ve správci autentizace QGIS.\n"
"Vyplňte pole níže pouze pokud je chcete změnit."
)
info.setStyleSheet("color: green; font-style: italic;") info.setStyleSheet("color: green; font-style: italic;")
else: else:
info = QLabel("Zadejte přihlašovací údaje k Digitálnímu archivu AMČR.\n" info = QLabel(
"Budou zašifrovaně uloženy ve správci autentizace QGIS.") "Zadejte přihlašovací údaje k Digitálnímu archivu AMČR.\n"
"Budou zašifrovaně uloženy ve správci autentizace QGIS."
)
info.setWordWrap(True) info.setWordWrap(True)
layout.addWidget(info) layout.addWidget(info)
layout.addSpacing(8) layout.addSpacing(8)
@@ -406,7 +546,9 @@ class LoginDialog(QDialog):
self.txt_pass = QLineEdit() self.txt_pass = QLineEdit()
self.txt_pass.setEchoMode(QLineEdit.EchoMode.Password) self.txt_pass.setEchoMode(QLineEdit.EchoMode.Password)
self.txt_pass.setPlaceholderText( self.txt_pass.setPlaceholderText(
"ponechte prázdné pro zachování stávajícího hesla" if self._has_saved else "heslo" "ponechte prázdné pro zachování stávajícího hesla"
if self._has_saved
else "heslo"
) )
form.addRow("Heslo:", self.txt_pass) form.addRow("Heslo:", self.txt_pass)
@@ -422,7 +564,8 @@ class LoginDialog(QDialog):
layout.addStretch(1) layout.addStretch(1)
buttons = QDialogButtonBox( buttons = QDialogButtonBox(
QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel QDialogButtonBox.StandardButton.Ok
| QDialogButtonBox.StandardButton.Cancel
) )
buttons.accepted.connect(self._save_and_accept) buttons.accepted.connect(self._save_and_accept)
buttons.rejected.connect(self.reject) buttons.rejected.connect(self.reject)
@@ -438,7 +581,8 @@ class LoginDialog(QDialog):
def _load_config(config_id: str, full: bool = False): def _load_config(config_id: str, full: bool = False):
""" """
Attempt to load a QgsAuthMethodConfig by ID. Attempt to load a QgsAuthMethodConfig by ID.
Returns (ok, cfg). Never raises; returns (False, empty cfg) on any error. Returns (ok, cfg). Never raises; returns (False, empty cfg)
on any error.
full=True decrypts and includes the password. full=True decrypts and includes the password.
""" """
try: try:
@@ -453,8 +597,10 @@ class LoginDialog(QDialog):
return False, QgsAuthMethodConfig() return False, QgsAuthMethodConfig()
def _load_username_from_config(self, config_id: str) -> str: def _load_username_from_config(self, config_id: str) -> str:
"""Load just the username from a stored config (no password decryption).""" """Load the username from a stored config.
ok, cfg = self._load_config(config_id, full=False) Requires full=True since config() values are only populated
when the config is fully decrypted."""
ok, cfg = self._load_config(config_id, full=True)
return cfg.config("username", "") if ok else "" return cfg.config("username", "") if ok else ""
def _ensure_master_password(self) -> bool: def _ensure_master_password(self) -> bool:
@@ -469,16 +615,51 @@ class LoginDialog(QDialog):
QMessageBox.critical( QMessageBox.critical(
self, "Správce autentizace nedostupný", self, "Správce autentizace nedostupný",
"Správce autentizace QGIS je zakázán nebo poškozený.\n" "Správce autentizace QGIS je zakázán nebo poškozený.\n"
"Zkuste obnovit databázi: Nastavení → Možnosti → Autentizace → Pomůcky." "Zkuste obnovit databázi: "
"Nastavení → Možnosti → Autentizace → Pomůcky."
) )
return False return False
# setMasterPassword(True) shows the QGIS master password dialog if needed # setMasterPassword(True) shows the QGIS
# master password dialog if needed
if not auth_mgr.setMasterPassword(True): if not auth_mgr.setMasterPassword(True):
return False # User cancelled the master password dialog return False # User cancelled the master password dialog
return True return True
def _verify_credentials(self, username: str, password: str) -> bool:
"""
Verify the credentials against the API before saving them.
Returns True if they should be stored: either the login succeeded,
or the server was unreachable and the user chose to keep them
unverified. Wrong credentials are never stored.
"""
# Lazy import to avoid an import cycle
# (amcr_tools imports LoginDialog lazily as well)
from . import amcr_tools
if amcr_tools.login_to_api(username, password):
return True
if amcr_tools.LAST_LOGIN_ERROR == 'network':
answer = QMessageBox.question(
self,
"Server nedostupný",
"Přihlašovací údaje se nepodařilo ověřit server AMČR "
"je nedostupný.\nChcete je přesto uložit (neověřené)?",
QMessageBox.StandardButton.Yes
| QMessageBox.StandardButton.No
)
return answer == QMessageBox.StandardButton.Yes
QMessageBox.warning(
self,
"Neplatné přihlašovací údaje",
"Přihlášení se nezdařilo zkontrolujte e-mail a heslo.\n"
"Údaje nebyly uloženy."
)
return False
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# Button actions # Button actions
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@@ -488,7 +669,11 @@ class LoginDialog(QDialog):
password = self.txt_pass.text() password = self.txt_pass.text()
if not username: if not username:
QMessageBox.warning(self, "Chybí údaje", "Vyplňte prosím e-mailovou adresu.") QMessageBox.warning(
self,
"Chybí údaje",
"Vyplňte prosím e-mailovou adresu."
)
return return
existing_id = QSettings().value(self.SETTINGS_KEY, "") existing_id = QSettings().value(self.SETTINGS_KEY, "")
@@ -501,6 +686,11 @@ class LoginDialog(QDialog):
if ok: if ok:
if not self._ensure_master_password(): if not self._ensure_master_password():
return return
# Verify the new username against the stored password
if not self._verify_credentials(
username, cfg.config("password", "")
):
return
cfg.setConfig("username", username) cfg.setConfig("username", username)
auth_mgr.updateAuthenticationConfig(cfg) auth_mgr.updateAuthenticationConfig(cfg)
self.accept() self.accept()
@@ -510,6 +700,11 @@ class LoginDialog(QDialog):
QMessageBox.warning(self, "Chybí údaje", "Vyplňte prosím heslo.") QMessageBox.warning(self, "Chybí údaje", "Vyplňte prosím heslo.")
return return
# Verify before prompting for the master password wrong
# credentials must never reach the Authentication Manager
if not self._verify_credentials(username, password):
return
if not self._ensure_master_password(): if not self._ensure_master_password():
return return
@@ -521,13 +716,19 @@ class LoginDialog(QDialog):
settings = QSettings() settings = QSettings()
# Try to update an existing config first; fall back to creating a new one. # Try to update an existing config first;
# We skip hasConfigId() as it may return False despite the config existing # fall back to creating a new one.
# We skip hasConfigId() as it may return False
# 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, existing_cfg = self._load_config(existing_id, full=False) if existing_id else (False, None) ok_load, existing_cfg = (
self._load_config(existing_id, full=False)
if existing_id
else (False, None)
)
if ok_load: if ok_load:
cfg.setId(existing_id) cfg.setId(existing_id)
ok, cfg = auth_mgr.updateAuthenticationConfig(cfg) ok = auth_mgr.updateAuthenticationConfig(cfg)
else: else:
ok, cfg = auth_mgr.storeAuthenticationConfig(cfg) ok, cfg = auth_mgr.storeAuthenticationConfig(cfg)
@@ -536,7 +737,8 @@ class LoginDialog(QDialog):
if not ok or not config_id: if not ok or not config_id:
QMessageBox.critical( QMessageBox.critical(
self, "Chyba uložení", self, "Chyba uložení",
"Přihlašovací údaje se nepodařilo uložit do správce autentizace QGIS.\n" "Přihlašovací údaje se nepodařilo "
"uložit do správce autentizace QGIS.\n"
"Zkuste restartovat QGIS a přihlásit se znovu." "Zkuste restartovat QGIS a přihlásit se znovu."
) )
return return
@@ -550,7 +752,11 @@ class LoginDialog(QDialog):
if existing_id: if existing_id:
QgsApplication.authManager().removeAuthenticationConfig(existing_id) QgsApplication.authManager().removeAuthenticationConfig(existing_id)
settings.remove(self.SETTINGS_KEY) settings.remove(self.SETTINGS_KEY)
QMessageBox.information(self, "Hotovo", "Uložené přihlašovací údaje byly odebrány.") QMessageBox.information(
self,
"Hotovo",
"Uložené přihlašovací údaje byly odebrány."
)
self.reject() self.reject()
# ------------------------------------------------------------------ # ------------------------------------------------------------------
@@ -565,8 +771,9 @@ class LoginDialog(QDialog):
Note: hasConfigId() is intentionally skipped here it checks an Note: hasConfigId() is intentionally skipped here it checks an
in-memory cache that may lag behind the actual database contents, in-memory cache that may lag behind the actual database contents,
causing false negatives (see class docstring). loadAuthenticationConfig() causing false negatives (see class docstring).
is called directly and its return value is used as the authoritative result. loadAuthenticationConfig() is called directly and its return value is
used as the authoritative result.
""" """
settings = QSettings() settings = QSettings()
config_id = settings.value(LoginDialog.SETTINGS_KEY, "") config_id = settings.value(LoginDialog.SETTINGS_KEY, "")
+475 -119
View File
@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from qgis.core import (QgsProject, QgsVectorLayer, QgsFeature, QgsGeometry, from qgis.core import (QgsProject, QgsVectorLayer, QgsFeature, QgsGeometry,
QgsField, QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsField, QgsCoordinateReferenceSystem,
QgsWkbTypes, Qgis, QgsApplication, QgsAuthMethodConfig, QgsMessageLog) QgsCoordinateTransform, QgsWkbTypes, Qgis,
QgsMessageLog)
from qgis.utils import iface from qgis.utils import iface
from qgis.PyQt.QtCore import Qt, QMetaType from qgis.PyQt.QtCore import Qt, QMetaType
from qgis.PyQt.QtWidgets import QApplication from qgis.PyQt.QtWidgets import QApplication
@@ -12,25 +13,46 @@ import json
# Global cache to store translated terms from the Digital Archive # Global cache to store translated terms from the Digital Archive
TRANSLATIONS = {} TRANSLATIONS = {}
# Session s autentizační cookie po přihlášení; None = nepřihlášen (anonymní přístup) # Session with authentication cookie after login;
# None = not logged in (anonymous access)
AMCR_SESSION: requests.Session | None = None AMCR_SESSION: requests.Session | None = None
# Reason of the last failed login: 'auth' (wrong credentials),
# 'network' (server unreachable / invalid response) or None
LAST_LOGIN_ERROR: str | None = None
# Re-entrancy guard: the download runs in the main thread and pumps the
# event loop via processEvents(), so the user could otherwise start
# a second download while the first one is still running
_LOADING = False
def _log(msg: str, level=Qgis.MessageLevel.Info): def _log(msg: str, level=Qgis.MessageLevel.Info):
"""Shortcut: zapíše zprávu do QGIS logu (panel Zprávy → záložka AMČR).""" """
Shortcut: writes a message to the QGIS log
(Messages panel → AMČR tab).
"""
QgsMessageLog.logMessage(msg, "AMČR login", level) QgsMessageLog.logMessage(msg, "AMČR login", level)
def login_to_api(username: str, password: str): def login_to_api(username: str, password: str):
""" """
Přihlásí se do Digiarchiv API pomocí username a hesla. Logs in to the Digiarchiv API using a username and password.
Vrátí requests.Session s nastavenou session cookie, nebo None při chybě. Returns a requests.Session with the session cookie set, or None on error.
""" """
login_url = "https://digiarchiv.aiscr.cz/api/user/login" login_url = "https://digiarchiv.aiscr.cz/api/user/login"
global LAST_LOGIN_ERROR
LAST_LOGIN_ERROR = None
_log(f"Přihlašuji uživatele: '{username}'") _log(f"Přihlašuji uživatele: '{username}'")
if not username or not password: if not username or not password:
_log("CHYBA: username nebo heslo je prázdné.", Qgis.MessageLevel.Critical) _log(
"CHYBA: username nebo heslo je prázdné.",
Qgis.MessageLevel.Critical
)
LAST_LOGIN_ERROR = 'auth'
return None return None
session = requests.Session() session = requests.Session()
@@ -42,14 +64,23 @@ def login_to_api(username: str, password: str):
try: try:
_log(f"Odesílám POST na {login_url} ...") _log(f"Odesílám POST na {login_url} ...")
response = session.post(login_url, json={"user": username, "pwd": password}, timeout=10) response = session.post(
login_url,
json={"user": username, "pwd": password},
timeout=10
)
_log(f"HTTP status: {response.status_code}") _log(f"HTTP status: {response.status_code}")
response.raise_for_status() response.raise_for_status()
# API vrací chyby se status dem 200 je nutné zkontrolovat tělo odpovědi # The API returns errors with status code 200
# the response body must be checked
body = response.json() body = response.json()
if "error" in body: if "error" in body:
_log(f"CHYBA přihlášení (API): {body['error']}", Qgis.MessageLevel.Critical) _log(
f"CHYBA přihlášení (API): {body['error']}",
Qgis.MessageLevel.Critical
)
LAST_LOGIN_ERROR = 'auth'
return None return None
_log("Přihlášení proběhlo úspěšně.") _log("Přihlášení proběhlo úspěšně.")
@@ -58,24 +89,36 @@ def login_to_api(username: str, password: str):
return session return session
except requests.exceptions.HTTPError as e: except requests.exceptions.HTTPError as e:
_log(f"CHYBA HTTP {e.response.status_code if e.response else '?'}: " status = e.response.status_code if e.response is not None else None
f"{e.response.text[:300] if e.response else 'žádná odpověď'}", Qgis.MessageLevel.Critical) _log(f"CHYBA HTTP {status if status else '?'}: "
f"{e.response.text[:300] if e.response is not None else 'žádná odpověď'}",
Qgis.MessageLevel.Critical)
LAST_LOGIN_ERROR = 'auth' if status in (401, 403) else 'network'
return None return None
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
_log(f"CHYBA sítě: {e}", Qgis.MessageLevel.Critical) _log(f"CHYBA sítě: {e}", Qgis.MessageLevel.Critical)
LAST_LOGIN_ERROR = 'network'
return None return None
except ValueError:
# Server returned non-JSON (e.g. an HTML error page behind a proxy)
_log("CHYBA: server nevrátil platný JSON: "
f"{response.text[:300]}",
Qgis.MessageLevel.Critical)
LAST_LOGIN_ERROR = 'network'
return None
def _get_session() -> requests.Session | None: def _get_session() -> requests.Session | None:
""" """
Vrátí aktiv session. Pokud žádná není (restart QGIS), pokusí se Returns the active session. If none exists (e.g. after a QGIS restart),
automaticky přihlásit pomocí uložených přihlašovacích údajů. attempts automatic login using stored credentials.
Vrátí None pokud přihlašovací údaje nejsou uloženy. Returns None if no credentials are stored.
""" """
global AMCR_SESSION global AMCR_SESSION
if AMCR_SESSION is not None: if AMCR_SESSION is not None:
return AMCR_SESSION return AMCR_SESSION
# Zkusit auto-login pomocí uložených údajů # Attempt auto-login using stored credentials
from .amcr_dialog import LoginDialog from .amcr_dialog import LoginDialog
username, password = LoginDialog.get_credentials() username, password = LoginDialog.get_credentials()
if username and password: if username and password:
@@ -85,45 +128,69 @@ def _get_session() -> requests.Session | None:
return AMCR_SESSION return AMCR_SESSION
def _api_get(url, params, timeout=30) -> requests.Response: def _api_get_json(url, params, timeout=30) -> dict:
""" """
Provede GET request. Pokud API signalizuje vypršení přihlášení, Performs a GET request and returns the parsed JSON body.
provede jedno opakované přihlášení a zkusí znovu. If the API signals an expired login, re-authenticates once and retries.
The body is parsed exactly once (the auth check reuses it).
Raises ValueError if the server does not return valid JSON.
""" """
global AMCR_SESSION global AMCR_SESSION
def _is_auth_error(resp: requests.Response) -> bool: def _is_auth_error(resp: requests.Response, body) -> bool:
"""API vrací auth chyby se status 200 je nutné zkontrolovat tělo.""" """The API returns auth errors with status 200
the body must be checked."""
if resp.status_code == 401: if resp.status_code == 401:
return True return True
try: if not isinstance(body, dict):
body = resp.json()
err = str(body.get("error", "")).lower()
return "unauthorized" in err or "not logged" in err or "session" in err
except Exception:
return False return False
err = str(body.get("error", "")).lower()
return (
"unauthorized" in err
or "not logged" in err
or "session" in err
)
def _parse(resp):
try:
return resp.json()
except ValueError:
return None
session = _get_session() session = _get_session()
resp = (session or requests).get(url, params=params, timeout=timeout) resp = (session or requests).get(url, params=params, timeout=timeout)
body = _parse(resp)
if _is_auth_error(resp): if _is_auth_error(resp, body):
_log("Session vypršela během stahování obnovuji přihlášení...", Qgis.MessageLevel.Warning) _log("Session vypršela během stahování obnovuji přihlášení...",
AMCR_SESSION = None # Zrušit starou session Qgis.MessageLevel.Warning)
AMCR_SESSION = None # Invalidate the old session
from .amcr_dialog import LoginDialog from .amcr_dialog import LoginDialog
username, password = LoginDialog.get_credentials() username, password = LoginDialog.get_credentials()
if username and password: if username and password:
AMCR_SESSION = login_to_api(username, password) AMCR_SESSION = login_to_api(username, password)
if AMCR_SESSION: if AMCR_SESSION:
resp = AMCR_SESSION.get(url, params=params, timeout=timeout) resp = AMCR_SESSION.get(url, params=params, timeout=timeout)
body = _parse(resp)
else: else:
_log("Opakované přihlášení selhalo.", Qgis.MessageLevel.Critical) _log("Opakované přihlášení selhalo.",
Qgis.MessageLevel.Critical)
else: else:
_log("Přihlašovací údaje nejsou uloženy pokračuji anonymně.", Qgis.MessageLevel.Warning) _log("Přihlašovací údaje nejsou uloženy pokračuji anonymně.",
Qgis.MessageLevel.Warning)
if body is None:
raise ValueError(
f"API nevrátilo platný JSON (HTTP {resp.status_code})"
)
return body
return resp
def load_translations(): def load_translations():
"""Fetches the official Czech translation dictionary from the AISCR API.""" """
Fetches the official Czech translation dictionary
from the Digiarchive API.
"""
global TRANSLATIONS global TRANSLATIONS
if TRANSLATIONS: if TRANSLATIONS:
return return
@@ -134,37 +201,78 @@ def load_translations():
if r.status_code == 200: if r.status_code == 200:
TRANSLATIONS = r.json() TRANSLATIONS = r.json()
except Exception as e: except Exception as e:
print(f"Error downloading vocabulary: {e}") QgsMessageLog.logMessage(
f"Error downloading vocabulary: {e}",
"AMČR", Qgis.MessageLevel.Warning
)
def tr_code(code): def tr_code(code):
"""Translates a technical code into a human-readable string using the global cache.""" """
Translates a technical code into a human-readable string
using the global cache.
"""
if not code: if not code:
return "" return ""
return TRANSLATIONS.get(code, code) return TRANSLATIONS.get(code, code)
def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false"):
def komp_projde_filtrem(komp, filter_areal, filter_datace, filters):
# 'or {}' the key may be present with a None value
areal_id = (komp.get('komponenta_areal') or {}).get('id', "")
if filter_areal and areal_id not in filters.get('f_areal', []):
return False
obdobi_id = (komp.get('komponenta_obdobi') or {}).get('id', "")
if filter_datace and obdobi_id not in filters.get('f_obdobi', []):
return False
return True
def load_amcr_data(canvas, bb, filters=None,
typ_dat="akce", komponenty="false"):
""" """
Main processing function: Main processing function:
1. Determines search area (Bounding Box) 1. Determines search area (Bounding Box)
2. Fetches metadata and geometries from API 2. Fetches metadata and geometries from API
3. Creates QGIS memory layers and populates them with features 3. Creates QGIS memory layers and populates them with features
""" """
global _LOADING
if _LOADING:
iface.messageBar().pushMessage(
"AMCR",
"Stahování již probíhá, počkejte na jeho dokončení.",
level=Qgis.MessageLevel.Warning
)
return
_LOADING = True
load_translations() load_translations()
# --- 1. COORDINATE TRANSFORMATION --- # --- 1. COORDINATE TRANSFORMATION ---
# Get current map extent and transform it from project CRS (usually S-JTSK) to WGS-84 for the API # Get current map extent and transform it
# from project CRS (usually S-JTSK) to WGS-84 for the API
extent = canvas.extent() extent = canvas.extent()
crs_src = canvas.mapSettings().destinationCrs() crs_src = canvas.mapSettings().destinationCrs()
crs_dest = QgsCoordinateReferenceSystem("EPSG:4326") crs_dest = QgsCoordinateReferenceSystem("EPSG:4326")
xform = QgsCoordinateTransform(crs_src, crs_dest, QgsProject.instance()) xform = QgsCoordinateTransform(crs_src, crs_dest, QgsProject.instance())
extent_wgs = xform.transformBoundingBox(extent) extent_wgs = xform.transformBoundingBox(extent)
# Format the bounding box string as required by the API: minLat,minLon,maxLat,maxLon # Format the bounding box string as required by the API:
bbox_str = f"{extent_wgs.yMinimum()},{extent_wgs.xMinimum()},{extent_wgs.yMaximum()},{extent_wgs.xMaximum()}" # minLat,minLon,maxLat,maxLon
bbox_str = (
f"{extent_wgs.yMinimum()},{extent_wgs.xMinimum()},"
f"{extent_wgs.yMaximum()},{extent_wgs.xMaximum()}"
)
url = "https://digiarchiv.aiscr.cz/api/search/query" url = "https://digiarchiv.aiscr.cz/api/search/query"
iface.messageBar().pushMessage("AMCR", "Hledám záznamy...", level=Qgis.MessageLevel.Info) iface.messageBar().pushMessage(
"AMCR",
"Hledám záznamy...",
level=Qgis.MessageLevel.Info
)
QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor)) QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
try: try:
@@ -182,7 +290,8 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
if bb == "true": if bb == "true":
base_params["loc_rpt"] = bbox_str base_params["loc_rpt"] = bbox_str
# Apply multi-select filters from the dialog using the ':or' syntax required by the API # Apply multi-select filters from the dialog using
# the ':or' syntax required by the API
if filters: if filters:
for key, value in filters.items(): for key, value in filters.items():
if not value: if not value:
@@ -197,12 +306,24 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
BATCH_DOCS = 500 # Records per API request BATCH_DOCS = 500 # Records per API request
MAX_LIMIT = 20000 # Safety limit to prevent QGIS from freezing MAX_LIMIT = 20000 # Safety limit to prevent QGIS from freezing
seen_ids = set() seen_ids = set()
fetched_total = 0 # All downloaded records incl. duplicates
target_pian_ids_count = 0 target_pian_ids_count = 0
# Check if we should skip negative results based on filter # Check if we should skip negative results based on filter
skip_negativni = filters.get('posevidence') == 'true' if filters else False skip_negativni = (
filters.get('posevidence') == 'true'
if filters
else False
)
# Check whether we should filter results based on component filters
filter_areal = "f_areal" in filters if filters else False
filter_datace = "f_obdobi" in filters if filters else False
# Set when a network error interrupts the download the user
# gets an explicit error/warning instead of a silent partial result
network_error = False
# --- API PAGINATION LOOP --- # --- API PAGINATION LOOP ---
while True: while True:
@@ -213,8 +334,7 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
del base_params['page'] del base_params['page']
try: try:
resp_docs = _api_get(url, params=base_params, timeout=30) resp_json = _api_get_json(url, params=base_params, timeout=30)
resp_json = resp_docs.json()
data = resp_json.get('response', {}) data = resp_json.get('response', {})
batch_docs = data.get('docs', []) batch_docs = data.get('docs', [])
num_found = data.get('numFound', 0) num_found = data.get('numFound', 0)
@@ -222,6 +342,8 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
if not batch_docs: if not batch_docs:
break break
fetched_total += len(batch_docs)
# Filter out duplicates and append to main list # Filter out duplicates and append to main list
new_docs = [] new_docs = []
for d in batch_docs: for d in batch_docs:
@@ -231,42 +353,78 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
new_docs.append(d) new_docs.append(d)
docs.extend(new_docs) docs.extend(new_docs)
print(f"Strana {current_page} stažena. Celkem záznamů: {len(docs)} / {num_found}") QgsMessageLog.logMessage(
f"Strana {current_page} stažena. "
f"Celkem záznamů: {len(docs)} / {num_found}",
"AMČR", Qgis.MessageLevel.Info
)
if len(docs) >= num_found: # Compare downloaded (not unique) records against numFound
# pages full of duplicates would otherwise trigger
# needless extra requests
if fetched_total >= num_found:
break break
if len(docs) >= MAX_LIMIT: if len(docs) >= MAX_LIMIT:
iface.messageBar().pushMessage("AMCR", f"Limit {MAX_LIMIT} záznamů dosažen.", level=Qgis.MessageLevel.Warning) iface.messageBar().pushMessage(
"AMCR",
f"Limit {MAX_LIMIT} záznamů dosažen.",
level=Qgis.MessageLevel.Warning
)
break break
current_page += 1 current_page += 1
QApplication.processEvents() # Keep UI responsive QApplication.processEvents() # Keep UI responsive
except requests.exceptions.RequestException as e:
network_error = True
QgsMessageLog.logMessage(
f"Chyba sítě při stránkování na straně "
f"{current_page}: {e}",
"AMČR", Qgis.MessageLevel.Critical
)
break
except Exception as e: except Exception as e:
print(f"Chyba při stránkování na straně {current_page}: {e}") QgsMessageLog.logMessage(
f"Chyba při stránkování na straně {current_page}: {e}",
"AMČR", Qgis.MessageLevel.Warning
)
break break
if network_error and not docs:
iface.messageBar().pushMessage(
"AMCR",
"Stahování selhalo: chyba sítě. "
"Zkontrolujte připojení k internetu.",
level=Qgis.MessageLevel.Critical
)
return
if not docs: if not docs:
iface.messageBar().pushMessage("AMCR", "Žádné záznamy nenalezeny.", level=Qgis.MessageLevel.Warning) iface.messageBar().pushMessage(
"AMCR",
"Žádné záznamy nenalezeny.",
level=Qgis.MessageLevel.Warning
)
return return
# ========================================== # ==========================================
# B) ATTRIBUTE PARSING # B) ATTRIBUTE PARSING
# ========================================== # ==========================================
# pian_lookup maps a Geometry ID (PIAN) to a list of its associated metadata # pian_lookup maps a Geometry ID (PIAN)
# to a list of its associated metadata
pian_lookup = {} pian_lookup = {}
target_pian_ids = set() target_pian_ids = set()
actions_with_geom = 0 actions_with_geom = 0
# Helper function for safe single-value extraction # Helper: safely extract a single value
def g(doc, key, default=""): def g(doc, key, default=""):
val = doc.get(key) val = doc.get(key)
if isinstance(val, list): if isinstance(val, list):
return str(val[0]) if val else default return str(val[0]) if val else default
return str(val) if val is not None else default return str(val) if val is not None else default
# Helper function for safe list-value extraction and joining # Helper: safely extract and join a list of values
def g_list(doc, key, translate=False): def g_list(doc, key, translate=False):
val = doc.get(key, []) val = doc.get(key, [])
if not isinstance(val, list): if not isinstance(val, list):
@@ -283,15 +441,22 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
actions_with_geom += 1 actions_with_geom += 1
# Extract protected data (fields not available in public Solr index) # Extract protected fields ('or {}' key may hold None)
az_chranene = doc.get('az_chranene_udaje', {}) az_chranene = doc.get('az_chranene_udaje') or {}
chranene = doc.get('akce_chranene_udaje') or doc.get('lokalita_chranene_udaje') or {} chranene = (
doc.get('akce_chranene_udaje')
or doc.get('lokalita_chranene_udaje')
or {}
)
# Format additional cadastral areas from dictionaries # Format additional cadastral areas from nested dicts
dalsi_kat = az_chranene.get('dalsi_katastr', []) dalsi_kat = az_chranene.get('dalsi_katastr', [])
dalsi_kat_str = "" dalsi_kat_str = ""
if isinstance(dalsi_kat, list): if isinstance(dalsi_kat, list):
items = [x.get('value', '') if isinstance(x, dict) else str(x) for x in dalsi_kat] items = [
x.get('value', '') if isinstance(x, dict) else str(x)
for x in dalsi_kat
]
dalsi_kat_str = ", ".join([i for i in items if i]) dalsi_kat_str = ", ".join([i for i in items if i])
lokalizace = chranene.get('lokalizace_okolnosti', "") lokalizace = chranene.get('lokalizace_okolnosti', "")
@@ -311,43 +476,100 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
# Add entity-specific metadata # Add entity-specific metadata
if typ_dat == "akce": if typ_dat == "akce":
meta.update({ meta.update({
"akce_hlavni_vedouci": g(doc, 'akce_hlavni_vedouci'), "akce_hlavni_vedouci": g(
"akce_organizace": tr_code(g(doc, 'akce_organizace')), doc,
"akce_specifikace_data": tr_code(g(doc, 'akce_specifikace_data')), 'akce_hlavni_vedouci'
"akce_datum_zahajeni": g(doc, 'akce_datum_zahajeni'), ),
"akce_datum_ukonceni": g(doc, 'akce_datum_ukonceni'), "akce_organizace": tr_code(g(
"akce_hlavni_typ": tr_code(g(doc, 'akce_hlavni_typ')), doc,
"akce_vedlejsi_typ": g_list(doc, 'akce_vedlejsi_typ', translate=True), 'akce_organizace'
"lokalizace_okolnosti": str(lokalizace) if lokalizace else "", )),
"akce_je_nz": "Ano" if doc.get('akce_je_nz') is True else "Ne", "akce_specifikace_data": tr_code(g(
doc,
'akce_specifikace_data'
)),
"akce_datum_zahajeni": g(
doc,
'akce_datum_zahajeni'
),
"akce_datum_ukonceni": g(
doc,
'akce_datum_ukonceni'
),
"akce_hlavni_typ": tr_code(g(
doc,
'akce_hlavni_typ'
)),
"akce_vedlejsi_typ": g_list(
doc,
'akce_vedlejsi_typ',
translate=True
),
"lokalizace_okolnosti": (
str(lokalizace)
if lokalizace
else ""
),
"akce_je_nz": (
"Ano"
if doc.get('akce_je_nz') is True
else "Ne"
),
}) })
elif typ_dat == "lokalita": elif typ_dat == "lokalita":
meta.update({ meta.update({
"lokalita_nazev": lokalita_nazev, "lokalita_nazev": lokalita_nazev,
"lokalita_popis": lokalita_popis, "lokalita_popis": lokalita_popis,
"lokalita_zachovalost": tr_code(g(doc, 'lokalita_zachovalost')), "lokalita_zachovalost": tr_code(g(
"lokalita_druh": tr_code(g(doc, 'lokalita_druh')), doc,
"lokalita_typ": tr_code(g(doc, 'lokalita_typ_lokality')), 'lokalita_zachovalost'
)),
"lokalita_druh": tr_code(g(
doc,
'lokalita_druh'
)),
"lokalita_typ": tr_code(g(
doc,
'lokalita_typ_lokality'
)),
}) })
# Documentation units (DJ) within the record # Documentation units (DJ) within the record
djs = doc.get('az_dokumentacni_jednotka', []) djs = doc.get('az_dokumentacni_jednotka', [])
for dj in djs: for dj in djs:
# Filter out negative evidence units if requested # Skip negative evidence units if requested
if skip_negativni and dj.get('dj_negativni_jednotka') is True: if skip_negativni and dj.get('dj_negativni_jednotka') is True:
continue continue
komps = dj.get('dj_komponenta', [])
if filter_areal or filter_datace:
if not komps:
continue
if not any(
komp_projde_filtrem(
komp, filter_areal,
filter_datace, filters
)
for komp in komps
):
continue
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 general meta with documentation unit specific data # Merge shared metadata with documentation unit-specific fields
dj_meta = { dj_meta = {
**meta, **meta,
'dj_id': dj_id, 'dj_id': dj_id,
'dj_typ_value': dj_typ.get('value') if dj_typ else "", 'dj_typ_value': dj_typ.get('value') if dj_typ else "",
'dj_negativni': "Negativní" if dj.get('dj_negativni_jednotka') is True else "Pozitivní" 'dj_negativni': (
"Negativní"
if dj.get('dj_negativni_jednotka') is True
else "Pozitivní"
)
} }
# Link Documentation Unit to Geometry (PIAN) # Link Documentation Unit to Geometry (PIAN)
@@ -360,20 +582,39 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
pian_lookup[dj_pian_value] = [] pian_lookup[dj_pian_value] = []
if komponenty == "true": if komponenty == "true":
# One feature per component — all data on a single row, no relations needed # One feature per component
komps = dj.get('dj_komponenta', []) # all data on a single row, no relations needed
if komps: if komps:
for komp in komps: for komp in komps:
if not komp_projde_filtrem(
komp, filter_areal,
filter_datace, filters
):
continue
komp_meta = { komp_meta = {
**dj_meta, **dj_meta,
'komponenta_id': komp.get('ident_cely', ""), 'komponenta_id': komp.get(
'komponenta_areal': komp.get('komponenta_areal', {}).get('value', ""), 'ident_cely',
'komponenta_obdobi': komp.get('komponenta_obdobi', {}).get('value', ""), ""
),
'komponenta_areal': (
komp.get('komponenta_areal')
or {}
).get('value', ""),
'komponenta_obdobi': (
komp.get('komponenta_obdobi')
or {}
).get('value', ""),
} }
pian_lookup[dj_pian_value].append(komp_meta) pian_lookup[dj_pian_value].append(komp_meta)
target_pian_ids_count += 1 target_pian_ids_count += 1
else: else:
# DJ without components — still include with empty component fields # DJ without components — still include
# with empty component fields
if filter_areal or filter_datace:
continue
empty_meta = { empty_meta = {
**dj_meta, **dj_meta,
'komponenta_id': "", 'komponenta_id': "",
@@ -386,26 +627,39 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
target_pian_ids_count += 1 target_pian_ids_count += 1
pian_lookup[dj_pian_value].append(dj_meta) pian_lookup[dj_pian_value].append(dj_meta)
if not target_pian_ids: if not target_pian_ids:
iface.messageBar().pushMessage("AMCR", f"Nalezeno {len(docs)} záznamů, ale žádný nemá geometrii.", level=Qgis.MessageLevel.Warning) iface.messageBar().pushMessage(
"AMCR",
f"Nalezeno {len(docs)} záznamů, ale žádný nemá geometrii.",
level=Qgis.MessageLevel.Warning
)
return return
# ========================================== # ==========================================
# C) GEOMETRY FETCHING (PIAN) # C) GEOMETRY FETCHING (PIAN)
# ========================================== # ==========================================
ids_list = list(target_pian_ids) ids_list = list(target_pian_ids)
total_pians = len(ids_list) total_pians = len(ids_list)
docs_pian = [] docs_pian = []
BATCH_PIAN = 200 # Geometry requests are batch-processed to stay under URL length limits # Geometry requests are batch-processed
# to stay under URL length limits:
BATCH_PIAN = 200
iface.messageBar().pushMessage("AMCR", f"Záznamů: {len(docs)} (z toho {actions_with_geom} s mapou). Stahuji {total_pians} unikátních geometrií, vykresluji {target_pian_ids_count} geometrií...", level=Qgis.MessageLevel.Info) iface.messageBar().pushMessage(
"AMCR",
f"Záznamů: {len(docs)} (z toho {actions_with_geom} s mapou). "
f"Stahuji {total_pians} unikátních geometrií, "
f"vykresluji {target_pian_ids_count} geometrií...",
level=Qgis.MessageLevel.Info
)
fl_pian = ["ident_cely", "pian_typ", "pian_chranene_udaje", "pian_presnost"] fl_pian = [
"ident_cely", "pian_typ",
"pian_chranene_udaje", "pian_presnost"
]
for i in range(0, total_pians, BATCH_PIAN): for i in range(0, total_pians, BATCH_PIAN):
batch = ids_list[i : i + BATCH_PIAN] batch = ids_list[i: i + BATCH_PIAN]
or_query = " OR ".join(batch) or_query = " OR ".join(batch)
fq_pian = f"ident_cely:({or_query})" fq_pian = f"ident_cely:({or_query})"
@@ -418,11 +672,22 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
} }
try: try:
QApplication.processEvents() QApplication.processEvents()
r_pian = _api_get(url, params=params_pian, timeout=15) r_json = _api_get_json(url, params=params_pian, timeout=15)
batch_docs = r_pian.json().get('response', {}).get('docs', []) docs_pian.extend(r_json.get('response', {}).get('docs', []))
docs_pian.extend(batch_docs) except requests.exceptions.RequestException as e:
# Network is down stop immediately instead of
# uselessly retrying every remaining batch
network_error = True
QgsMessageLog.logMessage(
f"Chyba sítě při stahování geometrií PIAN: {e}",
"AMČR", Qgis.MessageLevel.Critical
)
break
except Exception as e: except Exception as e:
print(f"Chyba PIAN: {e}") QgsMessageLog.logMessage(
f"Chyba PIAN: {e}",
"AMČR", Qgis.MessageLevel.Warning
)
# ========================================== # ==========================================
# D) LAYER CREATION (QGIS Memory Layers) # D) LAYER CREATION (QGIS Memory Layers)
@@ -431,9 +696,21 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
archeologicky_zaznam = "Akce" if typ_dat == "akce" else "Lokalita" archeologicky_zaznam = "Akce" if typ_dat == "akce" else "Lokalita"
# Initialize three layers for different geometry types (S-JTSK CRS) # Initialize three layers for different geometry types (S-JTSK CRS)
vl_poly = QgsVectorLayer("Polygon?crs=epsg:5514", f"AMCR_{archeologicky_zaznam}_Polygony", "memory") vl_poly = QgsVectorLayer(
vl_line = QgsVectorLayer("LineString?crs=epsg:5514", f"AMCR_{archeologicky_zaznam}_Linie", "memory") "Polygon?crs=epsg:5514",
vl_point = QgsVectorLayer("Point?crs=epsg:5514", f"AMCR_{archeologicky_zaznam}_Body", "memory") f"AMCR_{archeologicky_zaznam}_Polygony",
"memory"
)
vl_line = QgsVectorLayer(
"LineString?crs=epsg:5514",
f"AMCR_{archeologicky_zaznam}_Linie",
"memory"
)
vl_point = QgsVectorLayer(
"Point?crs=epsg:5514",
f"AMCR_{archeologicky_zaznam}_Body",
"memory"
)
layers = [vl_poly, vl_line, vl_point] layers = [vl_poly, vl_line, vl_point]
# Define attribute table structure # Define attribute table structure
@@ -527,6 +804,14 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
# Lists to hold features before batch-adding to layers # Lists to hold features before batch-adding to layers
feats_p, feats_l, feats_pt = [], [], [] feats_p, feats_l, feats_pt = [], [], []
# Transform for PIANs that only provide WGS-84 geometry (geom_wkt)
# the target layers are in S-JTSK (EPSG:5514)
xform_wgs_to_sjtsk = QgsCoordinateTransform(
QgsCoordinateReferenceSystem("EPSG:4326"),
QgsCoordinateReferenceSystem("EPSG:5514"),
QgsProject.instance()
)
# --- FEATURE POPULATION --- # --- FEATURE POPULATION ---
for doc in docs_pian: for doc in docs_pian:
try: try:
@@ -540,63 +825,106 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
raw = doc.get('pian_chranene_udaje') raw = doc.get('pian_chranene_udaje')
if isinstance(raw, list) and raw: if isinstance(raw, list) and raw:
raw = raw[0] raw = raw[0]
jdata = json.loads(raw) if isinstance(raw, str) else (raw or {}) jdata = (
json.loads(raw)
if isinstance(raw, str)
else (raw or {})
)
wkt = None wkt = None
wkt_is_wgs = False
if jdata.get('geom_sjtsk_wkt'): if jdata.get('geom_sjtsk_wkt'):
wkt = jdata.get('geom_sjtsk_wkt', {}).get('value') wkt = jdata.get('geom_sjtsk_wkt', {}).get('value')
elif jdata.get('geom_wkt'): 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 = jdata.get('geom_wkt', {}).get('value')
wkt_is_wgs = True
pian_presnost = tr_code(str(doc.get('pian_presnost', ''))) # The API may return the value as a single-item list
pian_typ = tr_code(str(doc.get('pian_typ', ''))) # 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 # Final precision filter check
if filters and filters.get('f_pian_presnost') and doc.get('pian_presnost') not in filters.get('f_pian_presnost'): if (
filters
and filters.get('f_pian_presnost')
and str(raw_presnost)
not in filters.get('f_pian_presnost')
):
continue continue
if wkt: if wkt:
geom = QgsGeometry.fromWkt(wkt) geom = QgsGeometry.fromWkt(wkt)
if geom.isNull():
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(): if geom.isGeosValid():
t = geom.type() t = geom.type()
target_list = None target_list = None
if t == QgsWkbTypes.PolygonGeometry: if t == QgsWkbTypes.PolygonGeometry:
target_list = feats_p target_list = feats_p
referenced_layer = vl_poly
elif t == QgsWkbTypes.LineGeometry: elif t == QgsWkbTypes.LineGeometry:
target_list = feats_l target_list = feats_l
referenced_layer = vl_line
elif t == QgsWkbTypes.PointGeometry: elif t == QgsWkbTypes.PointGeometry:
target_list = feats_pt target_list = feats_pt
referenced_layer = vl_point
if target_list is None: if target_list is None:
continue continue
is_akce = (typ_dat == "akce") is_akce = (typ_dat == "akce")
# Create a QGIS feature for each documentation unit associated with this geometry # Create a QGIS feature for each documentation unit
# associated with this geometry
for meta in metas: for meta in metas:
feat = QgsFeature() feat = QgsFeature()
feat.setGeometry(geom) feat.setGeometry(geom)
atributy = [ atributy = [
pid, pian_presnost, pian_typ, meta['dj_id'], pid,
meta['dj_typ_value'], meta['loc'], meta['ident_cely'], pian_presnost,
"https://digiarchiv.aiscr.cz/id/" + meta['ident_cely'], pian_typ,
meta['az_okres'], meta['katastr'], meta['dalsi_katastr'] meta['dj_id'],
meta['dj_typ_value'],
meta['loc'],
meta['ident_cely'],
"https://digiarchiv.aiscr.cz/id/"
+ meta['ident_cely'],
meta['az_okres'],
meta['katastr'],
meta['dalsi_katastr']
] ]
if is_akce: if is_akce:
atributy.extend([ atributy.extend([
meta['lokalizace_okolnosti'], meta['akce_hlavni_vedouci'], meta['lokalizace_okolnosti'],
meta['akce_organizace'], meta['akce_specifikace_data'], meta['akce_hlavni_vedouci'],
meta['akce_datum_zahajeni'], meta['akce_datum_ukonceni'], meta['akce_organizace'],
meta['akce_hlavni_typ'], meta['akce_vedlejsi_typ'], meta['akce_specifikace_data'],
meta['dj_negativni'], meta['akce_je_nz'] meta['akce_datum_zahajeni'],
meta['akce_datum_ukonceni'],
meta['akce_hlavni_typ'],
meta['akce_vedlejsi_typ'],
meta['dj_negativni'],
meta['akce_je_nz']
]) ])
else: else:
atributy.extend([ atributy.extend([
meta['lokalita_nazev'], meta['lokalita_popis'], meta['lokalita_nazev'],
meta['lokalita_typ'], meta['lokalita_druh'], meta['lokalita_popis'],
meta['lokalita_typ'],
meta['lokalita_druh'],
meta['lokalita_zachovalost'] meta['lokalita_zachovalost']
]) ])
@@ -613,8 +941,10 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
target_list.append(feat) target_list.append(feat)
except Exception as ex: except Exception as ex:
print(f"Chyba při tvorbě feature: {ex}") QgsMessageLog.logMessage(
pass f"Chyba při tvorbě feature: {ex}",
"AMČR", Qgis.MessageLevel.Warning
)
# --- ADDING TO QGIS INTERFACE --- # --- ADDING TO QGIS INTERFACE ---
proj = QgsProject.instance() proj = QgsProject.instance()
@@ -633,13 +963,39 @@ def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false")
proj.addMapLayer(l) proj.addMapLayer(l)
added += len(f) added += len(f)
if added > 0: if network_error:
iface.messageBar().pushMessage("AMCR", f"Hotovo. Záznamů: {len(docs)} (s geom: {actions_with_geom}). Vykresleno: {added} prvků.", level=Qgis.MessageLevel.Success) iface.messageBar().pushMessage(
"AMCR",
"Stahování bylo přerušeno chybou sítě "
f"výsledek je neúplný (vykresleno {added} prvků). "
"Zkontrolujte připojení a spusťte stahování znovu.",
level=(
Qgis.MessageLevel.Warning
if added > 0
else Qgis.MessageLevel.Critical
)
)
elif added > 0:
iface.messageBar().pushMessage(
"AMCR",
f"Hotovo. Záznamů: {len(docs)} (s geom: {actions_with_geom}). "
f"Vykresleno: {added} prvků.",
level=Qgis.MessageLevel.Success
)
else: else:
iface.messageBar().pushMessage("AMCR", "Žádná data k zobrazení.", level=Qgis.MessageLevel.Info) iface.messageBar().pushMessage(
"AMCR",
"Žádná data k zobrazení.",
level=Qgis.MessageLevel.Info
)
except Exception as e: except Exception as e:
iface.messageBar().pushMessage("Chyba", str(e), level=Qgis.MessageLevel.Critical) iface.messageBar().pushMessage(
"Chyba",
str(e),
level=Qgis.MessageLevel.Critical
)
finally: finally:
# Always restore cursor, even after failure # Always restore cursor and release the guard, even after failure
_LOADING = False
QApplication.restoreOverrideCursor() QApplication.restoreOverrideCursor()
+54 -18
View File
@@ -1,15 +1,14 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from qgis.PyQt.QtCore import QSettings, QTranslator, QCoreApplication from qgis.PyQt.QtCore import QSettings, QTranslator, QCoreApplication, QUrl
from qgis.PyQt.QtGui import QIcon from qgis.PyQt.QtGui import QIcon, QDesktopServices
from qgis.PyQt.QtWidgets import QMenu, QAction, QToolButton, QDialog from qgis.PyQt.QtWidgets import QMenu, QAction, QToolButton, QDialog
from qgis.core import Qgis from qgis.core import Qgis
from qgis.utils import iface
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 from .amcr_dialog import AmcrFilterDialog, LoginDialog
from .resources import *
import os.path import os.path
class AmcrViewer: class AmcrViewer:
""" """
Main plugin class that manages the GUI elements, menu entries, Main plugin class that manages the GUI elements, menu entries,
@@ -24,14 +23,17 @@ class AmcrViewer:
self.iface = iface self.iface = iface
self.plugin_dir = os.path.dirname(__file__) self.plugin_dir = os.path.dirname(__file__)
# Determine the user's locale to load appropriate translation files # Determine the user's locale to load appropriate translation files.
locale = QSettings().value('locale/userLocale')[0:2] # The setting may be missing (None) on a fresh QGIS install.
locale = str(QSettings().value('locale/userLocale') or 'en')[0:2]
locale_path = os.path.join( locale_path = os.path.join(
self.plugin_dir, self.plugin_dir,
'i18n', 'i18n',
'AmcrViewer_{}.qm'.format(locale)) 'AmcrViewer_{}.qm'.format(locale)
)
# Install the translator if a translation file for the current locale exists # Install the translator if a translation file
# for the current locale exists
if os.path.exists(locale_path): if os.path.exists(locale_path):
self.translator = QTranslator() self.translator = QTranslator()
self.translator.load(locale_path) self.translator.load(locale_path)
@@ -43,7 +45,10 @@ class AmcrViewer:
self.first_start = None self.first_start = None
def tr(self, message): def tr(self, message):
"""Helper method for translating strings within the AmcrViewer context.""" """
Helper method for translating strings within
the AmcrViewer context.
"""
return QCoreApplication.translate('AmcrViewer', message) return QCoreApplication.translate('AmcrViewer', message)
def add_action(self, icon_path, text, callback, enabled_flag=True, def add_action(self, icon_path, text, callback, enabled_flag=True,
@@ -71,7 +76,8 @@ class AmcrViewer:
if add_to_menu: if add_to_menu:
self.iface.addPluginToMenu(self.menu, action) self.iface.addPluginToMenu(self.menu, action)
# Store only actions that are directly attached to the QGIS UI for later cleanup # Store only actions that are directly attached
# to the QGIS UI for later cleanup
if add_to_toolbar or add_to_menu: if add_to_toolbar or add_to_menu:
self.actions.append(action) self.actions.append(action)
@@ -85,12 +91,14 @@ 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_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')
# 1. Create a container menu for the plugin # 1. Create a container menu for the plugin
self.plugin_menu = QMenu() self.plugin_menu = QMenu()
# 2. Create sub-actions (Download Projects / Download Sites) # 2. Create sub-actions (Download Projects / Download Sites)
# add_to_menu/toolbar is False because these go into our custom dropdown menu # add_to_menu/toolbar is False because these go into our
# 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(u'Stáhnout data akcí | AMČR Viewer'), text=self.tr(u'Stáhnout data akcí | AMČR Viewer'),
@@ -121,9 +129,23 @@ class AmcrViewer:
) )
self.plugin_menu.addAction(self.action_login_dialog) self.plugin_menu.addAction(self.action_login_dialog)
self.action_amcr_help = self.add_action(
icon_path=icon_amcr_help_path,
text=self.tr(u'Nápověda AMČR Help | AMČR Viewer'),
callback=lambda checked=False: self.open_help(),
parent=self.iface.mainWindow(),
add_to_menu=False,
add_to_toolbar=False
)
self.plugin_menu.addAction(self.action_amcr_help)
# 3. Create the main project action and attach the menu to it # 3. Create the main project action and attach the menu to it
main_icon = QIcon(icon_akce_path) main_icon = QIcon(icon_akce_path)
self.main_action = QAction(main_icon, 'AMČR Viewer', self.iface.mainWindow()) self.main_action = QAction(
main_icon,
'AMČR Viewer',
self.iface.mainWindow()
)
self.main_action.setMenu(self.plugin_menu) self.main_action.setMenu(self.plugin_menu)
self.iface.addPluginToMenu(self.menu, self.main_action) self.iface.addPluginToMenu(self.menu, self.main_action)
@@ -132,9 +154,12 @@ class AmcrViewer:
self.tool_button = QToolButton() self.tool_button = QToolButton()
self.tool_button.setMenu(self.plugin_menu) self.tool_button.setMenu(self.plugin_menu)
self.tool_button.setDefaultAction(self.action_download_akce) self.tool_button.setDefaultAction(self.action_download_akce)
self.tool_button.setPopupMode(QToolButton.ToolButtonPopupMode.MenuButtonPopup) self.tool_button.setPopupMode(
QToolButton.ToolButtonPopupMode.MenuButtonPopup
)
# Add the widget directly to the toolbar and store the reference for cleanup # Add the widget directly to the toolbar
# and store the reference for cleanup
self.toolbar_action = self.iface.addToolBarWidget(self.tool_button) self.toolbar_action = self.iface.addToolBarWidget(self.tool_button)
self.first_start = True self.first_start = True
@@ -172,13 +197,15 @@ class AmcrViewer:
dlg = AmcrFilterDialog(typ_dat) dlg = AmcrFilterDialog(typ_dat)
result = dlg.exec() result = dlg.exec()
# If user confirmed the dialog (OK button), gather filters and load data # If user confirmed the dialog (OK button),
# gather filters and load data
if result == QDialog.DialogCode.Accepted: if result == QDialog.DialogCode.Accepted:
filters = dlg.get_filters() filters = dlg.get_filters()
bbox = dlg.get_bbox() bbox = dlg.get_bbox()
komponenty = dlg.get_komponenty() komponenty = dlg.get_komponenty()
# Access the map canvas and start the fetch/render process from amcr_tools # Access the map canvas and start
# the fetch/render process from amcr_tools
canvas = self.iface.mapCanvas() canvas = self.iface.mapCanvas()
load_amcr_data(canvas, bbox, filters, typ_dat, komponenty) load_amcr_data(canvas, bbox, filters, typ_dat, komponenty)
@@ -190,9 +217,18 @@ class AmcrViewer:
session = login_to_api(username, password) session = login_to_api(username, password)
if session: if session:
self.iface.messageBar().pushMessage( self.iface.messageBar().pushMessage(
"AMČR", "Přihlášení proběhlo úspěšně.", level=Qgis.MessageLevel.Success "AMČR",
"Přihlášení proběhlo úspěšně.",
level=Qgis.MessageLevel.Success
) )
else: else:
self.iface.messageBar().pushMessage( self.iface.messageBar().pushMessage(
"AMČR", "Přihlášení se nezdařilo viz záložka AMČR login v panelu Zprávy.", level=Qgis.MessageLevel.Critical "AMČR",
"Přihlášení se nezdařilo viz záložka AMČR login "
"v panelu Zprávy.",
level=Qgis.MessageLevel.Critical
) )
def open_help(self):
help_url = "https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html"
QDesktopServices.openUrl(QUrl(help_url))
+24 -6
View File
@@ -5,10 +5,10 @@
[general] [general]
name=AMČR Viewer name=AMČR Viewer
qgisMinimumVersion=3.4.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.0.0-alpha.3 version=2.0.1
author=David Spáčil author=David Spáčil
email=spacil@arub.cz email=spacil@arub.cz
@@ -22,16 +22,34 @@ 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=
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.
Version 2.0.0 changes the plugin behavior dramatically. It is advised to check the changelog below.
Plný seznam změn v češtině je dostupný zde: https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/releases/tag/v2.0.0
v2.0.1 (2026-06-10)
* Fixed QGIS minimum version
v2.0.0 (2026-06-05)
* Added warning regarding the feature duplication when loading components to the dialog
* Added Help button to the plugin menu
* Code clean-up
v2.0.0-alpha.4 (2026-06-03)
* Backend filtering of the results based on the component-related filters improvement (plugin not only loads the results from API, it filters them further)
v2.0.0-alpha.23 (2026-05-19)
* Security vulnerabilities fix
v2.0.0-alpha.1 (2026-05-19):
* Attribute fields renamed to be ASCII compliant
* Codelist update; codelist can be recompiled from AMČR API
* Base element changed from Documentation Unit to Component if user asks for components to simplify result filtering
* Plugin now supports logging with an AMČR account and enables the downloading of Events and Sites available to the roles Researcher and higher
# Tags are comma separated with spaces allowed # Tags are comma separated with spaces allowed
tags=python,AMCR,AIS CR,archaeology,PIAN,AMČR tags=python,AMCR,AIS CR,archaeology,PIAN,AMČR,archeologie
homepage=https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html homepage=https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html
category=Vector category=Vector
icon=download.png icon=akce.png
# experimental flag # experimental flag
experimental=True experimental=False
# deprecated flag (applies to the whole plugin, not just a single version) # deprecated flag (applies to the whole plugin, not just a single version)
deprecated=False deprecated=False