fix perceel

warrieka · Jul 17, 2023 · 50ec5f5 · 50ec5f5
1 parent 7a4b780
commit 50ec5f5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 31 deletions.
diff --git a/geopunt/perc.py b/geopunt/perc.py
@@ -4,7 +4,7 @@
 
 class perc(object):
    def __init__(self):
-      self._esriCapaServer= "https://geoservices.informatievlaanderen.be/ArcGIS/rest/services/adp/MapServer/0/query" 
+      #self._esriCapaServer= "https://geoservices.informatievlaanderen.be/ArcGIS/rest/services/adp/MapServer/0/query" 
       self._locUrl = "https://geo.api.vlaanderen.be/geolocation/v2/Location"
       self._sugUrl = "https://geo.api.vlaanderen.be/geolocation/v2/Suggestion"
 
@@ -20,20 +20,20 @@ def fetchSuggestion(self, q, c=5):
       suggestion =  getUrlData(geopuntUrl, params=data)
       return json.loads(suggestion)["SuggestionResult"]
 
-   def getPercGeom(self, capakey, srs=31370):
-      capaUrl = self._esriCapaServer
-      data = {"f": "geojson"}
-      data["where"] = str( "CAPAKEY LIKE '{}'".format( capakey ) )
-      data["outSR"] = srs
-      response = getUrlData(capaUrl, params=data)
-      return json.loads(response)
+   # def getPercGeom(self, capakey, srs=31370):
+   #    capaUrl = self._esriCapaServer
+   #    data = {"f": "geojson"}
+   #    data["where"] = str( "CAPAKEY LIKE '{}'".format( capakey ) )
+   #    data["outSR"] = srs
+   #    response = getUrlData(capaUrl, params=data)
+   #    return json.loads(response)
 
-   def getPercAtXY(self, x, y, srs=31370):
-      capaUrl = self._esriCapaServer
-      data = {"f": "geojson", "geometryType":"esriGeometryPoint"}
-      data["geometry"] = str(x) +","+ str(y)
-      data["inSR"] = srs
-      data["outSR"] = srs
-      response = getUrlData(capaUrl, params=data)
-      return json.loads(response)
+   # def getPercAtXY(self, x, y, srs=31370):
+   #    capaUrl = self._esriCapaServer
+   #    data = {"f": "geojson", "geometryType":"esriGeometryPoint"}
+   #    data["geometry"] = str(x) +","+ str(y)
+   #    data["inSR"] = srs
+   #    data["outSR"] = srs
+   #    response = getUrlData(capaUrl, params=data)
+   #    return json.loads(response)
 
diff --git a/geopunt4QgisParcel.py b/geopunt4QgisParcel.py
@@ -5,7 +5,7 @@
 from qgis.gui  import QgsMessageBar, QgsRubberBand
 from .ui_geopunt4QgisParcel import Ui_geopunt4QgisParcelDlg
 import os, json, webbrowser
-from .geopunt import capakey, perc
+from .geopunt import capakey
 from .tools.geometry import geometryHelper
 from .tools.parcel import parcelHelper
 
@@ -43,8 +43,7 @@ def _initGui(self):
         self.gh = geometryHelper(self.iface)
         self.ph = parcelHelper(self.iface)
         self.parcel = capakey()
-        self.perc = perc()
-
+
         #variables
         self.firstShow = True 
         self.municipalities = []
@@ -107,11 +106,7 @@ def saveParcel(self):
             return
 
         parcelInfo = self.parcel.getParcel( niscode, departmentcode, section, parcelNr, 31370, 'full') 
-        geojson = self.perc.getPercGeom( parcelInfo['capakey'] ) 
-        if len(geojson['features']) > 0: 
-            shape = geojson['features'][0]['geometry']
-        else: 
-            shape = json.loads( parcelInfo['geometry']['shape'])
+        shape = json.loads( parcelInfo['geometry']['shape'])
 
         pts = [n.asPolygon() for n in self.PolygonsFromJson( shape )]
         mPolygon = QgsGeometry.fromMultiPolygonXY( pts )  
@@ -272,12 +267,7 @@ def zoomTo(self):
             self.clearGraphics()
             self.gh.zoomtoRec( bbox[0], bbox[2], 31370 )
 
-            geojson = self.perc.getPercGeom( parcelInfo['capakey'] ) 
-            if len(geojson['features']) > 0: 
-                shape = geojson['features'][0]['geometry']
-            else: 
-                shape = json.loads( parcelInfo['geometry']['shape'])
-
+            shape = json.loads( parcelInfo['geometry']['shape'])
             for n in self.PolygonsFromJson( shape ):  
                 self.addGraphic(n)
             return

diff --git a/metadata.txt b/metadata.txt
@@ -21,7 +21,7 @@ about=NL: "Geopunt voor QGIS" is een plugin voor de QGIS open source desktop GIS
     - Search for Parcels 
     - Search for layers in the geopunt catalog
 
-version=2.3.0.4
+version=2.3.0.5
 author=Kay Warrie
 email=kaywarrie@gmail.com