upgrade to JTS 1.16.1

JOSM · Sep 26, 2019 · f1b39d7 · f1b39d7
1 parent da164b6
commit f1b39d7
Show file tree

Hide file tree

Showing 38 changed files with 63 additions and 63 deletions.
diff --git a/src/com/vividsolutions/jcs/algorithm/EuclideanDistanceToPoint.java b/src/com/vividsolutions/jcs/algorithm/EuclideanDistanceToPoint.java
@@ -34,7 +34,7 @@
 
 package com.vividsolutions.jcs.algorithm;
 
-import com.vividsolutions.jts.geom.*;
+import org.locationtech.jts.geom.*;
 
 /**
  * Computes the Euclidean distance (L2 metric) from a Point to a Geometry.

diff --git a/src/com/vividsolutions/jcs/algorithm/PointPairDistance.java b/src/com/vividsolutions/jcs/algorithm/PointPairDistance.java
@@ -34,7 +34,7 @@
 
 package com.vividsolutions.jcs.algorithm;
 
-import com.vividsolutions.jts.geom.*;
+import org.locationtech.jts.geom.*;
 
 /**
  * Contains a pair of points and the distance between them.

diff --git a/src/com/vividsolutions/jcs/algorithm/VertexHausdorffDistance.java b/src/com/vividsolutions/jcs/algorithm/VertexHausdorffDistance.java
@@ -34,10 +34,10 @@
 
 package com.vividsolutions.jcs.algorithm;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateFilter;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineSegment;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineSegment;
 /**
  * Implements algorithm for computing a distance metric
  * which can be thought of as the "Maximum Vertex Distance".

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/AbstractDistanceMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/AbstractDistanceMatcher.java
@@ -1,7 +1,7 @@
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
 import java.awt.geom.Point2D;
 
 public abstract class AbstractDistanceMatcher extends IndependentCandidateMatcher {

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/AngleHistogramMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/AngleHistogramMatcher.java
@@ -33,10 +33,10 @@
 import java.util.List;
 
 import com.vividsolutions.jcs.geom.Angle;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.WKTReader;
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.util.Assert;
 import com.vividsolutions.jump.util.CoordinateArrays;
 /**
  * Matches geometries by comparing their "angle histograms". An angle histogram

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/AreaFilterFCMatchFinder.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/AreaFilterFCMatchFinder.java
@@ -37,7 +37,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.util.Assert;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.feature.FeatureDataset;

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/CentroidAligner.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/CentroidAligner.java
@@ -1,6 +1,6 @@
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 public class CentroidAligner extends IndependentCandidateMatcher {
 

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/CentroidDistanceMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/CentroidDistanceMatcher.java
@@ -1,6 +1,6 @@
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 public class CentroidDistanceMatcher extends AbstractDistanceMatcher {
 

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/CombinatorialFCMatchFinder.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/CombinatorialFCMatchFinder.java
@@ -40,9 +40,9 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.util.Assert;
 import com.vividsolutions.jump.feature.BasicFeature;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/CompactnessMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/CompactnessMatcher.java
@@ -34,8 +34,8 @@
 
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.util.Assert;
 
 /**
  * Uses (4 x pi x Area) / (Perimeter^2) as a shape characteristic. The

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/HausdorffDistanceMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/HausdorffDistanceMatcher.java
@@ -1,7 +1,7 @@
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
 import com.vividsolutions.jcs.algorithm.VertexHausdorffDistance;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * Uses an approximation of the Hausdorff distance.

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/Histogram.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/Histogram.java
@@ -34,7 +34,7 @@
 
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.util.Assert;
 
 /**
  * Generic model for a bar graph.

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/IndependentCandidateMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/IndependentCandidateMatcher.java
@@ -31,7 +31,7 @@
  */
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;
 

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/MatcherUtil.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/MatcherUtil.java
@@ -33,9 +33,9 @@
 
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateFilter;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateFilter;
+import org.locationtech.jts.geom.Geometry;
 import com.vividsolutions.jump.geom.CoordUtil;
 import com.vividsolutions.jump.util.CoordinateArrays;
 

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/Matches.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/Matches.java
@@ -36,8 +36,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.util.Assert;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.feature.FeatureDataset;

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/OneToOneFCMatchFinder.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/OneToOneFCMatchFinder.java
@@ -35,7 +35,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.util.Assert;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.task.TaskMonitor;

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/OverlapMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/OverlapMatcher.java
@@ -1,6 +1,6 @@
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 public class OverlapMatcher extends IndependentCandidateMatcher {
 

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/SymDiffMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/SymDiffMatcher.java
@@ -34,7 +34,7 @@
 
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * Uses symmetric difference as the criterion for determining match scores.

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/TargetUnioningFCMatchFinder.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/TargetUnioningFCMatchFinder.java
@@ -43,9 +43,9 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.util.Assert;
 import com.vividsolutions.jump.feature.BasicFeature;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/TopMatchDisambiguatingFCMatchFinder.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/TopMatchDisambiguatingFCMatchFinder.java
@@ -35,7 +35,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.util.Assert;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.task.TaskMonitor;

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/WeightedMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/WeightedMatcher.java
@@ -35,7 +35,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.util.Assert;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.feature.FeatureSchema;

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/WindowFilter.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/WindowFilter.java
@@ -34,7 +34,7 @@
 
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.geom.EnvelopeUtil;

diff --git a/src/com/vividsolutions/jcs/conflate/polygonmatch/WindowMatcher.java b/src/com/vividsolutions/jcs/conflate/polygonmatch/WindowMatcher.java
@@ -34,7 +34,7 @@
 
 package com.vividsolutions.jcs.conflate.polygonmatch;
 
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.geom.EnvelopeUtil;

diff --git a/src/com/vividsolutions/jcs/geom/Angle.java b/src/com/vividsolutions/jcs/geom/Angle.java
@@ -33,7 +33,7 @@
 
 package com.vividsolutions.jcs.geom;
 
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
 
 
 /**

diff --git a/src/com/vividsolutions/jump/feature/AbstractBasicFeature.java b/src/com/vividsolutions/jump/feature/AbstractBasicFeature.java
@@ -1,6 +1,6 @@
 package com.vividsolutions.jump.feature;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * Subclasses need to implement only the four remaining Feature methods:

diff --git a/src/com/vividsolutions/jump/feature/AttributeType.java b/src/com/vividsolutions/jump/feature/AttributeType.java
@@ -36,7 +36,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * A type for the attributes of a feature.

diff --git a/src/com/vividsolutions/jump/feature/Feature.java b/src/com/vividsolutions/jump/feature/Feature.java
@@ -1,6 +1,6 @@
 package com.vividsolutions.jump.feature;
 
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 public interface Feature extends Cloneable, Comparable<Feature> {
 	/**

diff --git a/src/com/vividsolutions/jump/feature/FeatureCollection.java b/src/com/vividsolutions/jump/feature/FeatureCollection.java
@@ -35,7 +35,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 
 /**
  * A collection of Features, with a special method for querying the Features

diff --git a/src/com/vividsolutions/jump/feature/FeatureCollectionWrapper.java b/src/com/vividsolutions/jump/feature/FeatureCollectionWrapper.java
@@ -37,8 +37,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.util.Assert;
 
 
 public abstract class FeatureCollectionWrapper implements FeatureCollection {

diff --git a/src/com/vividsolutions/jump/feature/FeatureDataset.java b/src/com/vividsolutions/jump/feature/FeatureDataset.java
@@ -37,7 +37,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Envelope;
+import org.locationtech.jts.geom.Envelope;
 
 /**
  * Basic implementation of FeatureCollection.

diff --git a/src/com/vividsolutions/jump/feature/FeatureSchema.java b/src/com/vividsolutions/jump/feature/FeatureSchema.java
@@ -36,7 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.util.Assert;
 
 public class FeatureSchema implements Cloneable {
     //<<TODO:QUESTION>> Is this an efficient implementation? Must cast the Integer to

diff --git a/src/com/vividsolutions/jump/feature/IndexedFeatureCollection.java b/src/com/vividsolutions/jump/feature/IndexedFeatureCollection.java
@@ -35,9 +35,9 @@
 import java.util.Collection;
 import java.util.List;
 
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.index.SpatialIndex;
-import com.vividsolutions.jts.index.strtree.STRtree;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.index.SpatialIndex;
+import org.locationtech.jts.index.strtree.STRtree;
 
 /**
  *  An IndexedFeatureCollection creates a new collection which is backed by a

diff --git a/src/com/vividsolutions/jump/geom/CoordUtil.java b/src/com/vividsolutions/jump/geom/CoordUtil.java
@@ -33,7 +33,7 @@
 
 import java.awt.geom.Point2D;
 
-import com.vividsolutions.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Coordinate;
 import com.vividsolutions.jump.util.MathUtil;
 
 /**

diff --git a/src/com/vividsolutions/jump/geom/EnvelopeUtil.java b/src/com/vividsolutions/jump/geom/EnvelopeUtil.java
@@ -33,7 +33,7 @@
 
 package com.vividsolutions.jump.geom;
 
-import com.vividsolutions.jts.geom.*;
+import org.locationtech.jts.geom.*;
 import com.vividsolutions.jump.util.MathUtil;
 
 

diff --git a/src/com/vividsolutions/jump/util/CollectionMap.java b/src/com/vividsolutions/jump/util/CollectionMap.java
@@ -38,7 +38,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.util.Assert;
 
 /**
  *  A Map whose values are Collections.

diff --git a/src/com/vividsolutions/jump/util/CoordinateArrays.java b/src/com/vividsolutions/jump/util/CoordinateArrays.java
@@ -34,14 +34,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vividsolutions.jts.algorithm.CGAlgorithms;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.algorithm.CGAlgorithms;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.GeometryCollection;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LineString;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.Assert;
 
 /**
  * Some utility functions for handling Coordinate arrays;

diff --git a/src/com/vividsolutions/jump/workbench/ui/ValidatingTextField.java b/src/com/vividsolutions/jump/workbench/ui/ValidatingTextField.java
@@ -31,7 +31,7 @@
  */
 package com.vividsolutions.jump.workbench.ui;
 
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.util.Assert;
 
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;

diff --git a/src/org/openstreetmap/josm/plugins/conflation/matcher/StandardDistanceMatcher.java b/src/org/openstreetmap/josm/plugins/conflation/matcher/StandardDistanceMatcher.java
@@ -2,7 +2,7 @@
 package org.openstreetmap.josm.plugins.conflation.matcher;
 
 import com.vividsolutions.jcs.conflate.polygonmatch.AbstractDistanceMatcher;
-import com.vividsolutions.jts.geom.Geometry;
+import org.locationtech.jts.geom.Geometry;
 
 /**
  * Compute the standard distance (i.e. the minimum) between two geometries.