Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Geo Tools
Commits
0ca9e7de
Commit
0ca9e7de
authored
Jun 14, 2020
by
Matija Obreza
Browse files
Merge branch 'dependency-updates' into 'master'
Updated to geotools 23.1 See merge request
!3
parents
10d11156
1ad030b4
Changes
5
Hide whitespace changes
Inline
Side-by-side
genesys-geotools/pom.xml
View file @
0ca9e7de
...
...
@@ -41,7 +41,7 @@
<jdk.target>
1.8
</jdk.target>
<jdk.source>
1.8
</jdk.source>
<!-- use the latest snapshot -->
<geotools.version>
15-SNAPSHOT
</geotools.version>
<geotools.version>
23.1
</geotools.version>
<jar.mainclass>
org.genesys.geotools.cli.CLI
</jar.mainclass>
</properties>
...
...
@@ -59,17 +59,17 @@
<dependency>
<groupId>
org.geotools
</groupId>
<artifactId>
gt-shapefile
</artifactId>
<version>
17.2
</version>
<version>
${geotools.version}
</version>
</dependency>
<dependency>
<groupId>
org.geotools
</groupId>
<artifactId>
gt-cql
</artifactId>
<version>
17.2
</version>
<version>
${geotools.version}
</version>
</dependency>
<dependency>
<groupId>
org.geotools
</groupId>
<artifactId>
gt-epsg-wkt
</artifactId>
<version>
17.2
</version>
<version>
${geotools.version}
</version>
</dependency>
<dependency>
<groupId>
com.google.guava
</groupId>
...
...
@@ -165,23 +165,7 @@
<repository>
<id>
osgeo
</id>
<name>
Open Source Geospatial Foundation Repository
</name>
<url>
http://download.osgeo.org/webdav/geotools/
</url>
</repository>
<repository>
<snapshots>
<enabled>
true
</enabled>
</snapshots>
<id>
boundless
</id>
<name>
Boundless Maven Repository
</name>
<url>
http://repo.boundlessgeo.com/main
</url>
</repository>
<repository>
<snapshots>
<enabled>
true
</enabled>
</snapshots>
<id>
boundless-art
</id>
<name>
Boundless Artifactory Repository
</name>
<url>
https://boundless.artifactoryonline.com/boundless/main/
</url>
<url>
https://repo.osgeo.org/repository/release/
</url>
</repository>
</repositories>
</project>
\ No newline at end of file
genesys-geotools/src/main/java/org/genesys/geotools/service/ShapefileUtils.java
View file @
0ca9e7de
...
...
@@ -28,14 +28,14 @@ import org.geotools.data.DataStoreFinder;
import
org.geotools.geometry.jts.JTSFactoryFinder
;
import
org.geotools.referencing.GeodeticCalculator
;
import
org.geotools.referencing.crs.DefaultGeographicCRS
;
import
org.locationtech.jts.geom.Coordinate
;
import
org.locationtech.jts.geom.Geometry
;
import
org.locationtech.jts.geom.GeometryFactory
;
import
org.locationtech.jts.geom.Polygon
;
import
org.opengis.geometry.MismatchedDimensionException
;
import
org.opengis.referencing.FactoryException
;
import
org.opengis.referencing.operation.TransformException
;
import
com.vividsolutions.jts.geom.Coordinate
;
import
com.vividsolutions.jts.geom.Geometry
;
import
com.vividsolutions.jts.geom.GeometryFactory
;
import
com.vividsolutions.jts.geom.Polygon
;
/**
* The Class ShapefileUtils.
...
...
genesys-geotools/src/main/java/org/genesys/geotools/service/impl/CountryOfOriginServiceImpl.java
View file @
0ca9e7de
...
...
@@ -37,6 +37,11 @@ import org.geotools.geometry.jts.JTSFactoryFinder;
import
org.geotools.geometry.jts.ReferencedEnvelope
;
import
org.geotools.referencing.GeodeticCalculator
;
import
org.geotools.referencing.crs.DefaultGeographicCRS
;
import
org.locationtech.jts.geom.Coordinate
;
import
org.locationtech.jts.geom.GeometryFactory
;
import
org.locationtech.jts.geom.MultiPolygon
;
import
org.locationtech.jts.geom.Point
;
import
org.locationtech.jts.operation.distance.DistanceOp
;
import
org.opengis.feature.simple.SimpleFeature
;
import
org.opengis.feature.simple.SimpleFeatureType
;
import
org.opengis.filter.Filter
;
...
...
@@ -48,11 +53,6 @@ import com.google.common.cache.CacheBuilder;
import
com.google.common.cache.CacheLoader
;
import
com.google.common.cache.CacheStats
;
import
com.google.common.cache.LoadingCache
;
import
com.vividsolutions.jts.geom.Coordinate
;
import
com.vividsolutions.jts.geom.GeometryFactory
;
import
com.vividsolutions.jts.geom.MultiPolygon
;
import
com.vividsolutions.jts.geom.Point
;
import
com.vividsolutions.jts.operation.distance.DistanceOp
;
/**
* Polygons used here are derived from OSM data, © OpenStreetMap contributors.
...
...
genesys-geotools/src/main/java/org/genesys/geotools/service/impl/LandOrSeaServiceImpl.java
View file @
0ca9e7de
...
...
@@ -31,6 +31,9 @@ import org.geotools.factory.CommonFactoryFinder;
import
org.geotools.feature.FeatureCollection
;
import
org.geotools.feature.FeatureIterator
;
import
org.geotools.geometry.jts.JTSFactoryFinder
;
import
org.locationtech.jts.geom.Coordinate
;
import
org.locationtech.jts.geom.GeometryFactory
;
import
org.locationtech.jts.geom.Point
;
import
org.opengis.feature.simple.SimpleFeature
;
import
org.opengis.feature.simple.SimpleFeatureType
;
import
org.opengis.filter.Filter
;
...
...
@@ -41,9 +44,6 @@ import org.slf4j.LoggerFactory;
import
com.google.common.cache.CacheBuilder
;
import
com.google.common.cache.CacheLoader
;
import
com.google.common.cache.LoadingCache
;
import
com.vividsolutions.jts.geom.Coordinate
;
import
com.vividsolutions.jts.geom.GeometryFactory
;
import
com.vividsolutions.jts.geom.Point
;
/**
* Polygons used here are derived from OSM data, © OpenStreetMap contributors.
...
...
genesys-geotools/src/test/java/org/genesys/geotools/service/PointBufferTest.java
View file @
0ca9e7de
...
...
@@ -17,13 +17,12 @@
package
org.genesys.geotools.service
;
import
org.junit.Test
;
import
org.locationtech.jts.geom.Coordinate
;
import
org.locationtech.jts.geom.Polygon
;
import
org.opengis.geometry.MismatchedDimensionException
;
import
org.opengis.referencing.FactoryException
;
import
org.opengis.referencing.operation.TransformException
;
import
com.vividsolutions.jts.geom.Coordinate
;
import
com.vividsolutions.jts.geom.Polygon
;
public
class
PointBufferTest
{
@Test
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment