Skip to content

DefaultQuery was removed in GeoTools 22.0 #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdeolive merged 1 commit into from
Nov 20, 2019
Merged

DefaultQuery was removed in GeoTools 22.0 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions geoscript/layer/layer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 = []
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions geoscript/layer/stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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):

Expand Down Expand Up @@ -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
Expand Down