Added BIM/IFC download format for product Territorial topographic ref…

…erential

 Fixed photolib access and download product by municipality when geoencoder service is down

metadata.txt

@@ -28,8 +28,12 @@ [email protected]
 
 qgisMinimumVersion=2.99
 qgisMaximumVersion=3.99
-version=1.1.18
-changelog=v1.1.18 (2024-04-19)
+version=1.1.19
+changelog=v1.1.19 (2024-05-06)
+	- Added gkg3d download format for product Territorial topographic referential
+	- Fixed problem downloading product from overlaped polygons
+
+	v1.1.18 (2024-04-19)
 	- Added BIM/IFC download format for product Territorial topographic referential
 	- Fixed photolib access and download product by municipality when geoencoder service is down
 

openicgc.py

@@ -294,9 +294,10 @@ class OpenICGC(PluginBase):
         "divisions-administratives": "Administrative divisions",
         "topografia-territorial-gpkg": "Territorial topographic referential",
         "topografia-territorial-dgn": "Territorial topographic referential",
+        "topografia-territorial-dwg": "Territorial topographic referential",
         "topografia-territorial-bim-ifc": "Territorial topographic referential",
+        "topografia-territorial-3d-gpkg": "Territorial topographic referential",
         "topografia-territorial-3d-dgn": "Territorial topographic referential",
-        "topografia-territorial-dwg": "Territorial topographic referential",
         "topografia-territorial-3d-dwg": "Territorial topographic referential",
         "topografia-territorial-volum-dwg": "Territorial topographic referential",
         "cobertes-sol-raster": "Land cover map",
@@ -442,9 +443,10 @@ def __init__(self, iface, debug_mode=False):
             "divisions-administratives": self.tr("Administrative divisions"),
             "topografia-territorial-gpkg": self.tr("Territorial topographic referential"),
             "topografia-territorial-dgn": self.tr("Territorial topographic referential"),
+            "topografia-territorial-dwg": self.tr("Territorial topographic referential"),
             "topografia-territorial-bim-ifc": self.tr("Territorial topographic referential BIM"),
+            "topografia-territorial-3d-gpkg": self.tr("Territorial topographic referential 3D"),
             "topografia-territorial-3d-dgn": self.tr("Territorial topographic referential 3D"),
-            "topografia-territorial-dwg": self.tr("Territorial topographic referential"),
             "topografia-territorial-3d-dwg": self.tr("Territorial topographic referential 3D"),
             "topografia-territorial-volum-dwg": self.tr("Territorial topographic referential volume"),
             "cobertes-sol-raster": self.tr("Land cover map"),
@@ -1619,6 +1621,7 @@ def download_get_geometry(self, geo, download_epsg, min_side, max_download_area,
             if layer and type(layer) == QgsVectorLayer:
                 # Prepare transformation polygon coordinates to project EPSG
                 epsg = self.layers.get_epsg(layer)
+                epsg = int(epsg) if epsg else None
                 self.log.debug("Selected polygons layer %s (EPSG %s)", layer.name(), epsg)
                 # Add only selected polygons
                 polygons_list = []
@@ -1713,7 +1716,9 @@ def download_get_geometry(self, geo, download_epsg, min_side, max_download_area,
             geo_limits, geo_limits_epsg = self.cat_limits_dict[limits]
             # With selfintersection multipolygon intersects fails, we can fix it using boundingbox
             if not geo.isGeosValid():
-                geo = geo.boundingBox()
+                geo = geo.makeValid()
+                if not geo.isGeosValid():
+                    geo = geo.boundingBox()
         elif self.download_type in ["dt_municipalities", "dt_counties", "dt_sheet"]:
             limits = "cat_limits"
             geo_limits, geo_limits_epsg = self.cat_limits_dict[limits]

resources3/fme.py

@@ -98,6 +98,7 @@
     ("topografia-territorial-gpkg", "Referencial topogràfic territorial GeoPackage", 50, 100000000, None, None, None, None, ["", "pol", "mu"], "topografia-territorial.gpkg", "5k_limits", "%s/fmedatastreaming/topografia-territorial/ICGC_topografia-territorial_gpkg_clip.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&Codi=%s", None),
     ("topografia-territorial-dgn", "Referencial topogràfic territorial DGN", 50, 25000000, None, None, None, None, ["", "pol", "mu"], "topografia-territorial.dgn", "5k_limits", "%s/fmedatastreaming/topografia-territorial/ICGC_topografia-territorial_clip_to_CAD.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&format_cad=DGN&file_name=tt&Codi=%s", None),
     ("topografia-territorial-dwg", "Referencial topogràfic territorial DWG", 50, 25000000, None, None, None, None, ["", "pol", "mu"], "topografia-territorial.dwg", "5k_limits", "%s/fmedatastreaming/topografia-territorial/ICGC_topografia-territorial_clip_to_CAD.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&format_cad=DWG&file_name=tt&Codi=%s", None),
+    ("topografia-territorial-3d-gpkg", "Referencial topogràfic territorial 3D GeoPackage", 50, 100000000, None, None, None, None, ["", "pol", "mu"], "topografia-territorial-3d.gpkg", "5k_limits", "%s/fmedatastreaming/topografia-territorial/ICGC_topografia-territorial_gpkg_clip.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&geopackage_out=tt3&dimensio=3d&Codi=%s", None),
     ("topografia-territorial-3d-dgn", "Referencial topogràfic territorial 3D DGN", 50, 25000000, None, None, None, None, ["", "pol", "mu"], "topografia-territorial-3d.dgn", "5k_limits", "%s/fmedatastreaming/topografia-territorial/ICGC_topografia-territorial_clip_to_CAD3D.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&format_cad=DGN&file_name=tt3&Codi=%s", None),
     ("topografia-territorial-3d-dwg", "Referencial topogràfic territorial 3D DWG", 50, 25000000, None, None, None, None, ["", "pol", "mu"], "topografia-territorial-3d.dwg", "5k_limits", "%s/fmedatastreaming/topografia-territorial/ICGC_topografia-territorial_clip_to_CAD3D.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&format_cad=DWG&file_name=tt3d&Codi=%s", None),
     ("topografia-territorial-volum-dwg", "Referencial topogràfic territorial Volum DWG", 50, 12500000, None, None, None, None, ["", "pol", "mu"], "topografia-territorial-volum.dwg", "5k_limits", "%s/fmedatastreaming/topografia-territorial/ICGC_topografia-territorial_clip_to_CAD3D.fmw?xMin=%s&yMin=%s&xMax=%s&yMax=%s&poligon=%s&format_cad=DWG&gen_volum=si&file_name=ttvolum&Codi=%s", None),