Changeset 35122 in osm for applications/editors/josm/plugins/jts

Timestamp:

2019-09-26T03:18:53+02:00 (6 years ago)

Author:

donvip

Message:

see #josm17933 - see #josm17976 - upgrade to EJML 0.34 and JTS 1.16.1 (versions required by GeoTools 22.0)

Location:

applications/editors/josm/plugins/jts

Files:

• .classpath (modified) (1 diff)
• lib/jts-core-1.14.0-javadoc.jar (deleted)
• lib/jts-core-1.14.0-sources.jar (deleted)
• lib/jts-core-1.14.0.jar (deleted)
• lib/jts-core-1.16.1-javadoc.jar (added)
• lib/jts-core-1.16.1-sources.jar (added)
• lib/jts-core-1.16.1.jar (added)
• lib/jts-example-1.14.0-javadoc.jar (deleted)
• lib/jts-example-1.14.0-sources.jar (deleted)
• lib/jts-example-1.14.0.jar (deleted)
• lib/jts-io-1.14.0-javadoc.jar (deleted)
• lib/jts-io-1.14.0-sources.jar (deleted)
• lib/jts-io-1.14.0.jar (deleted)
• lib/jts-io-common-1.16.1-javadoc.jar (added)
• lib/jts-io-common-1.16.1-sources.jar (added)
• lib/jts-io-common-1.16.1.jar (added)
• src/org/openstreetmap/josm/plugins/jts/JTSConverter.java (modified) (2 diffs)

applications/editors/josm/plugins/jts/.classpath

@@ -4 +4 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-        <classpathentry exported="true" kind="lib" path="lib/jts-core-1.14.0.jar" sourcepath="lib/jts-core-1.14.0-sources.jar">
+        <classpathentry exported="true" kind="lib" path="lib/jts-core-1.16.1.jar" sourcepath="lib/jts-core-1.16.1-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-core-1.14.0-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-core-1.16.1-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry exported="true" kind="lib" path="lib/jts-io-1.14.0.jar" sourcepath="lib/jts-io-1.14.0-sources.jar">
+        <classpathentry exported="true" kind="lib" path="lib/jts-io-common-1.16.1.jar" sourcepath="lib/jts-io-common-1.16.1-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-io-1.14.0-javadoc.jar!/"/>
-                </attributes>
-        </classpathentry>
-        <classpathentry exported="true" kind="lib" path="lib/jts-example-1.14.0.jar" sourcepath="lib/jts-example-1.14.0-sources.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-example-1.14.0-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-io-common-1.16.1-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>

applications/editors/josm/plugins/jts/src/org/openstreetmap/josm/plugins/jts/JTSConverter.java

@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.Way;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.geom.PrecisionModel;
-import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.locationtech.jts.geom.impl.CoordinateArraySequence;
 
 /**
@@ -84 +84 @@
     public Point convertNode(Node node) {
         Coordinate[] coords = {convertNodeToCoordinate(node)};
-        return new com.vividsolutions.jts.geom.Point(new CoordinateArraySequence(coords), getGeometryFactory());
+        return new org.locationtech.jts.geom.Point(new CoordinateArraySequence(coords), getGeometryFactory());
     }