Skip to content

Commit 58535bd

Browse files
jericksjericks
committed
Start working on 1.22.0 with GeoTools 30
1 parent a216a4e commit 58535bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+277
-279
lines changed

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<groupId>org.geoscript</groupId>
99
<artifactId>geoscript-groovy</artifactId>
1010
<packaging>jar</packaging>
11-
<version>1.21.0</version>
11+
<version>1.22.0-SNAPSHOT</version>
1212
<properties>
13-
<gt.version>29.2</gt.version>
13+
<gt.version>30.0</gt.version>
1414
<jts.version>1.19.0</jts.version>
15-
<groovy.version>4.0.13</groovy.version>
15+
<groovy.version>4.0.15</groovy.version>
1616
</properties>
1717
<dependencies>
1818
<dependency>

‎src/main/groovy/geoscript/GeoScript.groovy

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ class GeoScript {
168168
*/
169169
static Object wrap(Object obj) {
170170
// SimpleFeature -> Feature
171-
if (obj instanceof org.opengis.feature.simple.SimpleFeature) {
172-
return new Feature(obj as org.opengis.feature.simple.SimpleFeature)
171+
if (obj instanceof org.geotools.api.feature.simple.SimpleFeature) {
172+
return new Feature(obj as org.geotools.api.feature.simple.SimpleFeature)
173173
}
174174
// SimpleFeatureType -> Schema
175-
else if (obj instanceof org.opengis.feature.simple.SimpleFeatureType) {
176-
return new Schema(obj as org.opengis.feature.simple.SimpleFeatureType)
175+
else if (obj instanceof org.geotools.api.feature.simple.SimpleFeatureType) {
176+
return new Schema(obj as org.geotools.api.feature.simple.SimpleFeatureType)
177177
}
178178
// JTS Geometry -> Geometry
179179
else if (obj instanceof org.locationtech.jts.geom.Geometry) {
@@ -184,40 +184,40 @@ class GeoScript {
184184
return new Bounds(obj as org.geotools.geometry.jts.ReferencedEnvelope)
185185
}
186186
// GeoTools Expression -> Expression
187-
else if (obj instanceof org.opengis.filter.expression.Expression) {
188-
return new Expression(obj as org.opengis.filter.expression.Expression)
187+
else if (obj instanceof org.geotools.api.filter.expression.Expression) {
188+
return new Expression(obj as org.geotools.api.filter.expression.Expression)
189189
}
190190
// GeoTools Filter -> Filter
191-
else if (obj instanceof org.opengis.filter.Filter) {
192-
return new Filter(obj as org.opengis.filter.Filter)
191+
else if (obj instanceof org.geotools.api.filter.Filter) {
192+
return new Filter(obj as org.geotools.api.filter.Filter)
193193
}
194194
// FeatureCollection -> Cursor
195195
else if (obj instanceof org.geotools.feature.FeatureCollection) {
196196
return new Cursor(obj as org.geotools.feature.FeatureCollection)
197197
}
198198
// FeatureSource -> Layer
199-
else if (obj instanceof org.geotools.data.FeatureSource) {
200-
return new Layer(obj as org.geotools.data.FeatureSource)
199+
else if (obj instanceof org.geotools.api.data.FeatureSource) {
200+
return new Layer(obj as org.geotools.api.data.FeatureSource)
201201
}
202202
/*// GeoTools Process -> Process
203203
else if (obj instanceof org.geotools.process.Process) {
204204
return new Process((obj as org.geotools.process.Process)
205205
}*/
206206
// CoordinateReferenceSystem -> Projection
207-
else if (obj instanceof org.opengis.referencing.crs.CoordinateReferenceSystem) {
208-
return new Projection(obj as org.opengis.referencing.crs.CoordinateReferenceSystem)
207+
else if (obj instanceof org.geotools.api.referencing.crs.CoordinateReferenceSystem) {
208+
return new Projection(obj as org.geotools.api.referencing.crs.CoordinateReferenceSystem)
209209
}
210210
// DefaultEllipsoid -> Geodetic
211211
else if (obj instanceof org.geotools.referencing.datum.DefaultEllipsoid) {
212212
return new Geodetic(obj as org.geotools.referencing.datum.DefaultEllipsoid)
213213
}
214214
// DataStore -> Workspace
215-
else if (obj instanceof org.geotools.data.DataStore) {
216-
return new Workspace(obj as org.geotools.data.DataStore)
215+
else if (obj instanceof org.geotools.api.data.DataStore) {
216+
return new Workspace(obj as org.geotools.api.data.DataStore)
217217
}
218218
// GridCoverage -> Raster
219-
else if (obj instanceof org.opengis.coverage.grid.GridCoverage) {
220-
def grid = obj as org.opengis.coverage.grid.GridCoverage
219+
else if (obj instanceof org.geotools.api.coverage.grid.GridCoverage) {
220+
def grid = obj as org.geotools.api.coverage.grid.GridCoverage
221221
return new Raster(grid)
222222
}
223223
// GridFormat -> Format

‎src/main/groovy/geoscript/carto/LegendItem.groovy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import geoscript.layer.Renderable
66
import geoscript.style.ColorMap
77
import geoscript.style.Style
88
import org.geotools.filter.text.cql2.CQL
9-
import org.geotools.styling.Rule
10-
import org.geotools.styling.StyleFactory
9+
import org.geotools.api.style.Rule
10+
import org.geotools.api.style.StyleFactory
1111
import org.geotools.styling.StyleFactoryImpl
12-
import org.opengis.filter.Filter
12+
import org.geotools.api.filter.Filter
1313

1414
import java.awt.Color
1515
import java.awt.Font
@@ -286,7 +286,7 @@ class LegendItem extends Item {
286286
this
287287
}
288288

289-
private int countRules(org.opengis.style.Style style) {
289+
private int countRules(org.geotools.api.style.Style style) {
290290
int numberOfRules = 0
291291
style.featureTypeStyles().each { def fts ->
292292
fts.rules().each { def rule ->
@@ -297,12 +297,12 @@ class LegendItem extends Item {
297297
}
298298

299299
private static class SLDStyle implements Style {
300-
private final org.geotools.styling.Style style
300+
private final org.geotools.api.style.Style style
301301
private final static StyleFactory styleFactory = new StyleFactoryImpl()
302-
SLDStyle(org.geotools.styling.Style style) {
302+
SLDStyle(org.geotools.api.style.Style style) {
303303
this.style = style
304304
}
305-
org.geotools.styling.Style getGtStyle() {
305+
org.geotools.api.style.Style getGtStyle() {
306306
style
307307
}
308308
static SLDStyle fromRule(Rule rule) {

‎src/main/groovy/geoscript/feature/Feature.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import geoscript.geom.Bounds
55
import geoscript.geom.Geometry
66
import geoscript.layer.Layer
77
import org.geotools.feature.simple.SimpleFeatureBuilder
8-
import org.opengis.feature.simple.SimpleFeature
8+
import org.geotools.api.feature.simple.SimpleFeature
99

1010
/**
1111
* A Feature contains a set of named attributes with values.

‎src/main/groovy/geoscript/feature/Schema.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package geoscript.feature
22

33
import org.geotools.feature.simple.SimpleFeatureBuilder
4-
import org.opengis.feature.simple.SimpleFeatureType
5-
import org.opengis.feature.type.AttributeDescriptor
6-
import org.opengis.feature.type.GeometryDescriptor
4+
import org.geotools.api.feature.simple.SimpleFeatureType
5+
import org.geotools.api.feature.type.AttributeDescriptor
6+
import org.geotools.api.feature.type.GeometryDescriptor
77
import org.geotools.feature.NameImpl
88
import org.geotools.feature.simple.SimpleFeatureTypeBuilder
99
import org.geotools.data.DataUtilities

‎src/main/groovy/geoscript/feature/io/GmlReader.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.geotools.xsd.Parser
55
import org.geotools.gml2.GMLConfiguration as GML2
66
import org.geotools.gml3.GMLConfiguration as GML3
77
import org.geotools.gml3.v3_2.GMLConfiguration as GML32
8-
import org.opengis.feature.simple.SimpleFeature
8+
import org.geotools.api.feature.simple.SimpleFeature
99

1010
/**
1111
* Read a Feature from a GML String.

‎src/main/groovy/geoscript/feature/io/StringSchemaReader.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package geoscript.feature.io
22

33
import geoscript.feature.Schema
44
import org.geotools.data.DataUtilities
5-
import org.opengis.feature.simple.SimpleFeatureType
5+
import org.geotools.api.feature.simple.SimpleFeatureType
66

77
/**
88
* Read a Schema from a simple String. This implementation uses GeoTools

‎src/main/groovy/geoscript/filter/Expression.groovy

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package geoscript.filter
22

33
import geoscript.GeoScript
4-
import org.opengis.filter.expression.Expression as GtExpression
4+
import org.geotools.api.filter.expression.Expression as GtExpression
55
import org.geotools.factory.CommonFactoryFinder
6-
import org.opengis.filter.FilterFactory
6+
import org.geotools.api.filter.FilterFactory
77
import org.geotools.filter.text.cql2.CQL
88

99
/**
@@ -55,12 +55,12 @@ class Expression {
5555
* @return The value
5656
*/
5757
def getValue() {
58-
if (expr instanceof org.opengis.filter.expression.Literal) {
59-
return (expr as org.opengis.filter.expression.Literal).value
60-
} else if (expr instanceof org.opengis.filter.expression.Function) {
61-
return new Function(expr as org.opengis.filter.expression.Function)
62-
} else if (expr instanceof org.opengis.filter.expression.PropertyName) {
63-
return (expr as org.opengis.filter.expression.PropertyName).propertyName
58+
if (expr instanceof org.geotools.api.filter.expression.Literal) {
59+
return (expr as org.geotools.api.filter.expression.Literal).value
60+
} else if (expr instanceof org.geotools.api.filter.expression.Function) {
61+
return new Function(expr as org.geotools.api.filter.expression.Function)
62+
} else if (expr instanceof org.geotools.api.filter.expression.PropertyName) {
63+
return (expr as org.geotools.api.filter.expression.PropertyName).propertyName
6464
} else {
6565
return expr
6666
}
@@ -90,11 +90,11 @@ class Expression {
9090
*/
9191
static Expression fromCQL(String cql) {
9292
def e = CQL.toExpression(cql)
93-
if (e instanceof org.opengis.filter.expression.Literal) {
93+
if (e instanceof org.geotools.api.filter.expression.Literal) {
9494
return new Expression(e)
95-
} else if (e instanceof org.opengis.filter.expression.Function) {
95+
} else if (e instanceof org.geotools.api.filter.expression.Function) {
9696
return new Function(e)
97-
} else if (e instanceof org.opengis.filter.expression.PropertyName) {
97+
} else if (e instanceof org.geotools.api.filter.expression.PropertyName) {
9898
return new Property(e)
9999
} else {
100100
return new Expression(e)

‎src/main/groovy/geoscript/filter/Expressions.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package geoscript.filter
22

33
import geoscript.feature.Field
4-
import org.opengis.filter.expression.Function as GtFunction
5-
import org.opengis.filter.expression.Expression as GtExpression
4+
import org.geotools.api.filter.expression.Function as GtFunction
5+
import org.geotools.api.filter.expression.Expression as GtExpression
66

77
/**
88
* The Expressions class holds static methods for creating new Expressions ({@link Expression}, {@link Color}, {@link Function}, {@link Property}).

‎src/main/groovy/geoscript/filter/Filter.groovy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import geoscript.geom.Bounds
44
import geoscript.geom.Geometry
55
import geoscript.feature.Feature
66
import org.geotools.filter.visitor.SimplifyingFilterVisitor
7-
import org.opengis.filter.Filter as GTFilter
7+
import org.geotools.api.filter.Filter as GTFilter
88
import org.geotools.filter.text.ecql.ECQL
99
import org.geotools.xsd.Parser
1010
import org.geotools.xsd.Encoder
@@ -14,7 +14,7 @@ import org.geotools.filter.v1_1.OGCConfiguration as OGCConfiguration11
1414
import org.geotools.filter.v1_1.OGC as OGC11
1515
import org.geotools.factory.CommonFactoryFinder
1616
import org.geotools.util.factory.GeoTools
17-
import org.opengis.filter.FilterFactory2
17+
import org.geotools.api.filter.FilterFactory
1818

1919
/**
2020
* A Filter is a predicate or constraint used to match or filter {@link geoscript.feature.Feature Feature} objects.
@@ -38,11 +38,11 @@ class Filter {
3838
/**
3939
* The GeoTools FilterFactory
4040
*/
41-
FilterFactory2 factory = CommonFactoryFinder.getFilterFactory2(GeoTools.defaultHints)
41+
FilterFactory factory = CommonFactoryFinder.getFilterFactory(GeoTools.defaultHints)
4242

4343
/**
4444
* Create a new Filter wrapping a GeoTools Filter
45-
* @param filter The org.opengis.filter.Filter
45+
* @param filter The org.geotools.api.filter.Filter
4646
*/
4747
Filter(GTFilter filter) {
4848
this.filter = filter
@@ -227,7 +227,7 @@ class Filter {
227227
* @return A Filter
228228
*/
229229
static Filter equals(String field, Object value) {
230-
FilterFactory2 factory = CommonFactoryFinder.getFilterFactory2(GeoTools.defaultHints)
230+
FilterFactory factory = CommonFactoryFinder.getFilterFactory(GeoTools.defaultHints)
231231
new Filter(factory.equals(factory.property(field), factory.literal(value)))
232232
}
233233

@@ -291,7 +291,7 @@ class Filter {
291291
* @return A Filter
292292
*/
293293
static Filter id(String id) {
294-
FilterFactory2 factory = CommonFactoryFinder.getFilterFactory2(GeoTools.defaultHints)
294+
FilterFactory factory = CommonFactoryFinder.getFilterFactory(GeoTools.defaultHints)
295295
new Filter(factory.id(factory.featureId(id)))
296296
}
297297

@@ -301,7 +301,7 @@ class Filter {
301301
* @return A Filter
302302
*/
303303
static Filter ids(List ids) {
304-
FilterFactory2 factory = CommonFactoryFinder.getFilterFactory2(GeoTools.defaultHints)
304+
FilterFactory factory = CommonFactoryFinder.getFilterFactory(GeoTools.defaultHints)
305305
new Filter(factory.id(ids.collect{ factory.featureId(it) } as Set))
306306
}
307307

0 commit comments

Comments
 (0)