Merge pull request #46 from ahuarte47/master_DefaultQueryRemoved

DefaultQuery was removed in GeoTools 22.0

Author: jdeolive

geoscript/layer/layer.py

@@ -11,7 +11,7 @@
 from geoscript.util.data import readFeatures
 from org.geoscript.util import CollectionDelegatingFeatureSource
 from org.geotools.data import FeatureSource, FeatureStore
-from org.geotools.data import DefaultQuery, Query, Transaction
+from org.geotools.data import Query, Transaction
 from org.geotools.factory import CommonFactoryFinder
 from org.geotools.util.factory import Hints
 from org.geotools.feature import FeatureCollection, FeatureCollections
@@ -126,7 +126,7 @@ def count(self, filter=None):
     """
 
     f = Filter(filter) if filter else Filter.PASS
-    count = self._source.getCount(DefaultQuery(self.name, f._filter))
+    count = self._source.getCount(Query(self.name, f._filter))
     if count == -1:
       count = 0
       # calculate manually 
@@ -154,7 +154,7 @@ def bounds(self, filter=None):
     """
 
     f = Filter(filter) if filter else Filter.PASS
-    q = DefaultQuery(self.name, f._filter)
+    q = Query(self.name, f._filter)
     e = self._source.getBounds(q)
 
     if not e:
@@ -262,7 +262,7 @@ def cursor(self, filter=None, sort=None, hints=None):
     """
 
     f = Filter(filter) if filter else Filter.PASS
-    q = DefaultQuery(self.name, f._filter)
+    q = Query(self.name, f._filter)
     if sort:
       sort = sort if isinstance(sort, list) else [sort]
       sortBy = [] 
@@ -433,7 +433,7 @@ def reproject(self, prj, name=None, chunk=1000):
     rlayer = self.workspace.create(schema=rschema)
 
     # create a query specifying that feautres should be reprojected
-    q = DefaultQuery(self.name, Filter.PASS._filter)
+    q = Query(self.name, Filter.PASS._filter)
     if self.proj:
       q.coordinateSystem = self.proj._crs
     q.coordinateSystemReproject = prj._crs 
@@ -482,7 +482,7 @@ def filter(self, fil, name=None):
     # create the filtered layer
     flayer = self.workspace.create(schema=fschema)
 
-    q = DefaultQuery(self.name, f._filter)
+    q = Query(self.name, f._filter)
 
     # loop through features and add to new filtered layer
     fit = self._source.getFeatures(q).features()

geoscript/layer/stats.py

@@ -1,5 +1,5 @@
 from geoscript.filter import Filter
-from org.geotools.data import DefaultQuery, Query
+from org.geotools.data import Query
 
 class Stats(object):
 
@@ -52,7 +52,7 @@ def extrema(self, field, low=None, high=None, filter=None):
     # concatenate with one passed in
     fil += self._filter(filter)
 
-    q = DefaultQuery(self.layer.name)
+    q = Query(self.layer.name)
     q.setFilter(fil._filter)
 
     min, max = None, None