bump version to 3.2.0

Author: SimonSAMPERE

isogeo.py

@@ -335,18 +335,6 @@ def onClosePlugin(self):
         qsettings.setValue(
             "isogeo/settings/portal_base_url", self.form_mng.input_portal_url.text()
         )
-        # save prefered PostGIS database connections
-        qsettings.setValue(
-            "isogeo/settings/pref_pgdb_conn",
-            self.form_mng.results_mng.db_mng.li_pref_pgdb_conn,
-        )
-        # save invalid PostGIS database connections
-        logger.debug("*=====* {}".format(self.form_mng.results_mng.db_mng.li_invalid_pgdb_conn))
-        qsettings.setValue(
-            "isogeo/settings/invalid_pgdb_conn",
-            self.form_mng.results_mng.db_mng.li_invalid_pgdb_conn,
-        )
-        logger.debug("*=====* {}".format(qsettings.value("isogeo/settings/invalid_pgdb_conn")))
         # save cache
         self.form_mng.results_mng.cache_mng.dumper()
         # disconnects
@@ -367,7 +355,7 @@ def unload(self):
             self.iface.removePluginWebMenu(self.tr("&Isogeo"), action)
             try:
                 self.iface.mainWindow().statusBar().removeWidget(self.bar)
-            except:
+            except Exception:
                 pass
             self.iface.removeToolBarIcon(action)
         # remove the toolbar

metadata.txt

@@ -11,7 +11,7 @@ name=Isogeo
 qgisMinimumVersion=3.4
 qgisMaximumVersion=3.99
 description=Isogeo search engine within QGIS
-version=3.1.1
+version=3.2.0
 author=Isogeo
 email=projects+qgis@isogeo.com
 
@@ -24,7 +24,7 @@ repository=https://github.com/isogeo/isogeo-plugin-qgis
 # Recommended items:
 
 # Uncomment the following line and add your changelog:
-changelog=- <strong>3.1.1:</strong> see the <a href="https://github.com/isogeo/isogeo-plugin-qgis/releases/tag/3.1.1">dedicated GitHub release</a><br>- <strong>3.1.0:</strong> see the <a href="https://github.com/isogeo/isogeo-plugin-qgis/releases/tag/3.1.0">dedicated GitHub release</a><br>- <strong>3.0.2:</strong> better SSL errors handling<br>- <strong>3.0.1:</strong> better authentication management<br>- <strong>3.0.0:</strong> first stable version compatible with QGIS 3
+changelog=- <strong>3.2.0:</strong> see the <a href="https://github.com/isogeo/isogeo-plugin-qgis/releases/tag/3.2.0">dedicated GitHub release</a><br>- <strong>3.1.1:</strong> see the <a href="https://github.com/isogeo/isogeo-plugin-qgis/releases/tag/3.1.1">dedicated GitHub release</a><br>- <strong>3.1.0:</strong> see the <a href="https://github.com/isogeo/isogeo-plugin-qgis/releases/tag/3.1.0">dedicated GitHub release</a><br>- <strong>3.0.2:</strong> better SSL errors handling<br>- <strong>3.0.1:</strong> better authentication management<br>
 
 # Tags are comma separated with spaces allowed
 tags=REST API,catalog,search,explore,webservices,metadata,open data,INSPIRE

modules/layer/add_layer.py

@@ -24,7 +24,6 @@
 from ..tools import IsogeoPlgTools
 from .metadata_sync import MetadataSynchronizer
 from ..layer.geo_service import GeoServiceManager
-from ..layer.database import DataBaseManager
 
 # ############################################################################
 # ########## Globals ###############

modules/layer/database.py

@@ -6,17 +6,14 @@
 from configparser import ConfigParser
 from pathlib import Path
 from os import environ
-from functools import partial
 
 # PyQT
 from qgis.PyQt.QtCore import QSettings, Qt
 from qgis.PyQt.QtGui import QIcon, QCursor
 from qgis.PyQt.QtWidgets import (
-    QTableWidgetItem,
     QComboBox,
     QLabel,
     QAbstractButton,
-    QDialogButtonBox,
 )
 
 # PyQGIS

modules/layer/geo_service.py

@@ -329,15 +329,21 @@ def check_ogc_service(
             service_dict["reachable"] = 0
             service_dict["error"] = error_msg
         except requests.exceptions.SSLError as e:
-            logger.warning("SSL Error raised trying to connect to {} service {}: {}".format(
-                service_type, url, e
-            ))
+            logger.warning(
+                "SSL Error raised trying to connect to {} service {}: {}".format(
+                    service_type, url, e
+                )
+            )
             try:
                 auth = Authentication(verify=False)
                 service = service_connector(url=url, version=service_version, auth=auth)
                 service_dict["reachable"] = 1
             except Exception as e:
-                logger.warning("Error raised trying to use owslib Authentication module : {}".format(e))
+                logger.warning(
+                    "Error raised trying to use owslib Authentication module : {}".format(
+                        e
+                    )
+                )
                 try:
                     service_dict = self.parse_ogc_xml(service_type, service_dict)
                     return 1, service_dict
@@ -423,7 +429,6 @@ def build_wfs_url(self, api_layer: dict, srv_details: dict):
             )
         else:
             wfs_dict = wfs_cached_dict[srv_details.get("path")]
