Dev adding feat to acquisition

CHANGELOG.md

@@ -27,6 +27,7 @@ Melhorias:
 - A ferramenta de verificação de erros de relacionamentos espaciais agora permite regras com de9im e relacionamentos espaciais simultaneamente;
 - Adicionada a opção de desligar todas as imagens ativas na ferramenta de seleção de raster;
 - Adicionado o id da geometria na flag do identificar geometrias inválidas;
+- O menu de aquisição agora permite reclassificação de polígono para ponto (particularmente útil quando se está corrigindo flags de áreas sem centroide na construção de polígonos utilizando linha e centroide);
 
 
 Correção de bug:

DsgTools/Modules/acquisitionMenu/controllers/acquisitionMenuCtrl.py

@@ -2,6 +2,7 @@
 from PyQt5 import QtCore, uic, QtWidgets, QtGui
 from DsgTools.Modules.qgis.controllers.qgisCtrl import QgisCtrl
 import json
+from qgis.core import QgsWkbTypes
 
 
 class AcquisitionMenuCtrl:
@@ -169,7 +170,7 @@ def openReclassifyDialog(self, buttonConfig, callback):
         if len(layers) > 1:
             raise Exception("Há camadas repetidas!")
         layer = layers[0]
-        layerName = layer.dataProvider().uri().table()
+        layerName = layer.dataProvider().uri().table() if layer.providerType() == "postgres" else layer.name()
         layersToReclassification = self.getLayersForReclassification(
             layerName, layer.geometryType()
         )
@@ -205,10 +206,15 @@ def reclassify(self, buttonConfig, reclassifyData):
 
     def getLayersForReclassification(self, layerName, geometryType):
         layers = self.qgis.getLoadedVectorLayers()
+        geometryFilterDict = {
+            QgsWkbTypes.PointGeometry: (QgsWkbTypes.PointGeometry),
+            QgsWkbTypes.LineGeometry: (QgsWkbTypes.LineGeometry),
+            QgsWkbTypes.PolygonGeometry: (QgsWkbTypes.PointGeometry, QgsWkbTypes.PolygonGeometry)
+        }
         return [
             l
             for l in layers
-            if l.geometryType() == geometryType and l.selectedFeatureCount() > 0
+            if l.selectedFeatureCount() > 0 and l.geometryType() in geometryFilterDict[l.geometryType()]
         ]
 
     def activeMenuButton(self, buttonConfig):

DsgTools/Modules/qgis/controllers/qgisCtrl.py

@@ -21,6 +21,10 @@ def getLoadedVectorLayerNames(self):
                 layerName = (
                     l.dataProvider().uri().uri().split("|")[-1].split("=")[-1][1:-1]
                 )
+                if layerName == '':
+                    layerName = l.name()
+            else:
+                layerName = l.name()
             if not layerName:
                 continue
             layerNames.append(layerName)
@@ -38,6 +42,10 @@ def getVectorLayerNames(self, layers):
                 layerName = (
                     l.dataProvider().uri().uri().split("|")[-1].split("=")[-1][1:-1]
                 )
+                if layerName == '':
+                    layerName = l.name()
+            else:
+                layerName = l.name()
             if not layerName:
                 continue
             layerNames.append(layerName)
@@ -62,6 +70,10 @@ def getVectorLayersByName(self, name):
                 layerName = (
                     l.dataProvider().uri().uri().split("|")[-1].split("=")[-1][1:-1]
                 )
+                if layerName == '':
+                    layerName = l.name()
+            else:
+                layerName = l.name()
             if not layerName or layerName != name:
                 continue
             layers.append(l)
@@ -210,7 +222,11 @@ def cutAndPasteSelectedFeatures(self, layer, destinatonLayer, attributes):
         for feature in features:
             newFeat = core.QgsFeature()
             newFeat.setFields(destinatonLayer.fields())
-            newFeat.setGeometry(feature.geometry())
+            newGeom = feature.geometry().pointOnSurface() \
+                if destinatonLayer.geometryType() == core.QgsWkbTypes.PointGeometry \
+                    and layer.geometryType() == core.QgsWkbTypes.PolygonGeometry \
+                else feature.geometry()
+            newFeat.setGeometry(newGeom)
             self.attributeFeature(newFeat, destinatonLayer, attributes)
             newFeatures.append(newFeat)
         layer.deleteSelectedFeatures()