Updates Geoscript-py to use latest Geotools. This will be required

Devon Tucker · Devon Tucker · commit 90453554a199 · 2019-01-02T15:46:51.000-08:00
for compatibility going forward.
diff --git a/geoscript/__init__.py b/geoscript/__init__.py
@@ -3,7 +3,7 @@
 
 try:
    import org.geotools
-   from org.geotools.factory import Hints
+   from org.geotools.util.factory import Hints
 
    # by default the geotools referenceing Systemtem assumes yx or lat/lon 
    if not System.getProperty("org.geotools.referencing.forceXY"):
diff --git a/geoscript/filter.py b/geoscript/filter.py
@@ -7,7 +7,7 @@
 from org.opengis.filter import Filter as _Filter
 from org.geotools.filter.text.cql2 import CQL
 from org.geotools.filter.text.ecql import ECQL
-from org.geotools.xml import Parser, Encoder
+from org.geotools.xsd import Parser, Encoder
 from org.geotools.factory import CommonFactoryFinder
 from geoscript import core
 
diff --git a/geoscript/geom/circularring.py b/geoscript/geom/circularring.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.geom import Coordinate
+from org.locationtech.jts.geom import Coordinate
 from org.geotools.geometry.jts import CircularRing as _CircularRing
 from org.geotools.geometry.jts import CurvedGeometryFactory
 from java.lang import Double
diff --git a/geoscript/geom/circularstring.py b/geoscript/geom/circularstring.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.geom import Coordinate
+from org.locationtech.jts.geom import Coordinate
 from org.geotools.geometry.jts import CircularString as _CircularString
 from org.geotools.geometry.jts import CurvedGeometryFactory
 from java.lang import Double
diff --git a/geoscript/geom/compoundcurve.py b/geoscript/geom/compoundcurve.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.geom import Coordinate
+from org.locationtech.jts.geom import Coordinate
 from org.geotools.geometry.jts import CompoundCurve as _CompoundCurve
 from org.geotools.geometry.jts import CurvedGeometryFactory
 from linestring import LineString
diff --git a/geoscript/geom/compoundring.py b/geoscript/geom/compoundring.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.geom import Coordinate
+from org.locationtech.jts.geom import Coordinate
 from org.geotools.geometry.jts import CompoundRing as _CompoundRing
 from org.geotools.geometry.jts import CurvedGeometryFactory
 from linestring import LineString
diff --git a/geoscript/geom/geom.py b/geoscript/geom/geom.py
@@ -3,15 +3,15 @@
 """
 
 from java.awt.geom import AffineTransform
-from com.vividsolutions.jts.geom import GeometryFactory, CoordinateFilter
-from com.vividsolutions.jts.geom import Geometry as _Geometry
-from com.vividsolutions.jts.geom.prep import PreparedGeometryFactory
-from com.vividsolutions.jts.simplify import DouglasPeuckerSimplifier as DP
-from com.vividsolutions.jts.simplify import TopologyPreservingSimplifier as TP
-from com.vividsolutions.jts.densify import Densifier
-from com.vividsolutions.jts.triangulate import DelaunayTriangulationBuilder
-from com.vividsolutions.jts.triangulate import VoronoiDiagramBuilder
-from com.vividsolutions.jts.operation.buffer import BufferOp, BufferParameters
+from org.locationtech.jts.geom import GeometryFactory, CoordinateFilter
+from org.locationtech.jts.geom import Geometry as _Geometry
+from org.locationtech.jts.geom.prep import PreparedGeometryFactory
+from org.locationtech.jts.simplify import DouglasPeuckerSimplifier as DP
+from org.locationtech.jts.simplify import TopologyPreservingSimplifier as TP
+from org.locationtech.jts.densify import Densifier
+from org.locationtech.jts.triangulate import DelaunayTriangulationBuilder
+from org.locationtech.jts.triangulate import VoronoiDiagramBuilder
+from org.locationtech.jts.operation.buffer import BufferOp, BufferParameters
 from org.geotools.geometry.jts import JTS
 from org.geotools.referencing.operation.transform import AffineTransform2D
 from geoscript.geom.bounds import Bounds
diff --git a/geoscript/geom/io/kml.py b/geoscript/geom/io/kml.py
@@ -1,5 +1,5 @@
 from geoscript.util import xml
-from com.vividsolutions.jts.geom import GeometryCollection
+from org.locationtech.jts.geom import GeometryCollection
 
 def writeKML(g, format=True, xmldecl=False, namespaces=True):
   """
