v1.2.8

wojtek19022 · web-flow · commit 3f943b315803 · 2025-04-17T11:59:02.000+02:00
diff --git a/img/es_logo.svg b/img/es_logo.svg
diff --git a/metadata.txt b/metadata.txt
@@ -7,7 +7,7 @@ name=Pobieracz danych GUGiK
 qgisMinimumVersion=3.22
 description=Pozwala na pobranie danych z zasobów GUGiK z interfejsu QGIS. EN: Allows user to download spatial data of Poland based on GUGiK's services.(Poland only)
 
-version=1.2.6
+version=1.2.8
 
 author=EnviroSolutions Sp. z o.o.
 email=office@envirosolutions.pl
@@ -55,8 +55,12 @@ repository=https://github.com/envirosolutionspl/pobieracz_danych_gugik
 hasProcessingProvider=no
 # Uncomment the following line and add your changelog:
 changelog=
-  Wersja 1.2.6
-  * Modyfikacja powiadomień użytkownika dla dużych zapytań
+  Wersja 1.2.8
+  * Aktualizacja stopki wtyczki
+#  Wersja 1.2.7
+#  * Naprawa błędu pobierania danych
+#  Wersja 1.2.6
+#  * Modyfikacja powiadomień użytkownika dla dużych zapytań
 #  Wersja 1.2.5
 #  * Modyfikacja QGIS-feed
 #  * Zmiana minimalnej wersji QGIS na 3.22
diff --git a/pobieracz_danych_gugik.py b/pobieracz_danych_gugik.py
@@ -33,7 +33,7 @@
     mozaika_api, wizualizacja_karto_api, kartoteki_osnow_api, zdjecia_lotnicze_api, egib_api, mesh3d_api
 
 """Wersja wtyczki"""
-plugin_version = '1.2.6'
+plugin_version = '1.2.8'
 plugin_name = 'Pobieracz Danych GUGiK'
 
 
@@ -743,8 +743,8 @@ def las_fromLayer_btn_clicked(self):
             self.dockwidget.las_fromLayer_btn.setEnabled(False)
             for point in points:
                 sub_list = las_api.getLasListbyPoint1992(point, self.dockwidget.las_evrf2007_rdbtn.isChecked())
-                if not sub_list:
-                    continue
+                if sub_list:
+                    las_list.extend(sub_list)
                 las_list.extend(sub_list)
             self.filterLasListAndRunTask(las_list)
         else:
@@ -833,8 +833,14 @@ def filterLasList(self, lasList):
             if self.dockwidget.las_mhTo_lineEdit.text():
                 lasList = [las for las in lasList if
                            str(las.get('bladSredniWysokosci')) <= str(self.dockwidget.las_mhTo_lineEdit.text())]
+
+        # ograniczenie tylko do najnowszego
+        if self.dockwidget.laz_newest_chkbx.isChecked():
+            lasList = utils.onlyNewest(lasList)
+
         return lasList
 
+
     def downloadLaFile(self, las, folder):
         """Pobiera plik LAS"""
         QgsMessageLog.logMessage('start ' + las.url)
diff --git a/pobieracz_danych_gugik_base.ui b/pobieracz_danych_gugik_base.ui
diff --git a/tasks/downloadAerotriangulacjaTask.py b/tasks/downloadAerotriangulacjaTask.py
@@ -52,7 +52,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadArchiwalnyBdotTask.py b/tasks/downloadArchiwalnyBdotTask.py
@@ -31,7 +31,7 @@ def finished(self, result):
             msgbox = QMessageBox(QMessageBox.Information, "Komunikat", "Nie znaleniono danych spełniających kryteria")
             msgbox.exec_()
 
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 "Sukces", 
diff --git a/tasks/downloadBdooTask.py b/tasks/downloadBdooTask.py
@@ -40,7 +40,7 @@ def run(self):
 
     def finished(self, result):
         
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadBdotTask.py b/tasks/downloadBdotTask.py
@@ -42,7 +42,7 @@ def run(self):
 
     def finished(self, result):
         
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadEgibExcelTask.py b/tasks/downloadEgibExcelTask.py
@@ -54,7 +54,8 @@ def run(self):
         return True
 
     def finished(self, result):
