Update metadata.txt

Fix polymorphic relations not creating in some cases

.gitignore

@@ -205,3 +205,9 @@ cython_debug/
 marimo/_static/
 marimo/_lsp/
 __marimo__/
+
+
+
+README_files/
+README.html
+amcr_viewer.zip

README.md

@@ -12,14 +12,13 @@
 
 ## 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[^1] data (metadata and geometry) directly within the GIS environment**, eliminating the need to manually export data from the web interface. **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 be accompanied by a *Components* layer with additional information. **Only publicly accessible data are supported at the time** (accessibility = anonymous).
 
-[^1]: Only Fieldwork events (Akce) are supported at the time.
 
 ### Key Features
 
 * **Spatial Querying:** Option to filter records based on the current map canvas extent (Bounding Box).
-* **Advanced Attribute Filtering:** Supports multi-criteria filtering using controlled vocabularies (Cadastral Area, District, Period, Type of Fieldwork event, Organization, Fieldwork Manager).
+* **Advanced Attribute Filtering:** Supports multi-criteria filtering using controlled vocabularies.
 * **Dynamic Geometry Retrieval:** Automatically downloads and categorizes spatial data into Point, Line, and Polygon layers.
 * **Semantic Interoperability:** Automatically translates internal system codes into human-readable labels using the AIS CR API.
 
@@ -27,16 +26,16 @@
 
 ## 2. Installation Guide
 
-1. Obtain the [plugin distribution package](https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/releases) (ZIP archive containing the `amcr_viewer` directory).
+**Install the plugin from QGIS plugin repository.**  
-2. Launch QGIS.
-3. Navigate to **Plugins**  **Manage and Install Plugins...**
-4. Select the **Install from ZIP** tab.
-5. Locate the source ZIP file and click **Install Plugin**.
-6. Upon successful installation, the AMCR download button (load AMCR data) will appear in the interface.  
 
 **OR**  
 
-Install the plugin from QGIS plugin repository.
+*1. Obtain the [plugin distribution package](https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/releases) (ZIP archive containing the `amcr_viewer` directory).*  
+*2. Launch QGIS.*  
+*3. Navigate to Plugins → Manage and Install Plugins...*  
+*4. Select the Install from ZIP tab.*  
+*5. Locate the source ZIP file and click Install Plugin.*  
+*6. Upon successful installation, the AMCR download button (load AMCR data) will appear in the interface.*  
 
 ---
 
@@ -44,39 +43,39 @@ Install the plugin from QGIS plugin repository.
 
 ### 3.1 Data Retrieval
 
-To initiate a search query, click the **Load AMCR Data** icon. The filter dialog provides the following options:
+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.
 
 * **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).
-* 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.
+* 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.
 
 
 * **Attribute Filters:**
-  * The dialog utilizes "Picker" widgets for controlled vocabularies (Region, District, Cadastral area, Organisation, Period, Activity Area).
+  * 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).
   * Click **Select...** to open a searchable selection window. Multiple values can be selected simultaneously (Logic: OR).
 
 
 * **Fieldwork Manager (Dynamic List):**
   * 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).
   * 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.
-* 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).
+
+* **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 (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).
 
 
 
 ### 3.2 Layer Structure & Attributes
 
-Upon successful retrieval, the plugin generates three temporary memory layers:
+Upon successful retrieval, the plugin generates four temporary memory layers:
 
 1. **AMCR Plochy (Polygons)**
 2. **AMČR Linie (Lines)**
 3. **AMČR Body (Points)**
+4. **AMČR Komponenty (*Components*/no geometry)**
 
-The Attribute Table includes standardized fields such as:
+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.
-
-* **Identification:** `Identifikátor` (Fieldwork event ID), `PIAN` (PIAN ID).
-* **Classification:** `Hlavní typ` (Main Fieldwork event Type), `Vedlejší typ` (Secondary Fieldwork event Type), `PIAN – typ` (PIAN Type).
-* **Administration:** `Vedoucí akce` (Fieldwork Manager), `Organizace` (Organization), `Datum zahájeni`/`Datum ukončení` (Dates of start and end of the Fieldwork event).
-* **Location:** `Katastr` (Main Cadastral area), `Další katastry` (Other Cadastral areas), `Okres` (District), `Definiční bod(y)` (PIAN point localization).
-* **Links:** `Odkaz do Digiarchivu` (Direct URL to the DigiArchive record).
 
 ---
 
@@ -98,7 +97,7 @@ The plugin interacts with three primary endpoints of the AIS CR infrastructure:
 1. **Search API (Solr):**
 * Endpoint: `https://digiarchiv.aiscr.cz/api/search/query`
 * Method: `GET`
-* Parameters: `entity=akce`, `fl` (field list), `q` (query), `rows/page` (pagination).
+* Parameters: `entity=akce`, `rows/page` (pagination).
 * Logic: The plugin implements a `while True` loop to handle pagination, processing data in batches of 500 records to ensure stability.
 
 
@@ -110,14 +109,15 @@ The plugin interacts with three primary endpoints of the AIS CR infrastructure:
 ### 4.3 Data Persistence
 
 * **Vocabularies:** Static vocabularies (e.g., Periods, Regions) are stored in `codelists/heslar.csv`.
-* **Dynamic Data:** The list of investigators is downloaded on-demand and cached in `codelists/vedouci.csv`.
+* **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.
 
 ### 4.4 Constraints
 
-* **Record Limit:** A safety cap of 20,000 records is enforced to prevent memory overflow in QGIS.
+* **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.
 
 ## 6. Links and resources
 
 * [AMCR/Digiarchive Documentation](https://amcr-help.aiscr.cz/) (only in Czech).
+* [AMCR Viewer tutorial](https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html) (only in Czech).

amcr_viewer/amcr_codelists.py

@@ -1,141 +1,111 @@
 # -*- coding: utf-8 -*-
 import os
 import csv
-import codecs
 import requests
-import json
 
-# Cesta k adresáři pluginu
+# Define paths for the plugin and its codelists directory
 PLUGIN_DIR = os.path.dirname(__file__)
 CODELISTS_DIR = os.path.join(PLUGIN_DIR, 'codelists')
 
 def ensure_codelists_dir():
+    """Creates the codelists directory if it does not exist."""
     if not os.path.exists(CODELISTS_DIR):
         os.makedirs(CODELISTS_DIR)
 
-# --- 1. NAČÍTÁNÍ DAT ---
+def parse_codelist_file(filename, target_dict=None):
-
+    """Reads a CSV codelist file and populates the target dictionary grouped by categories."""
-def load_csv_data(filename):
+    if target_dict is None:
-    """Obecná funkce pro načtení CSV souboru do slovníku"""
+        target_dict = {}
-    data = {}
+        
     path = os.path.join(CODELISTS_DIR, filename)
-    if not os.path.exists(path):
+    
-        return data
+    # Return early if the file doesn't exist to avoid missing file errors
-
+    if not os.path.exists(path): 
+        return target_dict
+        
     try:
-        with codecs.open(path, 'r', 'utf-8') as f:
+        # Open the file using standard UTF-8 encoding
+        with open(path, 'r', encoding='utf-8') as f:
             reader = csv.reader(f, delimiter=';')
-            # Zkusíme přeskočit hlavičku, pokud tam je
-            first_row = next(reader, None)
             
-            # Pokud soubor není prázdný, zpracujeme ho
+            # Skip the CSV header row
-            if first_row:
+            next(reader, None) 
-                # Pokud první řádek vypadá jako data (neobsahuje slovo "Název"), vrátíme ho do hry
+            
-                # Ale my budeme generovat soubory s hlavičkou, takže OK.
+            # Iterate through rows and extract label, code, and category
-                pass 
-
             for row in reader:
                 if len(row) >= 3:
                     label = row[0].strip()
                     code = row[1].strip()
-                    category = row[2].strip()
+                    cat = row[2].strip()
+                    clean = code if code else None
                     
-                    # Tady můžeme filtrovat podle kategorie, 
+                    # Initialize a new dictionary for a category if encountered for the first time
-                    # nebo prostě vrátit všechno jako {label: code}
+                    if cat not in target_dict:
-                    # Pro jednoduchost vracíme {label: code}
+                        target_dict[cat] = {}
-                    clean_code = code if code else None
+                        
-                    data[label] = clean_code
+                    # Assign the extracted code to the corresponding label within the category
+                    target_dict[cat][label] = clean
     except Exception as e:
-        print(f"AMČR Chyba čtení {filename}: {e}")
+        print(f"AMČR Codelist Read Error for {filename}: {e}")
         
-    return data
+    return target_dict
 
 def load_all_data():
-    """
+    """Loads all static and dynamic codelists during plugin startup."""
-    Načte statický heslář I dynamický heslář vedoucích.
-    Vrací slovník slovníků.
-    """
     ensure_codelists_dir()
     
-    # 1. Načteme hlavní statický heslář
+    # Initialize the base structure with empty dictionaries for all expected categories
-    # Musíme ho rozparsovat podle kategorií, tak jak to bylo předtím
     categorized_data = {
         'obdobi': {}, 'typ_akce': {}, 'areal': {}, 
         'kraj': {}, 'organizace': {}, 'okres': {}, 'katastr': {},
-        'vedouci': {} 
+        'vedouci': {}, 'pian_presnost': {}, 'typ_lokality': {}, 'druh_lokality': {},
+        'jistota': {}, 'lokalita_zachovalost': {}
     }
     
-    # Funkce pro roztřídění načteného slovníku (tohle je trochu redundance, ale pro zachování logiky)
+    # Parse the default static codelist and the dynamically generated leaders codelist
-    def parse_file(filename):
+    parse_codelist_file('heslar.csv', categorized_data)
-        path = os.path.join(CODELISTS_DIR, filename)
+    parse_codelist_file('vedouci.csv', categorized_data)
-        if not os.path.exists(path): return
-        
-        try:
-            with codecs.open(path, 'r', 'utf-8') as f:
-                reader = csv.reader(f, delimiter=';')
-                next(reader, None) # Skip header
-                for row in reader:
-                    if len(row) >= 3:
-                        label = row[0].strip()
-                        code = row[1].strip()
-                        cat = row[2].strip()
-                        clean = code if code else None
-                        
-                        if cat in categorized_data:
-                            categorized_data[cat][label] = clean
-        except: pass
-
-    # Načteme soubory
-    parse_file('heslar.csv') # Statické
-    parse_file('vedouci.csv') # Dynamické (pokud existuje)
     
     return categorized_data
 
-# --- 2. AKTUALIZACE DAT (DOWNLOAD) ---
-
 def download_vedouci():
-    """
+    """Fetches the list of leaders from the AMČR API and saves it to a CSV file."""
-    Stáhne seznam vedoucích z API (pomocí onlyFacets) a uloží do codelists/vedouci.csv.
-    """
     ensure_codelists_dir()
     
-    # Tvá URL + pojistka, abychom dostali všechny záznamy (limit -1)
+    # API endpoint for fetching facet data for leaders
     url = "https://digiarchiv.aiscr.cz/api/search/query?entity=akce&sort=datestamp%20desc&page=0&onlyFacets=True&rows=0"
     
     try:
-        r = requests.get(url, timeout=20) # Raději delší timeout pro velký seznam
+        # Execute the GET request with a 20-second timeout
+        r = requests.get(url, timeout=20)
         r.raise_for_status()
         data = r.json()
         
-        # Cesta k datům dle tvého JSONu:
+        # Extract the leaders list from the JSON response using safe dict getters
-        # {"facet_counts": { "f_vedouci": [ {"name": "Novák", ...}, ... ] }}
         vedouci_list = data.get('facet_counts', {}).get('f_vedouci', [])
-        
         if not vedouci_list:
-             # Zkusíme ještě alternativní cestu, kdyby API vrátilo standardní Solr strukturu
-             # (facet_counts -> facet_fields -> f_vedouci)
              vedouci_list = data.get('facet_counts', {}).get('facet_fields', {}).get('f_vedouci', [])
 
         csv_path = os.path.join(CODELISTS_DIR, 'vedouci.csv')
         
         count = 0
-        with codecs.open(csv_path, 'w', 'utf-8') as f:
+        
+        # Open the target CSV file for writing without extra blank lines
+        with open(csv_path, 'w', encoding='utf-8', newline='') as f:
             writer = csv.writer(f, delimiter=';')
+            
+            # Write the standard header required by the parser function
             writer.writerow(['Název', 'Kód', 'Kategorie'])
             
-            # NOVÁ LOGIKA PARSOVÁNÍ
+            # Iterate through the API results and format them for the CSV
             for item in vedouci_list:
                 name = None
-                
-                # Varianta A: Položka je slovník {"name": "Jan Novák", "value": 10}
                 if isinstance(item, dict):
                     name = item.get('name')
-                
-                # Varianta B: Položka je jen string (kdyby se API vrátilo k plochému seznamu)
                 elif isinstance(item, str):
                     name = item
                 
-                # Pokud máme jméno a není to číslo (count), zapíšeme
+                # Ignore pure numbers (which are usually counts) and write valid names
                 if name and not str(name).isdigit():
                     writer.writerow([name, name, 'vedouci'])
                     count += 1
@@ -145,28 +115,32 @@ def download_vedouci():
     except Exception as e:
         return False, str(e)
 
-# --- GLOBAL DATA ---
+# Initialize global codelist data when the module is imported
-# Toto se načte při startu QGISu
 _DATA = load_all_data()
 
-OBDOBI = _DATA['obdobi']
+# Safely extract individual categories into global variables for easy access across the plugin
-TYP_AKCE = _DATA['typ_akce']
+OBDOBI = _DATA.get('obdobi', {})
-AREAL = _DATA['areal']
+TYP_AKCE = _DATA.get('typ_akce', {})
-KRAJE = _DATA['kraj']
+AREAL = _DATA.get('areal', {})
-ORGANIZACE = _DATA['organizace']
+KRAJE = _DATA.get('kraj', {})
-OKRESY = _DATA['okres']
+ORGANIZACE = _DATA.get('organizace', {})
-KATASTRY = _DATA['katastr']
+OKRESY = _DATA.get('okres', {})
-VEDOUCI = _DATA['vedouci'] # Tady to bude zpočátku prázdné, pokud soubor neexistuje
+KATASTRY = _DATA.get('katastr', {})
+VEDOUCI = _DATA.get('vedouci', {})
+PIAN_PRESNOST = _DATA.get('pian_presnost', {})
+TYP_LOKALITY = _DATA.get('typ_lokality', {})
+DRUH_LOKALITY = _DATA.get('druh_lokality', {})
+JISTOTA = _DATA.get('jistota', {})
+LOKALITA_ZACHOVALOST = _DATA.get('lokalita_zachovalost', {})
 
 def refresh_vedouci_cache():
-    """
+    """Reloads only the 'vedouci.csv' file to quickly update the cache without full initialization."""
-    Znovu načte soubor vedouci.csv a aktualizuje globální proměnnou VEDOUCI.
+    # Parse only the targeted file containing the updated leaders
-    Použijeme 'update', aby se zachovala reference na objekt (pokud ho dialog už používá).
+    temp_data = parse_codelist_file('vedouci.csv')
-    """
+    new_vedouci = temp_data.get('vedouci', {})
-    temp_data = load_all_data()
-    new_vedouci = temp_data['vedouci']
     
-    # Vyčistíme a naplníme existující slovník (in-place update)
+    # Clear the existing global dictionary and update it with the fresh data
     VEDOUCI.clear()
     VEDOUCI.update(new_vedouci)
+    
     return len(VEDOUCI)

amcr_viewer/amcr_dialog.py

@@ -6,185 +6,303 @@ from qgis.PyQt.QtWidgets import (QDialog, QVBoxLayout, QFormLayout,
                                  QLabel, QMessageBox, QApplication, QWidget)
 from qgis.PyQt.QtCore import Qt
 from .amcr_codelists import (OBDOBI, TYP_AKCE, KRAJE, AREAL, ORGANIZACE, 
-                             OKRESY, KATASTRY, VEDOUCI, 
+                             OKRESY, KATASTRY, VEDOUCI, PIAN_PRESNOST, TYP_LOKALITY,
+                             DRUH_LOKALITY, JISTOTA, LOKALITA_ZACHOVALOST,
                              download_vedouci, refresh_vedouci_cache)
 
 class FilterableSelectionDialog(QDialog):
+    """
+    A custom dialog for selecting multiple items from a list with a search filter.
+    Updated for PyQt6/Qt6 compatibility.
+    """
     def __init__(self, title, data_dict, preselected_codes, parent=None):
         super().__init__(parent)
         self.setWindowTitle(f"Výběr: {title}")
         self.resize(400, 500)
+        
+        # Store the source data and previously selected items
         self.data_dict = data_dict
         self.preselected = preselected_codes if preselected_codes else []
+        
         layout = QVBoxLayout()
+        
+        # Setup search input for filtering items
         self.search_bar = QLineEdit()
         self.search_bar.setPlaceholderText("Hledat v seznamu...")
         self.search_bar.textChanged.connect(self.filter_list)
         layout.addWidget(self.search_bar)
+        
+        # Main list widget for displaying selectable items
         self.list_widget = QListWidget()
         self.populate_list()
         layout.addWidget(self.list_widget)
-        buttons = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        
+        # Standard OK/Cancel dialog buttons
+        buttons = QDialogButtonBox(
+            QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel
+        )
         buttons.accepted.connect(self.accept)
         buttons.rejected.connect(self.reject)
         layout.addWidget(buttons)
+        
         self.setLayout(layout)
 
     def populate_list(self):
+        # Sort items alphabetically by their display name
         sorted_names = sorted(self.data_dict.keys())
         for name in sorted_names:
             code = self.data_dict[name]
             item = QListWidgetItem(name)
-            item.setData(Qt.UserRole, code)
+            
-            item.setFlags(item.flags() | Qt.ItemIsUserCheckable)
+            # Store the actual code (ID) hidden in the UserRole
-            if code in self.preselected: item.setCheckState(Qt.Checked)
+            item.setData(Qt.ItemDataRole.UserRole, code)
-            else: item.setCheckState(Qt.Unchecked)
+            
+            # Make the item checkable (adds a checkbox)
+            item.setFlags(item.flags() | Qt.ItemFlag.ItemIsUserCheckable)
+            
+            # Restore previous selection state
+            if code in self.preselected:
+                item.setCheckState(Qt.CheckState.Checked)
+            else:
+                item.setCheckState(Qt.CheckState.Unchecked)
+                
             self.list_widget.addItem(item)
 
     def filter_list(self, text):
+        # Hide items that don't match the search text (case-insensitive)
         search_text = text.lower()
         for i in range(self.list_widget.count()):
             item = self.list_widget.item(i)
-            if search_text not in item.text().lower(): item.setHidden(True)
+            item.setHidden(search_text not in item.text().lower())
-            else: item.setHidden(False)
 
     def get_selected_codes(self):
+        """Returns the hidden codes and display labels of all checked items."""
         codes = []
         labels = []
         for i in range(self.list_widget.count()):
             item = self.list_widget.item(i)
-            if item.checkState() == Qt.Checked:
+            if item.checkState() == Qt.CheckState.Checked:
-                codes.append(item.data(Qt.UserRole))
+                codes.append(item.data(Qt.ItemDataRole.UserRole))
                 labels.append(item.text())
         return codes, labels
 
 
 # --- Main window ---
 class AmcrFilterDialog(QDialog):
-    def __init__(self, parent=None):
+    """
+    The main filtering UI where users set criteria before downloading data.
+    """
+    def __init__(self, typ_dat, parent=None):
         super().__init__(parent)
         self.setWindowTitle("Filtr AMČR")
         self.resize(500, 750)
         
-        # Cache for filtering
+        # Determines if we are fetching 'akce' (projects) or 'lokalita' (locations)
+        self.typ_dat = typ_dat
+
+        
+        
+        # Cache dictionary to store selected codes for each category
         self.selection_cache = {
             'organizace': [], 'kraj': [], 'obdobi': [], 'areal': [], 
-            'typ_akce': [], 'okres': [], 'katastr': [], 'vedouci': []
+            'typ_akce': [], 'okres': [], 'katastr': [], 'vedouci': [], 'pian_presnost': [],
+            'typ_lokality': [], 'druh_lokality': [], 'jistota': [], 'lokalita_zachovalost': []
         }
         
         layout = QVBoxLayout()
         
+        # Filter by current map canvas extent
         self.chk_bbox = QCheckBox("Omezit vyhledávání rozsahem okna")
         self.chk_bbox.setChecked(True)
         layout.addWidget(self.chk_bbox)
 
-        self.chk_posevidence = QCheckBox("Pouze pozitivní zjištění")
+        # Positive/negative evidence – valid for Akce
-        layout.addWidget(self.chk_posevidence)
+
+        if self.typ_dat == "akce":
+            self.chk_posevidence = QCheckBox("Pouze pozitivní zjištění")
+            layout.addWidget(self.chk_posevidence)
         
         layout.addSpacing(10)
+        
+        # Spatial information – valid for all
 
-        def setup_picker(label_text, cache_key, data_source, extra_btn=None):
+        self.picker_kraj = self.setup_picker("Kraj", 'kraj', KRAJE)
-            row_widget = QGroupBox(label_text) 
-            # row_widget.setFlat(True)
-            
-            row_layout = QHBoxLayout()
-            row_layout.setContentsMargins(5, 5, 5, 5)
-            
-            display_field = QLineEdit()
-            display_field.setReadOnly(True)
-            display_field.setPlaceholderText("Nic nevybráno (vše)")
-            display_field.setStyleSheet("background-color: #f0f0f0; color: #333;")
-            
-            btn = QPushButton("Vybrat...")
-            btn.setFixedWidth(80)
-            
-            def open_dialog():
-                dlg = FilterableSelectionDialog(label_text, data_source, self.selection_cache[cache_key], self)
-                if dlg.exec_() == QDialog.Accepted:
-                    codes, labels = dlg.get_selected_codes()
-                    self.selection_cache[cache_key] = codes
-                    if labels: display_field.setText(", ".join(labels))
-                    else: display_field.clear()
-            
-            btn.clicked.connect(open_dialog)
-            
-            row_layout.addWidget(display_field)
-            row_layout.addWidget(btn)
-            
-            if extra_btn:
-                row_layout.addWidget(extra_btn)
-                
-            row_widget.setLayout(row_layout)
-            return row_widget
-
-        self.picker_kraj = setup_picker("Kraj", 'kraj', KRAJE)
         layout.addWidget(self.picker_kraj)
 
-        self.picker_okres = setup_picker("Okres", 'okres', OKRESY)
+        self.picker_okres = self.setup_picker("Okres", 'okres', OKRESY)
         layout.addWidget(self.picker_okres)
 
-        self.picker_katastr = setup_picker("Katastr", 'katastr', KATASTRY)
+        self.picker_katastr = self.setup_picker("Katastr", 'katastr', KATASTRY)
         layout.addWidget(self.picker_katastr)
 
-        self.picker_org = setup_picker("Organizace", 'organizace', ORGANIZACE)
+        self.picker_presnost = self.setup_picker("PIAN – přesnost", 'pian_presnost', PIAN_PRESNOST)
-        layout.addWidget(self.picker_org)
+        layout.addWidget(self.picker_presnost)
 
-        self.btn_update_vedouci = QPushButton("🔄")
+        # Filters valid for Akce
-        self.btn_update_vedouci.setToolTip("Aktualizovat seznam vedoucích z API")
+
-        self.btn_update_vedouci.setFixedWidth(30)
+        if self.typ_dat == "akce":
-        self.btn_update_vedouci.clicked.connect(self.action_update_vedouci)
+            self.picker_org = self.setup_picker("Organizace", 'organizace', ORGANIZACE)
+            layout.addWidget(self.picker_org)
+
+            # Button to fetch fresh project leaders from the API
+            self.btn_update_vedouci = QPushButton("🔄")
+            self.btn_update_vedouci.setToolTip("Aktualizovat seznam vedoucích z API")
+            self.btn_update_vedouci.setFixedWidth(30)
+            self.btn_update_vedouci.clicked.connect(self.action_update_vedouci)
         
-        self.picker_vedouci = setup_picker("Vedoucí výzkumu", 'vedouci', VEDOUCI, extra_btn=self.btn_update_vedouci)
+            self.picker_vedouci = self.setup_picker("Vedoucí výzkumu", 'vedouci', VEDOUCI, extra_btn=self.btn_update_vedouci)
-        layout.addWidget(self.picker_vedouci)
+            layout.addWidget(self.picker_vedouci)
 
-        self.picker_obdobi = setup_picker("Období", 'obdobi', OBDOBI)
+            # Type of event
+
+            self.picker_typ = self.setup_picker("Typ výzkumu", 'typ_akce', TYP_AKCE)
+            layout.addWidget(self.picker_typ)
+
+        # Filters valid for Lokality
+
+        if self.typ_dat == "lokalita":
+            self.picker_typ_lokality = self.setup_picker("Lokalita – typ", 'typ_lokality', TYP_LOKALITY)
+            layout.addWidget(self.picker_typ_lokality)
+
+            self.picker_druh_lokality = self.setup_picker("Lokalita – druh", 'druh_lokality', DRUH_LOKALITY)
+            layout.addWidget(self.picker_druh_lokality)
+
+            self.picker_jistota = self.setup_picker("Lokalita – jistota určení", 'jistota', JISTOTA)
+            layout.addWidget(self.picker_jistota)
+            
+            self.picker_lokalita_zachovalost = self.setup_picker("Lokalita - stav dochování", 'lokalita_zachovalost', LOKALITA_ZACHOVALOST)
+            layout.addWidget(self.picker_lokalita_zachovalost)
+
+        # Contextual information
+
+        self.picker_obdobi = self.setup_picker("Období", 'obdobi', OBDOBI)
         layout.addWidget(self.picker_obdobi)
         
-        self.picker_areal = setup_picker("Areál / Druh", 'areal', AREAL)
+        self.picker_areal = self.setup_picker("Areál", 'areal', AREAL)
         layout.addWidget(self.picker_areal)
-        
-        self.picker_typ = setup_picker("Typ výzkumu", 'typ_akce', TYP_AKCE)
-        layout.addWidget(self.picker_typ)
 
+        # Option to download related components table
+        self.chk_komponenty = QCheckBox("Načíst komponenty")
+        layout.addWidget(self.chk_komponenty)
+        
+        # Pushes everything above to the top
         layout.addStretch(1)
 
-        buttons = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        # Main dialog OK/Cancel buttons
+        buttons = QDialogButtonBox(
+            QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel
+        )
         buttons.accepted.connect(self.accept)
         buttons.rejected.connect(self.reject)
         layout.addWidget(buttons)
         
         self.setLayout(layout)
 
+    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 
+        text field showing selected items, and a button to open the selection dialog.
+        """
+        row_widget = QGroupBox(label_text) 
+        row_layout = QHBoxLayout()
+        row_layout.setContentsMargins(5, 5, 5, 5)
+        
+        # Read-only field displaying the names of selected items
+        display_field = QLineEdit()
+        display_field.setReadOnly(True)
+        display_field.setPlaceholderText("Nic nevybráno (vše)")
+        display_field.setStyleSheet("background-color: #f0f0f0; color: #333;")
+        
+        btn = QPushButton("Vybrat...")
+        btn.setFixedWidth(80)
+        
+        # Nested function that handles opening the dialog and saving results
+        def open_dialog():
+            dlg = FilterableSelectionDialog(label_text, data_source, self.selection_cache[cache_key], self)
+            if dlg.exec() == QDialog.DialogCode.Accepted: # PyQt6: DialogCode
+                codes, labels = dlg.get_selected_codes()
+                # Update local cache with selected IDs
+                self.selection_cache[cache_key] = codes
+                # Update the UI text field with selected names
+                if labels:
+                    display_field.setText(", ".join(labels))
+                else:
+                    display_field.clear()
+        
+        # Special case: Pre-fill specific accuracy levels by default
+        if cache_key == 'pian_presnost':
+            display_field.setText("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)
+        
+        row_layout.addWidget(display_field)
+        row_layout.addWidget(btn)
+        
+        # Add an optional extra button (e.g., the refresh button for leaders)
+        if extra_btn:
+            row_layout.addWidget(extra_btn)
+            
+        row_widget.setLayout(row_layout)
+        return row_widget
+
     def action_update_vedouci(self):
-        QApplication.setOverrideCursor(Qt.WaitCursor)
+        # Change cursor to loading state to indicate background task
+        QApplication.setOverrideCursor(Qt.CursorShape.WaitCursor)
         try:
             success, msg = download_vedouci()
             if success:
                 count = refresh_vedouci_cache()
-                QApplication.restoreOverrideCursor()
                 QMessageBox.information(self, "Úspěch", f"{msg}\nNyní je v paměti {count} osob.")
             else:
-                QApplication.restoreOverrideCursor()
                 QMessageBox.warning(self, "Chyba", f"Nepodařilo se stáhnout data:\n{msg}")
         except Exception as e:
-            QApplication.restoreOverrideCursor()
             QMessageBox.critical(self, "Chyba", str(e))
+        finally:
+            # Safely restore the normal cursor even if an error occurs
+            QApplication.restoreOverrideCursor()
 
     def get_bbox(self):
         return "true" if self.chk_bbox.isChecked() else "false"
         
-    def get_filters(self):
+    def get_komponenty(self):
-        filters = {}
+        return "true" if self.chk_komponenty.isChecked() else "false"
-        if self.chk_posevidence.isChecked(): filters['posevidence'] = 'true'
         
-        # Loading from cache
+    def get_filters(self):
-        if self.selection_cache['organizace']: filters['f_organizace'] = self.selection_cache['organizace']
+        """Compiles the user selections from the cache into API-ready filter parameters."""
-        if self.selection_cache['kraj']: filters['f_kraj'] = self.selection_cache['kraj']
+        filters = {}
-        if self.selection_cache['okres']: filters['f_okres'] = self.selection_cache['okres']
+
-        if self.selection_cache['katastr']: filters['f_katastr'] = self.selection_cache['katastr']
+        if self.selection_cache['kraj']:
-        if self.selection_cache['obdobi']: filters['f_obdobi'] = self.selection_cache['obdobi']
+            filters['f_kraj'] = self.selection_cache['kraj']
-        if self.selection_cache['areal']: filters['f_areal'] = self.selection_cache['areal']
+        if self.selection_cache['okres']:
-        if self.selection_cache['typ_akce']: filters['f_typ_vyzkumu'] = self.selection_cache['typ_akce']
+            filters['f_okres'] = self.selection_cache['okres']
-        if self.selection_cache['vedouci']: filters['f_vedouci'] = self.selection_cache['vedouci']
+        if self.selection_cache['katastr']:
+            filters['f_katastr'] = self.selection_cache['katastr']
+        if self.selection_cache['obdobi']:
+            filters['f_obdobi'] = self.selection_cache['obdobi']
+        if self.selection_cache['areal']:
+            filters['f_areal'] = self.selection_cache['areal']
+        if self.selection_cache['pian_presnost']:
+            filters['f_pian_presnost'] = self.selection_cache['pian_presnost']  
             
+        if self.typ_dat == "akce":
+            if self.chk_posevidence.isChecked():
+                filters['posevidence'] = 'true'
+            if self.selection_cache['organizace']:
+                filters['f_organizace'] = self.selection_cache['organizace']
+            if self.selection_cache['typ_akce']:
+                filters['f_typ_vyzkumu'] = self.selection_cache['typ_akce']
+            if self.selection_cache['vedouci']:
+                filters['f_vedouci'] = self.selection_cache['vedouci']
+
+        if self.typ_dat == "lokalita":
+            if self.selection_cache['typ_lokality']:
+                filters['f_typ_lokality'] = self.selection_cache['typ_lokality']
+            if self.selection_cache['druh_lokality']:
+                filters['f_druh_lokality'] = self.selection_cache['druh_lokality']
+            if self.selection_cache['jistota']:
+                filters['f_jistota'] = self.selection_cache['jistota']
+            if self.selection_cache['lokalita_zachovalost']:
+                filters['f_lokalita_zachovalost'] = self.selection_cache['lokalita_zachovalost']
+        
         return filters

amcr_viewer/amcr_tools.py

@@ -1,23 +1,22 @@
 # -*- coding: utf-8 -*-
-from qgis.gui import QgsMapToolIdentifyFeature
 from qgis.core import (QgsProject, QgsVectorLayer, QgsFeature, QgsGeometry, 
                        QgsField, QgsCoordinateReferenceSystem, QgsCoordinateTransform,
-                       QgsWkbTypes)
+                       QgsWkbTypes, QgsPolymorphicRelation, QgsEditorWidgetSetup, Qgis)
 from qgis.utils import iface
-from qgis.PyQt.QtCore import QVariant, Qt
+from qgis.PyQt.QtCore import Qt, QMetaType
-from qgis.PyQt.QtWidgets import QMessageBox, QApplication
+from qgis.PyQt.QtWidgets import QApplication
+from qgis.PyQt.QtGui import QCursor
 import requests
 import json
-import xml.etree.ElementTree as ET
-import re
 
-# Global translations cache
+# Global cache to store translated terms from the Digital Archive
 TRANSLATIONS = {}
 
-# Download Digiarchive's vocabulary
 def load_translations():
+    """Fetches the official Czech translation dictionary from the AISCR API."""
     global TRANSLATIONS
-    if TRANSLATIONS: return 
+    if TRANSLATIONS:
+         return 
     
     url = "https://digiarchiv.aiscr.cz/api/assets/i18n/cs.json"
     try:
@@ -25,69 +24,87 @@ def load_translations():
         if r.status_code == 200:
             TRANSLATIONS = r.json()
     except Exception as e:
-        print(f"Chyba při stahování hesláře: {e}")
+        print(f"Error downloading vocabulary: {e}")
 
 def tr_code(code):
-    if not code: return ""
+    """Translates a technical code into a human-readable string using the global cache."""
+    if not code: 
+        return ""
     return TRANSLATIONS.get(code, code)
 
-def load_amcr_data(canvas, bb, filters=None):
+def load_amcr_data(canvas, bb, filters=None, typ_dat="akce", komponenty="false"):
+    """
+    Main processing function:
+    1. Determines search area (Bounding Box)
+    2. Fetches metadata and geometries from API
+    3. Creates QGIS memory layers and populates them with features
+    """
     load_translations()
 
-    # 1. Bounding box
+    # --- 1. COORDINATE TRANSFORMATION ---
+    # Get current map extent and transform it from project CRS (usually S-JTSK) to WGS-84 for the API
     extent = canvas.extent()
     crs_src = canvas.mapSettings().destinationCrs()
     crs_dest = QgsCoordinateReferenceSystem("EPSG:4326")
     xform = QgsCoordinateTransform(crs_src, crs_dest, QgsProject.instance())
     extent_wgs = xform.transformBoundingBox(extent)
+    
+    # Format the bounding box string as required by the API: minLat,minLon,maxLat,maxLon
     bbox_str = f"{extent_wgs.yMinimum()},{extent_wgs.xMinimum()},{extent_wgs.yMaximum()},{extent_wgs.xMaximum()}"
     
     url = "https://digiarchiv.aiscr.cz/api/search/query"
     
-    iface.messageBar().pushMessage("AMCR", "Hledám akce...", level=1)
+    iface.messageBar().pushMessage("AMCR", "Hledám záznamy...", level=Qgis.MessageLevel.Info)
-    QApplication.setOverrideCursor(Qt.WaitCursor)
+    QApplication.setOverrideCursor(QCursor(Qt.CursorShape.WaitCursor))
     
     try:
-        # ===================
+        # ==========================================
-        # A) METADATA (Fieldwork event)
+        # A) METADATA FETCHING (Fieldwork/Site)
-        # ===================
+        # ==========================================
         
         base_params = {
             "mapa": "true",
-            #"isExport": "true",
+            "sort": "ident_cely asc",
-            "entity": "akce",
+            "entity": typ_dat
-            "sort": "ident_cely asc"
         }
 
+        # Restrict search to map window if requested
         if bb == "true": 
             base_params["loc_rpt"] = bbox_str
 
-        # Apply filters
+        # Apply multi-select filters from the dialog using the ':or' syntax required by the API
         if filters:
             for key, value in filters.items():
-                if not value: continue
+                if not value:
+                    continue
                 if isinstance(value, list):
                     base_params[key] = [f"{v}:or" for v in value]
                 else:
                     base_params[key] = str(value).strip()
 
-        docs_akce = []
+        docs = []
         current_page = 0 
-        BATCH_AKCE = 500
+        BATCH_DOCS = 500   # Records per API request
-        MAX_LIMIT = 20000 
+        MAX_LIMIT = 20000  # Safety limit to prevent QGIS from freezing
+        feats_k = []       # List for component features (non-spatial)
         
         seen_ids = set()
+        target_pian_ids_count = 0
+
+        # Check if we should skip negative results based on filter
+        skip_negativni = filters.get('posevidence') == 'true' if filters else False
         
+        # --- API PAGINATION LOOP ---
         while True:
-            base_params['rows'] = BATCH_AKCE
+            base_params['rows'] = BATCH_DOCS
             if current_page > 0:
                 base_params['page'] = current_page
             elif 'page' in base_params:
                 del base_params['page']
             
             try:
-                resp_akce = requests.get(url, params=base_params, timeout=30)
+                resp_docs = requests.get(url, params=base_params, timeout=30)
-                resp_json = resp_akce.json()
+                resp_json = resp_docs.json()
                 data = resp_json.get('response', {})
                 batch_docs = data.get('docs', [])
                 num_found = data.get('numFound', 0) 
@@ -95,6 +112,7 @@ def load_amcr_data(canvas, bb, filters=None):
                 if not batch_docs:
                     break
                 
+                # Filter out duplicates and append to main list
                 new_docs = []
                 for d in batch_docs:
                     ident = d.get('ident_cely')
@@ -102,124 +120,167 @@ def load_amcr_data(canvas, bb, filters=None):
                         seen_ids.add(ident)
                         new_docs.append(d)
                 
-                docs_akce.extend(new_docs)
+                docs.extend(new_docs)
-                print(f"Strana {current_page} stažena. Celkem záznamů: {len(docs_akce)} / {num_found}")
+                print(f"Strana {current_page} stažena. Celkem záznamů: {len(docs)} / {num_found}")
 
-                if len(docs_akce) >= num_found:
+                if len(docs) >= num_found:
                     break
-                if len(docs_akce) >= MAX_LIMIT:
+                if len(docs) >= MAX_LIMIT:
-                    iface.messageBar().pushMessage("AMCR", f"Limit {MAX_LIMIT} záznamů dosažen.", level=1)
+                    iface.messageBar().pushMessage("AMCR", f"Limit {MAX_LIMIT} záznamů dosažen.", level=Qgis.MessageLevel.Warning)
                     break
                 
                 current_page += 1
-                QApplication.processEvents()
+                QApplication.processEvents() # Keep UI responsive
                 
             except Exception as e:
                 print(f"Chyba při stránkování na straně {current_page}: {e}")
                 break
 
-        if not docs_akce:
+        if not docs:
-             iface.messageBar().pushMessage("AMCR", "Žádné akce nenalezeny.", level=1)
+             iface.messageBar().pushMessage("AMCR", "Žádné záznamy nenalezeny.", level=Qgis.MessageLevel.Warning)
              return
 
         # ==========================================
-        # Attribute parsing
+        # B) ATTRIBUTE PARSING
         # ==========================================
+        
+        # pian_lookup maps a Geometry ID (PIAN) to a list of its associated metadata
         pian_lookup = {}
+        komponenty_lookup = {}
         target_pian_ids = set()
         actions_with_geom = 0
-        negative_dj_pian_ids = set()
         
-        for akce in docs_akce:
+        # Helper function for safe single-value extraction
-            piani = akce.get('az_dj_pian', [])
+        def g(doc, key, default=""): 
-            if not piani: continue
+            val = doc.get(key)
-            
+            if isinstance(val, list):
-            negative_pians = set()
+                return str(val[0]) if val else default
-            # Pokud je aktivní filtr 'posevidence', projdeme dokumentační jednotky
+            return str(val) if val is not None else default
-            if filters and filters.get('posevidence') == 'true':
-                djs = akce.get('az_dokumentacni_jednotka', [])
-                for dj in djs:
-                    # Pokud je jednotka negativní
-                    if dj.get('dj_negativni_jednotka') is True:
-                        # Získáme ID pianu z objektu (např. {"id": "P-...", "value": "..."})
-                        pian_obj = dj.get('dj_pian')
-                        if pian_obj and isinstance(pian_obj, dict):
-                            negative_pians.add(pian_obj.get('id'))            
 
-            djs = akce.get('az_dokumentacni_jednotka', [])
+        # Helper function for safe list-value extraction and joining
-            for dj in djs:
+        def g_list(doc, key, translate=False):
-                is_negative = dj.get('dj_negativni_jednotka')
+            val = doc.get(key, [])
-                if is_negative is True or str(is_negative).lower() == 'true':
+            if not isinstance(val, list):
-                    # Získáme ID pianu z objektu (např. {"id": "P-...", "value": "..."})
+                val = [val] if val else []
-                    pian_obj = dj.get('dj_pian')
+            if translate:
-                    if pian_obj and isinstance(pian_obj, dict):
+                return ", ".join([tr_code(str(x)) for x in val if x])
-                        negative_dj_pian_ids.add(pian_obj.get('id'))
+            return ", ".join([str(x) for x in val if x])
+
+        # Process each downloaded metadata record
+        for doc in docs:
+            piani = doc.get('az_dj_pian', [])
+            if not piani:
+                continue
 
             actions_with_geom += 1
             
-            def g(key, default=""): 
+            # Extract protected data (fields not available in public Solr index)
-                val = akce.get(key)
+            az_chranene = doc.get('az_chranene_udaje', {})
-                if isinstance(val, list): return str(val[0]) if val else default
+            chranene = doc.get('akce_chranene_udaje') or doc.get('lokalita_chranene_udaje') or {}
-                return str(val) if val is not None else default
-
-            def g_list(key, translate=False):
-                val = akce.get(key, [])
-                if not isinstance(val, list): val = [val] if val else []
-                if translate:
-                    return ", ".join([tr_code(str(x)) for x in val if x])
-                return ", ".join([str(x) for x in val if x])
-
-            az_chranene = akce.get('az_chranene_udaje', {})
-            akce_chranene = akce.get('akce_chranene_udaje', {})
             
+            # Format additional cadastral areas from dictionaries
             dalsi_kat = az_chranene.get('dalsi_katastr', [])
             dalsi_kat_str = ""
             if isinstance(dalsi_kat, list):
                 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])
 
-            lokalizace = akce_chranene.get('lokalizace_okolnosti', "")
+            lokalizace = chranene.get('lokalizace_okolnosti', "")
+            lokalita_nazev = chranene.get('nazev', "")
+            lokalita_popis = chranene.get('popis', "")
 
-            # Prepate metadata for fieldwork event
+            # Core metadata structure
             meta = {
-                "ident_cely": akce.get('ident_cely', ''),
+                "ident_cely": doc.get('ident_cely', ''),
-                "az_okres": g('az_okres'),
+                "az_okres": g(doc, 'az_okres'),
-                "katastr": g_list('katastr'),
+                "katastr": g_list(doc, 'katastr'),
-                "dalsi_katastr": dalsi_kat_str,
+                "dalsi_katastr": dalsi_kat_str,                
-                "akce_hlavni_vedouci": g('akce_hlavni_vedouci'),
+                "pristupnost": g(doc, 'pristupnost'),
-                "akce_organizace": tr_code(g('akce_organizace')),
+                "loc": g_list(doc, 'loc')
-                "akce_specifikace_data": tr_code(g('akce_specifikace_data')),
-                "akce_datum_zahajeni": g('akce_datum_zahajeni'),
-                "akce_datum_ukonceni": g('akce_datum_ukonceni'),
-                "akce_hlavni_typ": tr_code(g('akce_hlavni_typ')),
-                "akce_vedlejsi_typ": g_list('akce_vedlejsi_typ', translate=True),
-                "lokalizace_okolnosti": str(lokalizace) if lokalizace else "",
-                "akce_je_nz": "Ano" if akce.get('akce_je_nz') is True else "Ne",
-                "pristupnost": g('pristupnost'),
-                "loc": g_list('loc')
             }
+
+            # Add entity-specific metadata
+            if typ_dat == "akce":
+                meta.update({
+                    "akce_hlavni_vedouci": g(doc, 'akce_hlavni_vedouci'),
+                    "akce_organizace": tr_code(g(doc, 'akce_organizace')),
+                    "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":
+                meta.update({
+                    "lokalita_nazev": lokalita_nazev,
+                    "lokalita_popis": lokalita_popis,
+                    "lokalita_zachovalost": tr_code(g(doc, 'lokalita_zachovalost')),
+                    "lokalita_druh": tr_code(g(doc, 'lokalita_druh')),
+                    "lokalita_typ": tr_code(g(doc, 'lokalita_typ_lokality')),
+                })
             
-            for pid in piani:
+            # Documentation units (DJ) within the record
-                if pid in negative_pians:
+            djs = doc.get('az_dokumentacni_jednotka', [])
+
+            for dj in djs:
+                # Filter out negative evidence units if requested
+                if skip_negativni and dj.get('dj_negativni_jednotka') is True:
                     continue
-                pian_lookup[pid] = meta
+
-                target_pian_ids.add(pid)
+                dj_id = dj.get('ident_cely')
+                dj_typ = dj.get('dj_typ')
+
+                # Merge general meta with documentation unit specific data
+                dj_meta = {
+                    **meta,
+                    'dj_id': dj_id,
+                    'dj_typ_value': dj_typ.get('value') if dj_typ else "",
+                    'dj_negativni': "Negativní" if dj.get('dj_negativni_jednotka') is True else "Pozitivní"
+                }
+                
+                # Link Documentation Unit to Geometry (PIAN)
+                dj_pian = dj.get('dj_pian')
+                if dj_pian:
+                    dj_pian_value = dj_pian.get('id')
+                    if dj_pian_value:
+                        target_pian_ids.add(dj_pian_value)
+                        target_pian_ids_count += 1
+                        if dj_pian_value not in pian_lookup:
+                            pian_lookup[dj_pian_value] = []
+                        pian_lookup[dj_pian_value].append(dj_meta)
+
+                        # Parse non-spatial components if requested (for relational tables)
+                        if komponenty == "true":
+                            komps = dj.get('dj_komponenta', [])
+                            for komp in komps:
+                                komp_temp = [
+                                    komp.get('ident_cely', ""),
+                                    komp.get('komponenta_areal', {}).get('value', ""),
+                                    komp.get('komponenta_obdobi', {}).get('value', "")
+                                ]
+                                if dj_id not in komponenty_lookup:
+                                    komponenty_lookup[dj_id] = []
+                                komponenty_lookup[dj_id].append(komp_temp)
+
 
         if not target_pian_ids:
-            iface.messageBar().pushMessage("AMCR", f"Nalezeno {len(docs_akce)} akcí, ale žádná nemá geometrii.", level=1)
+            iface.messageBar().pushMessage("AMCR", f"Nalezeno {len(docs)} záznamů, ale žádný nemá geometrii.", level=Qgis.MessageLevel.Warning)
-            return
+            return        
+
 
         # ==========================================
-        # B) Geometry (PIAN)
+        # C) GEOMETRY FETCHING (PIAN)
         # ==========================================
         ids_list = list(target_pian_ids)
         total_pians = len(ids_list)
         docs_pian = []
-        BATCH_PIAN = 50 
+        BATCH_PIAN = 200 # Geometry requests are batch-processed to stay under URL length limits
         
-        iface.messageBar().pushMessage("AMCR", f"Akcí: {len(docs_akce)} (z toho {actions_with_geom} s mapou). Stahuji {total_pians} geometrií...", level=1)
+        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)
         
-        # Seznam polí pro PIAN
         fl_pian = ["ident_cely", "pian_typ", "pian_chranene_udaje", "pian_presnost"]
 
         for i in range(0, total_pians, BATCH_PIAN):
@@ -243,180 +304,248 @@ def load_amcr_data(canvas, bb, filters=None):
                 print(f"Chyba PIAN: {e}")
 
         # ==========================================
-        # C) TVORBA VRSTEV
+        # D) LAYER CREATION (QGIS Memory Layers)
         # ==========================================
-        vl_poly = QgsVectorLayer("Polygon?crs=epsg:5514", "AMCR Plochy", "memory")
-        vl_line = QgsVectorLayer("LineString?crs=epsg:5514", "AMCR Linie", "memory")
-        vl_point = QgsVectorLayer("Point?crs=epsg:5514", "AMCR Body", "memory")
-        layers = [vl_poly, vl_line, vl_point]
         
-        # Definice sloupců atributové tabulky
+        archeologicky_zaznam = "Akce" if typ_dat == "akce" else "Lokalita"
+
+        # Initialize three layers for different geometry types (S-JTSK CRS)
+        vl_poly = QgsVectorLayer("Polygon?crs=epsg:5514", 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]
+
+        # Define attribute table structure
         cols = [
-            QgsField("PIAN", QVariant.String),
+            QgsField("PIAN", QMetaType.Type.QString),
-            QgsField("Přesnost", QVariant.String),
+            QgsField("Přesnost", QMetaType.Type.QString),
-            QgsField("PIAN – typ", QVariant.String),
+            QgsField("PIAN – typ", QMetaType.Type.QString),
-            QgsField("Definiční bod(y) (WGS-84)", QVariant.String),
+            QgsField("Dokumentační jednotka", QMetaType.Type.QString),
-            QgsField("Identifikátor", QVariant.String),
+            QgsField("Typ dokumentační jednotky", QMetaType.Type.QString),
-            QgsField("Odkaz do Digiarchivu", QVariant.String),
+            QgsField("Definiční bod(y) (WGS-84)", QMetaType.Type.QString),
-            QgsField("Okres", QVariant.String),
+            QgsField(archeologicky_zaznam, QMetaType.Type.QString),
-            QgsField("Katastr", QVariant.String),
+            QgsField("Odkaz do Digitálního archivu AMČR", QMetaType.Type.QString),
-            QgsField("Další katastry", QVariant.String),
+            QgsField("Okres", QMetaType.Type.QString),
-            QgsField("Vedoucí akce", QVariant.String),
+            QgsField("Katastr", QMetaType.Type.QString),
-            QgsField("Organizace", QVariant.String),
+            QgsField("Další katastry", QMetaType.Type.QString)
-            QgsField("Specifikace data", QVariant.String),
-            QgsField("Datum zahájeni", QVariant.String),
-            QgsField("Datum ukončení", QVariant.String),
-            QgsField("Hlavní typ", QVariant.String),
-            QgsField("Vedlejší typ", QVariant.String),
-            QgsField("Zjištění", QVariant.String),
-            QgsField("Akce – lokalizace", QVariant.String),
-            QgsField("Akce - nahrazuje NZ", QVariant.String),
-            QgsField("Přístupnost", QVariant.String)
         ]
 
+        # Extend table based on data type
+        if typ_dat == "akce":
+            cols += [
+                QgsField("Akce – lokalizace", QMetaType.Type.QString),
+                QgsField("Vedoucí akce", QMetaType.Type.QString),
+                QgsField("Organizace", QMetaType.Type.QString),
+                QgsField("Specifikace data", QMetaType.Type.QString),
+                QgsField("Datum zahájeni", QMetaType.Type.QString),
+                QgsField("Datum ukončení", QMetaType.Type.QString),
+                QgsField("Hlavní typ", QMetaType.Type.QString),
+                QgsField("Vedlejší typ", QMetaType.Type.QString),
+                QgsField("Zjištění", QMetaType.Type.QString),                
+                QgsField("Akce – nahrazuje NZ", QMetaType.Type.QString),
+            ]
+        elif typ_dat == "lokalita":
+            cols += [
+                QgsField("nazev_lokality", QMetaType.Type.QString),
+                QgsField("popis_lokality", QMetaType.Type.QString),
+                QgsField("typ_lokality", QMetaType.Type.QString),
+                QgsField("druh_lokality", QMetaType.Type.QString),
+                QgsField("zachovalost", QMetaType.Type.QString)
+            ]
+        
+        cols.append(QgsField("Přístupnost", QMetaType.Type.QString))
+
+        # Use aliases for technical field names
+        alias_map = {
+            "nazev_lokality": "Název lokality",
+            "popis_lokality": "Popis lokality",
+            "typ_lokality": "Typ lokality",
+            "druh_lokality": "Druh lokality",
+            "zachovalost": "Zachovalost"
+        }        
+
+        # Create a non-spatial table for components if requested
+        if komponenty == "true":
+            vl_komponenty = QgsVectorLayer("None", "AMCR Komponenty", "memory")
+            pr = vl_komponenty.dataProvider()
+            komponenty_cols = [
+                QgsField("komponenta", QMetaType.Type.QString),
+                QgsField("dj_id", QMetaType.Type.QString),
+                QgsField("komponenta_areal", QMetaType.Type.QString),
+                QgsField("komponenta_obdobi", QMetaType.Type.QString),
+                QgsField("vrstva", QMetaType.Type.QString)
+            ]
+            pr.addAttributes(komponenty_cols)
+            vl_komponenty.updateFields()
+
+            idx_vrstva = vl_komponenty.fields().indexOf("vrstva")
+            vl_komponenty.setEditorWidgetSetup(idx_vrstva, QgsEditorWidgetSetup("Hidden", {}))
+
         for vl in layers:
             vl.dataProvider().addAttributes(cols)
             vl.updateFields()
+            for tech_name, alias in alias_map.items():
+                idx = vl.fields().lookupField(tech_name)
+                if idx != -1:
+                    vl.setFieldAlias(idx, alias)
             
+        # Lists to hold features before batch-adding to layers
         feats_p, feats_l, feats_pt = [], [], []
         
+        # --- FEATURE POPULATION ---
         for doc in docs_pian:
             try:
                 pid = doc.get('ident_cely', '')
-                if pid not in pian_lookup: continue 
+                if pid not in pian_lookup:
+                    continue 
+                                        
+                metas = pian_lookup[pid]
                 
-                meta = pian_lookup[pid]
+                # Extract WKT geometry from protected JSON data
-                
-                # Geometry processing
                 raw = doc.get('pian_chranene_udaje')
-                if isinstance(raw, list) and raw: raw = raw[0]
+                if isinstance(raw, list) and raw:
-                jdata = json.loads(raw) if isinstance(raw, str) else (raw if isinstance(raw, dict) else {})
+                    raw = raw[0]
+                jdata = json.loads(raw) if isinstance(raw, str) else (raw or {})
                 
                 wkt = None
-                if jdata.get('geom_sjtsk_wkt'): wkt = jdata['geom_sjtsk_wkt'].get('value')
+                if jdata.get('geom_sjtsk_wkt'):
-                elif jdata.get('geom_wkt'): wkt = jdata['geom_wkt'].get('value')
+                    wkt = jdata.get('geom_sjtsk_wkt', {}).get('value')
+                elif jdata.get('geom_wkt'):
+                    wkt = jdata.get('geom_wkt', {}).get('value')
                 
-                # PIAN attributes
                 pian_presnost = tr_code(str(doc.get('pian_presnost', '')))
                 pian_typ = tr_code(str(doc.get('pian_typ', '')))
-                dj_negativni = "Negativní" if pid in negative_dj_pian_ids else "Pozitivní"
+
+                # Final precision filter check
+                if filters and filters.get('f_pian_presnost') and doc.get('pian_presnost') not in filters.get('f_pian_presnost'):
+                    continue
 
                 if wkt:
                     geom = QgsGeometry.fromWkt(wkt)
                     if geom.isGeosValid():
-                        feat = QgsFeature()
-                        feat.setGeometry(geom)
-                        feat.setAttributes([
-                            pid, 
-                            pian_presnost,
-                            pian_typ,
-                            meta['loc'],
-                            meta['ident_cely'],
-                            "https://digiarchiv.aiscr.cz/id/" + meta['ident_cely'],
-                            meta['az_okres'],
-                            meta['katastr'],
-                            meta['dalsi_katastr'],
-                            meta['akce_hlavni_vedouci'],
-                            meta['akce_organizace'],
-                            meta['akce_specifikace_data'],
-                            meta['akce_datum_zahajeni'],
-                            meta['akce_datum_ukonceni'],
-                            meta['akce_hlavni_typ'],
-                            meta['akce_vedlejsi_typ'],
-                            dj_negativni,
-                            meta['lokalizace_okolnosti'],
-                            meta['akce_je_nz'],
-                            meta['pristupnost']
-                        ])
                         t = geom.type()
-                        if t == QgsWkbTypes.PolygonGeometry: feats_p.append(feat)
+                        target_list = None
-                        elif t == QgsWkbTypes.LineGeometry: feats_l.append(feat)
+                        if t == QgsWkbTypes.PolygonGeometry:
-                        elif t == QgsWkbTypes.PointGeometry: feats_pt.append(feat)
+                            target_list = feats_p
+                            referenced_layer = vl_poly
+                        elif t == QgsWkbTypes.LineGeometry:
+                            target_list = feats_l
+                            referenced_layer = vl_line
+                        elif t == QgsWkbTypes.PointGeometry:
+                            target_list = feats_pt
+                            referenced_layer = vl_point
+                        
+                        if target_list is None:
+                            continue
+
+                        is_akce = (typ_dat == "akce")
+
+                        # Create a QGIS feature for each documentation unit associated with this geometry
+                        for meta in metas:
+                            feat = QgsFeature()
+                            feat.setGeometry(geom)
+                            atributy = [
+                                pid, pian_presnost, pian_typ, meta['dj_id'],
+                                meta['dj_typ_value'], meta['loc'], meta['ident_cely'],
+                                "https://digiarchiv.aiscr.cz/id/" + meta['ident_cely'],
+                                meta['az_okres'], meta['katastr'], meta['dalsi_katastr']
+                            ]
+                            if is_akce:
+                                atributy.extend([
+                                    meta['lokalizace_okolnosti'], meta['akce_hlavni_vedouci'],
+                                    meta['akce_organizace'], meta['akce_specifikace_data'],
+                                    meta['akce_datum_zahajeni'], meta['akce_datum_ukonceni'],
+                                    meta['akce_hlavni_typ'], meta['akce_vedlejsi_typ'],
+                                    meta['dj_negativni'], meta['akce_je_nz']
+                                ])
+                            else:
+                                atributy.extend([
+                                    meta['lokalita_nazev'], meta['lokalita_popis'],
+                                    meta['lokalita_typ'], meta['lokalita_druh'],
+                                    meta['lokalita_zachovalost']
+                                ])
+                            
+                            if komponenty == "true" and meta['dj_id'] in komponenty_lookup:
+                                for k in komponenty_lookup[meta['dj_id']]:
+                                    if len(k) == 3:
+                                        k.append(referenced_layer.id())
+                            
+                            atributy.append(meta['pristupnost'])
+                            feat.setAttributes(atributy)
+                            target_list.append(feat)
+                            
             except Exception as ex:
                 print(f"Chyba při tvorbě feature: {ex}")
                 pass
+        
+        if komponenty == "true":
+            for k in komponenty_lookup:
+                for komp in komponenty_lookup[k]:
+                    if len(komp) == 4:
+                        feat = QgsFeature()
+                        atributy = [
+                            komp[0], k, komp[1], komp[2], komp[3]
+                        ]
+                        feat.setAttributes(atributy)
+                        feats_k.append(feat)
 
+        # --- ADDING TO QGIS INTERFACE ---
         proj = QgsProject.instance()
         added = 0
-        for f, l, n in [(feats_p, vl_poly, "Plochy"), (feats_l, vl_line, "Linie"), (feats_pt, vl_point, "Body")]:
+        layers_to_process = [
+            (feats_p, vl_poly, "Polygony"), 
+            (feats_l, vl_line, "Linie"), 
+            (feats_pt, vl_point, "Body"),
+        ]
+
+        if komponenty == "true":
+            layers_to_process.append((feats_k, vl_komponenty, "Komponenty"))
+
+        for f, l, n in layers_to_process:
             if f:
                 l.dataProvider().addFeatures(f)
                 l.updateExtents()
-                l.setName(f"AMČR {n} (Filtrováno)") 
+                l.setName(f"AMCR_{archeologicky_zaznam}_{n}") 
                 proj.addMapLayer(l)
-                added += len(f)
+                if n != "Komponenty":
+                    added += len(f)
         
         if added > 0:
-            iface.messageBar().pushMessage("AMCR", f"Hotovo. Akcí: {len(docs_akce)} (s geom: {actions_with_geom}). Vykresleno: {added} prvků.", level=0)
+            iface.messageBar().pushMessage("AMCR", f"Hotovo. Záznamů: {len(docs)} (s geom: {actions_with_geom}). Vykresleno: {added} prvků.", level=Qgis.MessageLevel.Success)
+
+            # --- RELATIONSHIP MANAGEMENT ---
+            # Set up automatic links between spatial layers and the component table
+            if komponenty == "true":
+                parent_layers_ids = []
+                if feats_p:
+                    parent_layers_ids.append(vl_poly.id())
+                if feats_l:
+                    parent_layers_ids.append(vl_line.id())
+                if feats_pt:
+                    parent_layers_ids.append(vl_point.id())
+
+                rel_manager = proj.relationManager()
+                
+                rel = QgsPolymorphicRelation()
+                # rel.setId(f"rel_komponenty_{archeologicky_zaznam}") 
+                rel.setName("Komponenty")                    
+                rel.setReferencingLayer(vl_komponenty.id())
+                rel.setReferencedLayerExpression("@layer_id")
+                rel.setReferencedLayerField("vrstva")
+                rel.setReferencedLayerIds(parent_layers_ids)
+                rel.addFieldPair("dj_id", "Dokumentační jednotka")
+                rel.generateId() 
+                
+                if rel.isValid():
+                    rel_manager.addPolymorphicRelation(rel)
+                else:
+                    print("Relace Komponenty není validní!")
+
         else:
-            iface.messageBar().pushMessage("AMCR", "Žádná data k zobrazení.", level=1)
+            iface.messageBar().pushMessage("AMCR", "Žádná data k zobrazení.", level=Qgis.MessageLevel.Info)
 
     except Exception as e:
-        iface.messageBar().pushMessage("Chyba", str(e), level=2)
+        iface.messageBar().pushMessage("Chyba", str(e), level=Qgis.MessageLevel.Critical)
     finally:
-        QApplication.restoreOverrideCursor()
+        # Always restore cursor, even after failure
-
+        QApplication.restoreOverrideCursor()
-# class AmcrIdentifyTool(QgsMapToolIdentifyFeature):
-#     def __init__(self, canvas):
-#         super().__init__(canvas)
-#         self.canvas = canvas
-#         self.setCursor(Qt.CrossCursor)
-
-#     def canvasReleaseEvent(self, event):
-#         results = self.identify(event.x(), event.y(), self.IdentifyMode.TopDownStopAtFirst, self.VectorLayer)
-#         if not results: return
-#         feature = results[0].mFeature
-#         akce_id = None
-#         # Změna: hledáme 'ident_cely' (ID akce)
-#         idx = feature.fieldNameIndex('ident_cely')
-#         if idx != -1:
-#             akce_id = feature.attributes()[idx]
-        
-#         # Fallback na starší názvy polí, kdyby něco
-#         if not akce_id:
-#              for col in ['akce_id', 'ident_cely', 'pian_id']:
-#                 if col in feature.fields().names():
-#                     akce_id = feature[col]
-#                     break
-        
-#         if not akce_id: return
-
-#         full_id = akce_id if "api.aiscr.cz" in str(akce_id) else f"https://api.aiscr.cz/id/{akce_id}"
-#         url = f"https://api.aiscr.cz/2.2/oai?verb=GetRecord&metadataPrefix=oai_amcr&identifier={full_id}"
-        
-#         iface.messageBar().pushMessage("AMCR", f"Detail: {akce_id}...", level=1)
-#         QApplication.setOverrideCursor(Qt.WaitCursor)
-#         try:
-#             r = requests.get(url, timeout=5)
-#             if r.status_code == 200: self.show_detail(akce_id, r.text)
-#         except Exception as e:
-#             iface.messageBar().pushMessage("Chyba", str(e), level=2)
-#         finally:
-#             QApplication.restoreOverrideCursor()
-
-#     def show_detail(self, title, raw_xml):
-#         xml = re.sub(r'\sxmlns="[^"]+"', '', raw_xml, count=1)
-#         xml = re.sub(r'<(/?)[a-zA-Z0-9]+:', r'<\1', xml)
-#         info = ""
-#         try:
-#             root = ET.fromstring(xml)
-#             rec = root.find('.//archeologicky_zaznam')
-#             if not rec: info = "Zadna data."
-#             else:
-#                 kat = rec.find('.//hlavni_katastr')
-#                 info += f"<h3>{kat.text if kat is not None else '?'}</h3>"
-#                 for dj in rec.findall('.//dokumentacni_jednotka'):
-#                     pn = dj.find('pian')
-#                     p_txt = pn.text if pn is not None else ""
-#                     info += f"<hr><b>PIAN: {p_txt}</b><ul>"
-#                     for k in dj.findall('komponenta'):
-#                         ob = k.find('obdobi').text or "?"
-#                         ar = k.find('areal').text or "?"
-#                         info += f"<li>{ob} ({ar})</li>"
-#                     info += "</ul>"
-#             dlg = QMessageBox()
-#             dlg.setWindowTitle(str(title))
-#             dlg.setText(info)
-#             dlg.setTextFormat(Qt.RichText)
-#             dlg.exec_()
-#         except: pass

amcr_viewer/amcr_viewer.py

@@ -1,39 +1,56 @@
 # -*- coding: utf-8 -*-
 from qgis.PyQt.QtCore import QSettings, QTranslator, QCoreApplication
 from qgis.PyQt.QtGui import QIcon
-from qgis.PyQt.QtWidgets import QAction
+from qgis.PyQt.QtWidgets import QMenu, QAction, QToolButton, QDialog
 
-from .amcr_tools import load_amcr_data#, AmcrIdentifyTool
+from .amcr_tools import load_amcr_data
 from .amcr_dialog import AmcrFilterDialog
 from .resources import *
 import os.path
 
 class AmcrViewer:
+    """
+    Main plugin class that manages the GUI elements, menu entries, 
+    and coordinates the flow between user input and data processing.
+    """
     
     def __init__(self, iface):
+        """
+        Constructor initializes the connection to QGIS interface and sets up 
+        internationalization (i18n).
+        """
         self.iface = iface
         self.plugin_dir = os.path.dirname(__file__)
+        
+        # Determine the user's locale to load appropriate translation files
         locale = QSettings().value('locale/userLocale')[0:2]
         locale_path = os.path.join(
             self.plugin_dir,
             'i18n',
             'AmcrViewer_{}.qm'.format(locale))
 
+        # Install the translator if a translation file for the current locale exists
         if os.path.exists(locale_path):
             self.translator = QTranslator()
             self.translator.load(locale_path)
             QCoreApplication.installTranslator(self.translator)
 
+        # Initialize internal state
         self.actions = []
         self.menu = self.tr(u'&AMČR Viewer')
         self.first_start = None
 
     def tr(self, message):
+        """Helper method for translating strings within the AmcrViewer context."""
         return QCoreApplication.translate('AmcrViewer', message)
 
     def add_action(self, icon_path, text, callback, enabled_flag=True,
                    add_to_menu=True, add_to_toolbar=True, status_tip=None,
                    whats_this=None, parent=None):
+        """
+        Helper method to create QActions and automatically register them 
+        into the QGIS Menu and Toolbar.
+        """
         icon = QIcon(icon_path)
         action = QAction(icon, text, parent)
         action.triggered.connect(callback)
@@ -45,75 +62,110 @@ class AmcrViewer:
         if whats_this is not None:
             action.setWhatsThis(whats_this)
 
+        # Standard QGIS API for adding icons and menu items
         if add_to_toolbar:
             self.iface.addToolBarIcon(action)
 
         if add_to_menu:
             self.iface.addPluginToMenu(self.menu, action)
 
-        self.actions.append(action)
+        # Store only actions that are directly attached to the QGIS UI for later cleanup
+        if add_to_toolbar or add_to_menu:
+            self.actions.append(action)
+            
         return action
 
     def initGui(self):
-       
+        """
-        import os
+        Called when the plugin is loaded. Creates the menu structure, 
-        plugin_dir = os.path.dirname(__file__)
+        sub-actions, and the dropdown tool button in the toolbar.
+        """
+        # Define paths for action-specific icons
+        icon_akce_path = os.path.join(self.plugin_dir, 'akce.png')
+        icon_lokality_path = os.path.join(self.plugin_dir, 'lokality.png')
 
-        icon = QIcon(os.path.join(plugin_dir, 'download.png'))
+        # 1. Create a container menu for the plugin
+        self.plugin_menu = QMenu()
+
+        # 2. Create sub-actions (Download Projects / Download Sites)
+        # add_to_menu/toolbar is False because these go into our custom dropdown menu
+        self.action_download_akce = self.add_action(
+            icon_path=icon_akce_path,
+            text=self.tr(u'Stáhnout data akcí | AMČR Viewer'),
+            callback=lambda checked=False: self.run_download('akce'),
+            parent=self.iface.mainWindow(),
+            add_to_menu=False,
+            add_to_toolbar=False
+        )
+        self.plugin_menu.addAction(self.action_download_akce)
+
+        self.action_download_lokality = self.add_action(
+            icon_path=icon_lokality_path,
+            text=self.tr(u'Stáhnout data lokalit | AMČR Viewer'),
+            callback=lambda checked=False: self.run_download('lokalita'), 
+            parent=self.iface.mainWindow(),
+            add_to_menu=False,
+            add_to_toolbar=False
+        )
+        self.plugin_menu.addAction(self.action_download_lokality)
+
+        # 3. Create the main project action and attach the menu to it
+        main_icon = QIcon(icon_akce_path)
+        self.main_action = QAction(main_icon, 'AMČR Viewer', self.iface.mainWindow())
+        self.main_action.setMenu(self.plugin_menu)
+        self.iface.addPluginToMenu(self.menu, self.main_action)
+
+        # 4. Create and configure a QToolButton for the QGIS Toolbar
+        # This button acts as a dropdown menu button (MenuButtonPopup)
+        self.tool_button = QToolButton()
+        self.tool_button.setMenu(self.plugin_menu)
+        self.tool_button.setDefaultAction(self.action_download_akce)
+        self.tool_button.setPopupMode(QToolButton.ToolButtonPopupMode.MenuButtonPopup)
         
-        # icon_info = QIcon(os.path.join(plugin_dir, 'info.png'))
+        # Add the widget directly to the toolbar and store the reference for cleanup
-
+        self.toolbar_action = self.iface.addToolBarWidget(self.tool_button)
-        # Download data button 
-        self.action_download = self.add_action(
-            icon,
-            text=self.tr(u'Načíst data z AMČR'),
-            callback=self.run_download,
-            parent=self.iface.mainWindow())
         
-        # # Info button (Checkable / Toggle)
-        # self.action_tool = self.add_action(
-        #     icon_info,
-        #     text=self.tr(u'Výpis údajů záznamu'),
-        #     callback=self.run_tool,
-        #     parent=self.iface.mainWindow())
-        # self.action_tool.setCheckable(True) # Toto tlačítko se zamačkává
-
         self.first_start = True
 
     def unload(self):
+        """
+        Called when the plugin is disabled or removed. 
+        Ensures all GUI elements are removed from QGIS to avoid ghost icons.
+        """
+        # 1. Remove the custom entry from the main 'Plugins' menu
+        if hasattr(self, 'main_action'):
+            self.iface.removePluginMenu(self.menu, self.main_action)
+
+        # 2. Remove the custom QToolButton from the toolbar
+        if hasattr(self, 'toolbar_action'):
+            self.iface.removeToolBarIcon(self.toolbar_action)
+
+        # 3. Clean up any remaining actions registered in self.actions
         for action in self.actions:
-            self.iface.removePluginMenu(self.tr(u'&AMČR Viewer'), action)
+            self.iface.removePluginMenu(self.menu, action)
             self.iface.removeToolBarIcon(action)
+        self.actions.clear()
         
+        # 4. Reset map tools if currently active
         if hasattr(self, 'tool'):
             self.iface.mapCanvas().unsetMapTool(self.tool)
 
     # --- Data downloading ---
-    def run_download(self):
+    def run_download(self, typ_dat):
+        """
+        Triggered by menu/toolbar actions. Opens the filter dialog and 
+        hands off the parameters to the data loader.
+        """
+        # Open the specific filter dialog (Projects vs Sites)
+        dlg = AmcrFilterDialog(typ_dat)
+        result = dlg.exec()
         
-        dlg = AmcrFilterDialog()
+        # If user confirmed the dialog (OK button), gather filters and load data
-        result = dlg.exec_()
+        if result == QDialog.DialogCode.Accepted:
-        
-        if result == 1:
             filters = dlg.get_filters()
             bbox = dlg.get_bbox()
+            komponenty = dlg.get_komponenty()
             
+            # Access the map canvas and start the fetch/render process from amcr_tools
             canvas = self.iface.mapCanvas()
-            load_amcr_data(canvas, bbox, filters)
+            load_amcr_data(canvas, bbox, filters, typ_dat, komponenty)
-
-    # --- Info button toggle ---
-    # def run_tool(self):
-        
-    #     if self.action_tool.isChecked():
-    #         canvas = self.iface.mapCanvas()
-            
-    #         if not hasattr(self, 'tool'):
-    #             self.tool = AmcrIdentifyTool(canvas)
-    #             self.tool.deactivated.connect(lambda: self.action_tool.setChecked(False))
-            
-    #         canvas.setMapTool(self.tool)
-    #         self.iface.messageBar().pushMessage("AMČR", "Info nástroj aktivní.", level=0)
-            
-    #     else:
-    #         if self.iface.mapCanvas().mapTool() == getattr(self, 'tool', None):
-    #             self.iface.mapCanvas().unsetMapTool(self.tool)

amcr_viewer/codelists/heslar.csv

@@ -13614,3 +13614,34 @@ Zvotoky;Zvotoky;katastr
 Žumberk u Nových Hradů;Žumberk u Nových Hradů;katastr
 Županovice;Županovice;katastr
 Županovice u Dešné;Županovice u Dešné;katastr
+odchylka jednotky metrů;HES-000861;pian_presnost
+odchylka desítky metrů;HES-000862;pian_presnost
+odchylka stovky metrů;HES-000863;pian_presnost
+poloha podle katastru;HES-000864;pian_presnost
+nemovitá památka;HES-001122;typ_lokality
+polygon průzkumu;HES-001123;typ_lokality
+krajina;HES-001124;typ_lokality
+polygon leteckého průzkumu;HES-000111;druh_lokality
+osídlený skalní prostor;HES-000112;druh_lokality
+krajina;HES-000117;druh_lokality
+pomník/památník;HES-000128;druh_lokality
+muzeum/skanzen;HES-000129;druh_lokality
+pozůstatek mohylníku;HES-001430;druh_lokality
+pozůstatek ohrazení;HES-001431;druh_lokality
+pozůstatek represe;HES-001432;druh_lokality
+pozůstatek kultu;HES-001433;druh_lokality
+pozůstatek sídla elity;HES-001434;druh_lokality
+pozůstatek sídliště;HES-001435;druh_lokality
+pozůstatek těžby;HES-001436;druh_lokality
+pozůstatek vojenství;HES-001437;druh_lokality
+pozůstatek výroby;HES-001438;druh_lokality
+pozůstatek komunikace;HES-001429;druh_lokality
+jisté (> 95 %);HES-001449;jistota
+nejisté (50–95 %);HES-001450;jistota
+domnělé (5–50 %);HES-001451;jistota
+pseudolokalita (< 5 %);HES-001452;jistota
+zaniklá lokalita;HES-001453;lokalita_zachovalost
+lokalita pod zástavbou;HES-001454;lokalita_zachovalost
+nadzemní relikty;HES-001455;lokalita_zachovalost
+ruina;HES-001456;lokalita_zachovalost
+historická budova/komplex;HES-001457;lokalita_zachovalost

amcr_viewer/metadata.txt

@@ -1,16 +1,18 @@
 # This file contains metadata for your plugin.
 
-# This file should be included when you package your plugin.# Mandatory items:
+# This file should be included when you package your plugin.
+# Mandatory items:
 
 [general]
 name=AMČR Viewer
-qgisMinimumVersion=3.4
+qgisMinimumVersion=3.4.0
+qgisMaximumVersion=4.99.0
 description=Viewing and downloading the AMČR data.
-version=1.0.2
+version=1.3.2
 author=David Spáčil
 email=spacil@arub.cz
 
-about=This plugin is intended for downloading the data (Fieldwork events data only, at the time) from the Digiarchive of the Archaeological Map of the Czech Republic (AMCR). As of now, only publicly accessible data can be downloaded.
+about=This plugin is intended for downloading the data (Fieldwork events, Sites and their Components) from the Digiarchive of the Archaeological Map of the Czech Republic (https://digiarchiv.aiscr.cz/). As of now, only publicly accessible data can be downloaded.
 
 tracker=https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer/issues
 repository=https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer
@@ -25,7 +27,7 @@ hasProcessingProvider=no
 # Tags are comma separated with spaces allowed
 tags=python,AMCR,AIS CR,archaeology,PIAN,AMČR
 
-homepage=https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer
+homepage=https://amcr-help.aiscr.cz/digiarchiv/qgis-viewer.html
 category=Vector
 icon=download.png
 # experimental flag

amcr_viewer/resources.py

@@ -6,7 +6,7 @@
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt5 import QtCore
+from qgis.PyQt import QtCore
 
 qt_resource_data = b"\
 \x00\x00\x04\x0a\

src/icon.svg

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499998 6.35"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   sodipodi:docname="icon.svg"
+   inkscape:version="1.4.3 (0d15f75, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="22.627417"
+     inkscape:cx="6.8059028"
+     inkscape:cy="14.606174"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" /><defs
+     id="defs1"><clipPath
+       id="clip-0"><path
+         clip-rule="nonzero"
+         d="M 56 202 L 64 202 L 64 212.582031 L 56 212.582031 Z M 56 202 "
+         id="path1" /></clipPath><clipPath
+       id="clip-1"><path
+         clip-rule="nonzero"
+         d="M 111 202 L 120 202 L 120 212.582031 L 111 212.582031 Z M 111 202 "
+         id="path2" /></clipPath><clipPath
+       id="clip-2"><path
+         clip-rule="nonzero"
+         d="M 183 202 L 191 202 L 191 212.582031 L 183 212.582031 Z M 183 202 "
+         id="path3" /></clipPath><clipPath
+       id="clip-3"><path
+         clip-rule="nonzero"
+         d="M 220 202 L 227.445312 202 L 227.445312 212.582031 L 220 212.582031 Z M 220 202 "
+         id="path4" /></clipPath></defs><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"><path
+       id="path39"
+       style="display:inline"
+       d="M 81.817206 0.011405799 C 62.571113 1.6910933 45.354524 13.210298 36.479524 30.538423 C 32.381867 38.534516 30.312854 47.189295 30.312854 56.243982 C 30.312854 69.122889 34.534136 81.246352 42.526324 91.312758 L 43.405375 92.378274 C 46.932719 96.698587 50.2156 100.55118 53.367944 104.05899 C 53.414814 104.10979 53.454254 104.16803 53.501133 104.21881 L 66.540378 73.385461 C 62.46616 68.596398 60.240518 62.587732 60.240518 56.243982 C 60.240518 52.493982 61.017351 48.846969 62.544695 45.429001 C 66.806414 35.882126 76.317127 29.725967 86.758533 29.725967 C 89.688221 29.725967 92.538869 30.194768 95.269338 31.124456 L 99.957606 21.201844 L 84.214615 14.209399 L 81.817206 0.011405799 z M 90.381286 0.35769831 L 92.152705 10.813068 L 110.39966 18.924304 L 103.31398 34.107899 C 107.88529 36.880579 111.46702 40.963271 113.6628 45.722017 C 116.28908 45.714971 119.29963 45.708698 122.71968 45.708698 C 133.11322 45.708698 139.70768 45.745211 143.25749 45.81525 C 143.26209 45.815341 143.27953 45.815159 143.28413 45.81525 L 144.8824 45.349087 C 144.8707 45.298307 144.85424 45.240042 144.84244 45.18926 C 139.4715 19.302542 117.04145 0.71707431 90.381286 0.35769831 z M 70.962267 79.791873 L 57.590049 110.8916 C 62.425987 115.99706 66.178471 119.43931 69.510502 122.50572 C 75.319096 127.84947 80.037477 132.17422 86.771852 142.01797 C 92.93488 133.01459 97.405493 128.62293 102.56812 123.85094 C 91.347418 109.36236 78.096901 91.972441 77.661695 90.939828 C 76.892417 89.114561 76.908479 86.67687 77.701652 84.946304 C 77.897699 84.518565 78.148245 84.087284 78.434194 83.681004 C 75.760133 82.798967 73.242325 81.491624 70.962267 79.791873 z "
+       transform="matrix(0.0387992,0,0,0.0387992,-0.55393024,0.41865333)" /><path
+       id="rect30"
+       style="display:none;opacity:1;fill:#00b200;stroke:#ffffff;stroke-width:0.615;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke fill markers"
+       d="m 3.3486328,2.4970052 v 1.335319 H 2.7424683 L 4.2085286,5.738151 5.674589,3.8323242 H 5.0684245 v -1.335319 z" /><rect
+       style="opacity:1;fill:#247e4b;fill-opacity:1;stroke:none;stroke-width:0.414999;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke fill markers"
+       id="rect31"
+       width="1.672105"
+       height="1.2511554"
+       x="-4.501821"
+       y="0.84189904" /><text
+       xml:space="preserve"
+       style="font-size:0.705556px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';text-align:start;writing-mode:lr-tb;direction:ltr;text-anchor:start;opacity:1;fill:#247e4b;fill-opacity:1;stroke:none;stroke-width:0.414999;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke fill markers"
+       x="-2.6080971"
+       y="1.7071842"
+       id="text31"><tspan
+         sodipodi:role="line"
+         id="tspan31"
+         style="font-size:0.705556px;stroke-width:0.415"
+         x="-1.8942729"
+         y="1.7071842">akce</tspan></text><rect
+       style="opacity:1;fill:#951e7a;fill-opacity:1;stroke:none;stroke-width:0.414999;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke fill markers"
+       id="rect32"
+       width="1.672105"
+       height="1.2511554"
+       x="-4.501821"
+       y="2.6939824" /><text
+       xml:space="preserve"
+       style="font-size:0.705556px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';text-align:start;writing-mode:lr-tb;direction:ltr;text-anchor:start;opacity:1;fill:#951e7a;fill-opacity:1;stroke:none;stroke-width:0.414999;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke fill markers"
+       x="-2.6360023"
+       y="3.5261946"
+       id="text32"><tspan
+         sodipodi:role="line"
+         id="tspan32"
+         style="font-size:0.705556px;fill:#951e7a;fill-opacity:1;stroke-width:0.415"
+         x="-2.6360023"
+         y="3.5261946">lokality</tspan></text><path
+       id="path32"
+       style="opacity:1;fill:#00b200;stroke-width:0.615;paint-order:stroke fill markers;stroke:none;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none"
+       d="M 3.3486328 2.4970052 L 3.3486328 3.8323242 L 2.7424683 3.8323242 L 4.2085286 5.738151 L 5.674589 3.8323242 L 5.0684245 3.8323242 L 5.0684245 2.4970052 L 3.3486328 2.4970052 z "
+       inkscape:export-filename="path32.png"
+       inkscape:export-xdpi="3000"
+       inkscape:export-ydpi="3000" /></g></svg>