diff --git a/geoscript/geom/io/wkb.py b/geoscript/geom/io/wkb.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.io import WKBReader, WKBWriter
+from org.locationtech.jts.io import WKBReader, WKBWriter
 from geoscript.util import bytes, deprecated
 
 def readWKB(wkb, base=16):
diff --git a/geoscript/geom/io/wkt.py b/geoscript/geom/io/wkt.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.io import WKTWriter
+from org.locationtech.jts.io import WKTWriter
 from org.geotools.geometry.jts import WKTReader2 as WKTReader
 from geoscript.util import deprecated
 
diff --git a/geoscript/geom/linearring.py b/geoscript/geom/linearring.py
@@ -1,5 +1,5 @@
-from com.vividsolutions.jts.geom import Coordinate
-from com.vividsolutions.jts.geom import LinearRing as _LinearRing
+from org.locationtech.jts.geom import Coordinate
+from org.locationtech.jts.geom import LinearRing as _LinearRing
 from linestring import LineString
 from geoscript import core
 import geom
diff --git a/geoscript/geom/linestring.py b/geoscript/geom/linestring.py
@@ -1,6 +1,6 @@
-from com.vividsolutions.jts.geom import Coordinate
-from com.vividsolutions.jts.geom import LineString as _LineString
-from com.vividsolutions.jts.linearref import LengthIndexedLine
+from org.locationtech.jts.geom import Coordinate
+from org.locationtech.jts.geom import LineString as _LineString
+from org.locationtech.jts.linearref import LengthIndexedLine
 from geoscript import core
 from geoscript.geom import Point
 import geom
diff --git a/geoscript/geom/multilinestring.py b/geoscript/geom/multilinestring.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.geom import MultiLineString as _MultiLineString
+from org.locationtech.jts.geom import MultiLineString as _MultiLineString
 from linestring import LineString
 from geoscript import core
 import geom
diff --git a/geoscript/geom/multipoint.py b/geoscript/geom/multipoint.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.geom import MultiPoint as _MultiPoint
+from org.locationtech.jts.geom import MultiPoint as _MultiPoint
 from geoscript import core
 from point import Point
 import geom
diff --git a/geoscript/geom/multipolygon.py b/geoscript/geom/multipolygon.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.geom import MultiPolygon as _MultiPolygon
+from org.locationtech.jts.geom import MultiPolygon as _MultiPolygon
 from geoscript import core
 from polygon import Polygon
 import geom
diff --git a/geoscript/geom/point.py b/geoscript/geom/point.py
@@ -1,5 +1,5 @@
-from com.vividsolutions.jts.geom import Coordinate
-from com.vividsolutions.jts.geom import Point as _Point
+from org.locationtech.jts.geom import Coordinate
+from org.locationtech.jts.geom import Point as _Point
 from geoscript import core
 import geom
 
diff --git a/geoscript/geom/polygon.py b/geoscript/geom/polygon.py
@@ -1,4 +1,4 @@
-from com.vividsolutions.jts.geom import Polygon as _Polygon
+from org.locationtech.jts.geom import Polygon as _Polygon
 from geoscript import core
 from linearring import LinearRing
 import geom
diff --git a/geoscript/layer/layer.py b/geoscript/layer/layer.py
@@ -12,7 +12,8 @@
 from org.geoscript.util import CollectionDelegatingFeatureSource
 from org.geotools.data import FeatureSource, FeatureStore
 from org.geotools.data import DefaultQuery, Query, Transaction
-from org.geotools.factory import CommonFactoryFinder, Hints
+from org.geotools.factory import CommonFactoryFinder
+from org.geotools.util.factory import Hints
 from org.geotools.feature import FeatureCollection, FeatureCollections
 from org.opengis.filter.sort import SortOrder
 