-        if result and not self.exception:
+        
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadKartotekiOsnowTask.py b/tasks/downloadKartotekiOsnowTask.py
@@ -51,7 +51,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadLasTask.py b/tasks/downloadLasTask.py
@@ -54,7 +54,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadMesh3dTask.py b/tasks/downloadMesh3dTask.py
@@ -26,7 +26,7 @@ def run(self):
         return True
 
     def finished(self, result):
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadModel3dTask.py b/tasks/downloadModel3dTask.py
@@ -49,7 +49,7 @@ def run(self):
         return any(results)
 
     def finished(self, result):
-        if result and not self.exception:
+        if result and self.exception:
             msgbox = QMessageBox(
                 QMessageBox.Information,
                 'Komunikat',
diff --git a/tasks/downloadMozaikaTask.py b/tasks/downloadMozaikaTask.py
@@ -51,7 +51,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadNmptTask.py b/tasks/downloadNmptTask.py
@@ -56,7 +56,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadNmtTask.py b/tasks/downloadNmtTask.py
@@ -53,7 +53,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadOpracowaniaTyflologiczneTask.py b/tasks/downloadOpracowaniaTyflologiczneTask.py
@@ -23,7 +23,7 @@ def run(self):
 
     def finished(self, result):
 
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage("Sukces", "Udało się! Dane opracowania tyflologicznego zostały pobrane.",
                                                 level=Qgis.Success, duration=0)
diff --git a/tasks/downloadOrtoFotoTask.py b/tasks/downloadOrtoFotoTask.py
@@ -53,7 +53,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadOsnowaTask.py b/tasks/downloadOsnowaTask.py
@@ -29,13 +29,13 @@ def run(self):
                     return False
                 QgsMessageLog.logMessage(f'pobieram {url}')
                 res, exp = service_api.retreiveFile(url=url, destFolder=self.folder, obj=self)
+                self.exception = exp
                 if not res:
-                    self.exception = exp
                     return False
         return True
 
     def finished(self, result):
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadPrgTask.py b/tasks/downloadPrgTask.py
@@ -23,7 +23,7 @@ def run(self):
         return not self.isCanceled()
 
     def finished(self, result):
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage("Sukces", "Udało się! Dane PRG zostały pobrane.",
                                                 level=Qgis.Success, duration=0)
diff --git a/tasks/downloadPrngTask.py b/tasks/downloadPrngTask.py
@@ -27,7 +27,7 @@ def run(self):
         return not self.isCanceled()
 
     def finished(self, result):
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadReflectanceTask.py b/tasks/downloadReflectanceTask.py
@@ -51,7 +51,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadTrees3dTask.py b/tasks/downloadTrees3dTask.py
@@ -36,7 +36,7 @@ def run(self):
         return not self.isCanceled()
 
     def finished(self, result):
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage("Sukces",
                                                 "Udało się! Dane z modelami 3D drzew zostały pobrane.",
diff --git a/tasks/downloadWfsEgibTask.py b/tasks/downloadWfsEgibTask.py
@@ -58,8 +58,8 @@ def finished(self, result):
 
         """W ramach powiatu mogą wystąpić prawidłowe warswy oraz nieprawidłowe - ta informacja zostanie przedstawiona 
         użytkownikowi w osobnym okienku"""
-
-        if result and self.name_error == "brak" and not self.exception:
+        
+        if result and self.name_error == "brak" and self.exception is None:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage("Sukces", "Udało się! Dane EGiB dla powiatów zostały pobrane.",
                                                 level=Qgis.Success, duration=0)
diff --git a/tasks/downloadWfsTask.py b/tasks/downloadWfsTask.py
@@ -52,7 +52,7 @@ def finished(self, result):
         result is the return value from self.run.
         """
         
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
diff --git a/tasks/downloadWizKartoTask.py b/tasks/downloadWizKartoTask.py
@@ -50,7 +50,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 "Sukces", 
diff --git a/tasks/downloadZdjeciaLotniczeTask.py b/tasks/downloadZdjeciaLotniczeTask.py
@@ -53,7 +53,7 @@ def finished(self, result):
         to do GUI operations and raise Python exceptions here.
         result is the return value from self.run.
         """
-        if result and not self.exception:
+        if result and self.exception:
             QgsMessageLog.logMessage('sukces')
             self.iface.messageBar().pushMessage(
                 'Sukces',
