xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

JTS (LocationTech), fix #484

Browse Source
This commit is contained in:
Emux
2018-01-16 14:27:44 +02:00
parent f5386f3503
commit aa5a1436ca
16 changed files with 43 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vtm-jts/build.gradle
View File

@@ -3,7 +3,7 @@ apply plugin: 'maven'
dependencies {
api project(':vtm')
api 'com.vividsolutions:jts:1.13'
api 'org.locationtech.jts:jts-core:1.15.0'
}
sourceSets {

11
vtm-jts/src/org/oscim/layers/vector/JtsConverter.java
View File

@@ -1,11 +1,10 @@
package org.oscim.layers.vector;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.CoordinateSequence;
import com.vividsolutions.jts.geom.LineString;
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jts.geom.Polygon;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateSequence;
import org.locationtech.jts.geom.LineString;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Polygon;
import org.oscim.core.GeometryBuffer;
import static org.oscim.core.MercatorProjection.latitudeToY;

5
vtm-jts/src/org/oscim/layers/vector/PathLayer.java
View File

@@ -20,9 +20,8 @@
*/
package org.oscim.layers.vector;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.LineString;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.LineString;
import org.oscim.backend.CanvasAdapter;
import org.oscim.core.GeoPoint;
import org.oscim.core.Point;

13
vtm-jts/src/org/oscim/layers/vector/VectorLayer.java
View File

@@ -17,13 +17,12 @@
*/
package org.oscim.layers.vector;
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jts.geom.Polygon;
import com.vividsolutions.jts.simplify.DouglasPeuckerSimplifier;
import org.locationtech.jts.geom.Envelope;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.LineString;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Polygon;
import org.locationtech.jts.simplify.DouglasPeuckerSimplifier;
import org.oscim.backend.canvas.Color;
import org.oscim.core.Box;
import org.oscim.core.GeoPoint;

2
vtm-jts/src/org/oscim/layers/vector/geometries/Drawable.java
View File

@@ -1,6 +1,6 @@
package org.oscim.layers.vector.geometries;
import com.vividsolutions.jts.geom.Geometry;
import org.locationtech.jts.geom.Geometry;
public interface Drawable {

7
vtm-jts/src/org/oscim/layers/vector/geometries/JtsDrawable.java
View File

@@ -1,9 +1,8 @@
package org.oscim.layers.vector.geometries;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.impl.PackedCoordinateSequenceFactory;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
import org.oscim.core.GeoPoint;
import org.oscim.utils.geom.GeomBuilder;

5
vtm-jts/src/org/oscim/layers/vector/geometries/LineDrawable.java
View File

@@ -1,8 +1,7 @@
package org.oscim.layers.vector.geometries;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.LineString;
import org.oscim.core.GeoPoint;
import java.util.List;

3
vtm-jts/src/org/oscim/layers/vector/geometries/PolygonDrawable.java
View File

@@ -1,7 +1,6 @@
package org.oscim.layers.vector.geometries;
import com.vividsolutions.jts.geom.Geometry;
import org.locationtech.jts.geom.Geometry;
import org.oscim.core.GeoPoint;
import org.oscim.utils.geom.GeomBuilder;

24
vtm-jts/src/org/oscim/utils/geom/GeomBuilder.java
View File

@@ -14,18 +14,18 @@
*/
package org.oscim.utils.geom;
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.LinearRing;
import com.vividsolutions.jts.geom.MultiLineString;
import com.vividsolutions.jts.geom.MultiPoint;
import com.vividsolutions.jts.geom.MultiPolygon;
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jts.geom.Polygon;
import com.vividsolutions.jts.geom.PrecisionModel;
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.LinearRing;
import org.locationtech.jts.geom.MultiLineString;
import org.locationtech.jts.geom.MultiPoint;
import org.locationtech.jts.geom.MultiPolygon;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Polygon;
import org.locationtech.jts.geom.PrecisionModel;
import java.lang.reflect.Array;
import java.util.ArrayDeque;