@@ -542,7 +543,7 @@ def toGML(self,out=sys.stdout):
     try:
       from net.opengis.wfs import WfsFactory
       from org.geotools.wfs.v1_1 import WFS, WFSConfiguration
-      from org.geotools.xml import Encoder
+      from org.geotools.xsd import Encoder
     except ImportError:
       raise Exception('toGML() not available, GML libraries not on classpath.') 
 
diff --git a/geoscript/layer/raster.py b/geoscript/layer/raster.py
@@ -9,7 +9,7 @@
 from geoscript.layer.band import Band
 from org.opengis.parameter import GeneralParameterValue
 from org.opengis.referencing.datum import PixelInCell
-from org.geotools.factory import Hints
+from org.geotools.util.factory import Hints
 from org.geotools.geometry import DirectPosition2D
 from org.geotools.parameter import Parameter
 from org.geotools.coverage import CoverageFactoryFinder, GridSampleDimension
diff --git a/geoscript/util/xml.py b/geoscript/util/xml.py
@@ -1,11 +1,11 @@
 import sys
 from javax.xml.namespace import QName
 from util import doInput, doOutput
-from org.geotools.xml import Parser, Encoder, Configuration
+from org.geotools.xsd import Parser, Encoder, Configuration
 from org.geotools.gml2 import GMLConfiguration as GML2
 from org.geotools.gml3 import GMLConfiguration as GML3
 from org.geotools.gml3.v3_2 import GMLConfiguration as GML32
-from org.geotools.wfs.v1_0 import WFSConfiguration as WFS10
+from org.geotools.wfs.v1_0 import WFSConfiguration_1_0 as WFS10
 from org.geotools.wfs.v1_1 import WFSConfiguration as WFS11
 from org.geotools.wfs.v2_0 import WFSConfiguration as WFS20
 from org.geotools.kml import KMLConfiguration as KML
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.geoscript</groupId>
   <artifactId>geoscript-py</artifactId>
   <packaging>jar</packaging>
-  <version>1.4-SNAPSHOT</version>
+  <version>1.5-SNAPSHOT</version>
   <name>GeoScript Python</name>
 
   <repositories>
@@ -230,24 +230,7 @@
       </plugin>
       <plugin>
        <artifactId>maven-antrun-plugin</artifactId>
-       <dependencies>
-          <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.8.4</version>
-          </dependency>
-          <dependency>
-            <groupId>ant-contrib</groupId>
-            <artifactId>ant-contrib</artifactId>
-            <version>1.0b3</version>
-            <exclusions>
-              <exclusion>
-                <groupId>ant</groupId>
-                <artifactId>ant</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-        </dependencies>
+       <version>1.8</version>
         <executions>
           <execution>
             <id>initialize</id>
@@ -262,7 +245,7 @@
             </goals>
           </execution>
           <execution>
-            <id>package</id>
+            <id>package-jars</id>
             <phase>package</phase>
             <configuration>
               <tasks>
@@ -328,7 +311,7 @@
   </profiles>
 
   <properties>
-    <gt.version>13-SNAPSHOT</gt.version>
+    <gt.version>21-SNAPSHOT</gt.version>
   </properties>
 
 </project>
diff --git a/tests/test_geom.py b/tests/test_geom.py
@@ -2,7 +2,7 @@
 from .util import assertClose
 from geoscript import geom
 from geoscript.util import bytes
-from com.vividsolutions.jts.geom import Coordinate, GeometryFactory
+from org.locationtech.jts.geom import Coordinate, GeometryFactory
 
 class GeomTest(unittest.TestCase):
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from com.vividsolutions.jts.geom import Coordinate`
	`1`	`+from org.locationtech.jts.geom import Coordinate`
`2`	`2`	`from org.geotools.geometry.jts import CircularRing as _CircularRing`
`3`	`3`	`from org.geotools.geometry.jts import CurvedGeometryFactory`
`4`	`4`	`from java.lang import Double`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from com.vividsolutions.jts.io import WKBReader, WKBWriter`
	`1`	`+from org.locationtech.jts.io import WKBReader, WKBWriter`
`2`	`2`	`from geoscript.util import bytes, deprecated`
`3`	`3`
`4`	`4`	`def readWKB(wkb, base=16):`