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
No known key found for this signature in database
GPG Key ID: 89C6921D7AF2BDD0
16 changed files with 43 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Changelog.md
View File

@ -8,6 +8,7 @@
- Improved theme styles [#479](https://github.com/mapsforge/vtm/pull/479)
- Render theme fallback internal resources [#477](https://github.com/mapsforge/vtm/issues/477)
- Fix libGDX flickering [#148](https://github.com/mapsforge/vtm/issues/148) [#149](https://github.com/mapsforge/vtm/issues/149)
- JTS (LocationTech) [#484](https://github.com/mapsforge/vtm/issues/484)
- Many other minor improvements and bug fixes
- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.10.0)

2
docs/Integration.md
View File

@ -73,7 +73,7 @@ implementation 'com.metsci.ext.com.kitfox.svg:svg-salamander:0.1.19'
```groovy
implementation 'org.mapsforge:vtm-jts:[CURRENT-VERSION]'
implementation 'com.vividsolutions:jts:1.13'
implementation 'org.locationtech.jts:jts-core:1.15.0'
```
- Online tiles

2
vtm-extras/build.gradle
View File

@ -4,7 +4,7 @@ apply plugin: 'maven'
dependencies {
api project(':vtm')
api 'com.fasterxml.jackson.core:jackson-core:2.8.4'
api 'com.vividsolutions:jts:1.13'
api 'org.locationtech.jts:jts-core:1.15.0'
api 'org.openstreetmap.osmosis:osmosis-osm-binary:0.46'
}

3
vtm-extras/src/org/oscim/core/osm/OsmElement.java
View File

@ -16,8 +16,7 @@
*/
package org.oscim.core.osm;
import com.vividsolutions.jts.geom.Geometry;
import org.locationtech.jts.geom.Geometry;
import org.oscim.core.TagSet;
public abstract class OsmElement {

3
vtm-extras/src/org/oscim/core/osm/OsmNode.java
View File

@ -16,8 +16,7 @@
*/
package org.oscim.core.osm;
import com.vividsolutions.jts.geom.Geometry;
import org.locationtech.jts.geom.Geometry;
import org.oscim.core.TagSet;
public class OsmNode extends OsmElement {

3
vtm-extras/src/org/oscim/core/osm/OsmRelation.java
View File

@ -16,8 +16,7 @@
*/
package org.oscim.core.osm;
import com.vividsolutions.jts.geom.Geometry;
import org.locationtech.jts.geom.Geometry;
import org.oscim.core.TagSet;
import java.util.ArrayList;

9
vtm-extras/src/org/oscim/core/osm/OsmWay.java
View File

@ -16,11 +16,10 @@
*/
package org.oscim.core.osm;
import com.vividsolutions.jts.geom.CoordinateSequence;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;
import com.vividsolutions.jts.geom.impl.PackedCoordinateSequenceFactory;
import org.locationtech.jts.geom.CoordinateSequence;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.LineString;
import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
import org.oscim.core.TagSet;
import java.util.List;

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;