-        logger.debug("*=====* {}".format(wfs_dict))
         # local variables
         wfs_url_getcap = wfs_dict.get("getCap_url")
         wfs_url_base = wfs_dict.get("base_url")
@@ -467,21 +472,36 @@ def build_wfs_url(self, api_layer: dict, srv_details: dict):
             return 0, error_msg
 
         # check if GetFeature and DescribeFeatureType operation are available
-        if not hasattr(wfs, "getfeature") and not wfs_dict.get("GetFeature_isAvailable"):
+        if not hasattr(wfs, "getfeature") and not wfs_dict.get(
+            "GetFeature_isAvailable"
+        ):
             return 0, "GetFeature operation not available in: {}".format(wfs_url_getcap)
         else:
             logger.info("GetFeature available")
             pass
 
         # SRS definition
         if wfs_dict.get("manual"):
-            featureType_elem = [elem for elem in wfs.iter() if "FeatureType" in elem.tag and any(layer_typename in subelem.text for subelem in elem)]
+            featureType_elem = [
+                elem
+                for elem in wfs.iter()
+                if "FeatureType" in elem.tag
+                and any(layer_typename in subelem.text for subelem in elem)
+            ]
             if len(featureType_elem):
                 featureType = featureType_elem[0]
-                srs_text = [subelem.text for subelem in featureType if "DefaultSRS" in subelem.tag][0]
+                srs_text = [
+                    subelem.text
+                    for subelem in featureType
+                    if "DefaultSRS" in subelem.tag
+                ][0]
                 srs = "EPSG:" + srs_text.split("EPSG:")[-1]
             else:
-                logger.warning("Unable to retrieve appropriate SRS for {} layer.".format(layer_typename))
+                logger.warning(
+                    "Unable to retrieve appropriate SRS for {} layer.".format(
+                        layer_typename
+                    )
+                )
                 srs = ""
         else:
             available_crs_options = [
@@ -546,8 +566,16 @@ def build_wms_url(self, api_layer: dict, srv_details: dict):
             )
             return 0, error_msg
         elif wms_dict.get("manual"):
-            wms_lyr = [elem for elem in wms.iter() if elem.tag.endswith("Layer") and any(subelem.text == api_layer_id for subelem in elem if "Name" in subelem.tag)][0]
-            logger.debug("*=====* {}".format(wms_lyr))
+            wms_lyr = [
+                elem
+                for elem in wms.iter()
+                if elem.tag.endswith("Layer")
+                and any(
+                    subelem.text == api_layer_id
+                    for subelem in elem
+                    if "Name" in subelem.tag
+                )
+            ][0]
         else:
             wms_lyr = wms[api_layer_id]
 
@@ -597,14 +625,17 @@ def build_wms_url(self, api_layer: dict, srv_details: dict):
             srs = self.choose_appropriate_srs(crs_options=[])
         else:
             srs = self.choose_appropriate_srs(crs_options=wms_lyr.crsOptions)
-        logger.debug("*=====* {}".format(srs))
 
         # BBOX parameter
-        if hasattr(wms_lyr, "boundingBoxWGS84") and any(txt in srs for txt in ["WGS84", "4326"]):
+        if hasattr(wms_lyr, "boundingBoxWGS84") and any(
+            txt in srs for txt in ["WGS84", "4326"]
+        ):
             li_coords = [str(coord) for coord in wms_lyr.boundingBoxWGS84]
             bbox = ",".join(li_coords)
             logger.info("Let's use WGS84 bbox : {}".format(bbox))
-        elif hasattr(wms_lyr, "boundingBox") and any(srs in str(elem) for elem in wms_lyr.boundingBox):
+        elif hasattr(wms_lyr, "boundingBox") and any(
+            srs in str(elem) for elem in wms_lyr.boundingBox
+        ):
             li_coords = [
                 str(coord)
                 for coord in wms_lyr.boundingBox
@@ -631,7 +662,9 @@ def build_wms_url(self, api_layer: dict, srv_details: dict):
                 "BBOX": bbox,
             }
 
-            if "&" in wms_url_base:  # for case when there is already params into base url
+            if (
+                "&" in wms_url_base
+            ):  # for case when there is already params into base url
                 wms_url_params["url"] = "{}?{}".format(
                     wms_url_base.split("?")[0], quote(wms_url_base.split("?")[1])
                 )

modules/metadata_display.py

@@ -3,7 +3,6 @@
 
 # Standard library
 import logging
-import processing
 from datetime import datetime
 
 # PyQGIS
@@ -12,7 +11,6 @@
     QgsMessageLog,
     QgsVectorLayer,
     QgsPointXY,
-    QgsRectangle,
     QgsFeature,
     QgsGeometry,
     QgsRasterLayer,