diff --git a/vtm-android-gdx/src/org/oscim/gdx/AndroidGL30.java b/vtm-android-gdx/src/org/oscim/gdx/AndroidGL30.java index 337ffa62..d731a469 100644 --- a/vtm-android-gdx/src/org/oscim/gdx/AndroidGL30.java +++ b/vtm-android-gdx/src/org/oscim/gdx/AndroidGL30.java @@ -35,12 +35,12 @@ package org.oscim.gdx; import android.annotation.SuppressLint; import android.opengl.GLES30; - import org.oscim.backend.GL30; /** * See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGL30.java */ +@SuppressWarnings("deprecation") @SuppressLint("NewApi") public class AndroidGL30 extends AndroidGL implements GL30 { @Override diff --git a/vtm-android/src/org/oscim/android/MapView.java b/vtm-android/src/org/oscim/android/MapView.java index c8b3fe27..7a694149 100644 --- a/vtm-android/src/org/oscim/android/MapView.java +++ b/vtm-android/src/org/oscim/android/MapView.java @@ -92,6 +92,7 @@ public class MapView extends GLSurfaceView { this(context, null); } + @SuppressWarnings("deprecation") public MapView(Context context, AttributeSet attributeSet) { super(context, attributeSet); diff --git a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java index 81964b08..97228da0 100644 --- a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java +++ b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java @@ -107,6 +107,9 @@ public final class AndroidGraphics extends CanvasAdapter { return new AndroidBitmap(bitmap); } + /** + * @deprecated + */ public static Bitmap drawableToBitmap(Resources res, int resId) { return drawableToBitmap(res.getDrawable(resId)); } diff --git a/vtm-android/src/org/oscim/android/gl/AndroidGL30.java b/vtm-android/src/org/oscim/android/gl/AndroidGL30.java index 816cae55..2f50a50c 100644 --- a/vtm-android/src/org/oscim/android/gl/AndroidGL30.java +++ b/vtm-android/src/org/oscim/android/gl/AndroidGL30.java @@ -35,12 +35,12 @@ package org.oscim.android.gl; import android.annotation.SuppressLint; import android.opengl.GLES30; - import org.oscim.backend.GL30; /** * See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidGL30.java */ +@SuppressWarnings("deprecation") @SuppressLint("NewApi") public class AndroidGL30 extends AndroidGL implements GL30 { @Override diff --git a/vtm-desktop-lwjgl/src/org/oscim/gdx/LwjglGL30.java b/vtm-desktop-lwjgl/src/org/oscim/gdx/LwjglGL30.java index c45f235e..b35e8f36 100644 --- a/vtm-desktop-lwjgl/src/org/oscim/gdx/LwjglGL30.java +++ b/vtm-desktop-lwjgl/src/org/oscim/gdx/LwjglGL30.java @@ -24,6 +24,7 @@ import java.nio.*; /** * See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglGL30.java */ +@SuppressWarnings("deprecation") public class LwjglGL30 extends LwjglGL20 implements org.oscim.backend.GL30 { @Override public void readBuffer(int mode) { diff --git a/vtm-desktop-lwjgl3/src/org/oscim/gdx/Lwjgl3GL30.java b/vtm-desktop-lwjgl3/src/org/oscim/gdx/Lwjgl3GL30.java index e3abee1f..9316ae88 100644 --- a/vtm-desktop-lwjgl3/src/org/oscim/gdx/Lwjgl3GL30.java +++ b/vtm-desktop-lwjgl3/src/org/oscim/gdx/Lwjgl3GL30.java @@ -24,6 +24,7 @@ import java.nio.*; /** * See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-lwjgl3/src/com/badlogic/gdx/backends/lwjgl3/Lwjgl3GL30.java */ +@SuppressWarnings("deprecation") public class Lwjgl3GL30 extends Lwjgl3GL20 implements org.oscim.backend.GL30 { @Override public void readBuffer(int mode) { diff --git a/vtm-ios/src/org/oscim/ios/backend/IosGL30.java b/vtm-ios/src/org/oscim/ios/backend/IosGL30.java index 59551872..6eca0d69 100644 --- a/vtm-ios/src/org/oscim/ios/backend/IosGL30.java +++ b/vtm-ios/src/org/oscim/ios/backend/IosGL30.java @@ -15,7 +15,6 @@ package org.oscim.ios.backend; import com.badlogic.gdx.backends.iosrobovm.IOSGLES30; - import org.oscim.backend.GL30; import java.nio.Buffer; @@ -26,6 +25,7 @@ import java.nio.LongBuffer; /** * iOS specific implementation of {@link GL30}. */ +@SuppressWarnings("deprecation") public class IosGL30 extends IosGL implements GL30 { private static final IOSGLES30 iOSGL = new IOSGLES30(); diff --git a/vtm-ios/src/svg/SVGParser.java b/vtm-ios/src/svg/SVGParser.java index ace115dd..fcc387d1 100644 --- a/vtm-ios/src/svg/SVGParser.java +++ b/vtm-ios/src/svg/SVGParser.java @@ -23,8 +23,7 @@ public class SVGParser extends NSObject { public SVGParser() { } - ; - + @SuppressWarnings("deprecation") protected SVGParser(long handle) { super(handle); } diff --git a/vtm-jts/src/org/oscim/utils/geom/GeomBuilder.java b/vtm-jts/src/org/oscim/utils/geom/GeomBuilder.java index f98ea474..cc0cd32f 100644 --- a/vtm-jts/src/org/oscim/utils/geom/GeomBuilder.java +++ b/vtm-jts/src/org/oscim/utils/geom/GeomBuilder.java @@ -14,18 +14,7 @@ */ package org.oscim.utils.geom; -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 org.locationtech.jts.geom.*; import java.lang.reflect.Array; import java.util.ArrayDeque; @@ -204,7 +193,7 @@ public class GeomBuilder { */ public GeomBuilder multiPoint() { if (!cstack.isEmpty()) { - gstack.push(factory.createMultiPoint(cpopAll())); + gstack.push(factory.createMultiPointFromCoords(cpopAll())); } else { gstack.push(factory.createMultiPoint(gpopAll(Point.class))); } diff --git a/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java b/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java index cc40be22..a0494d5e 100644 --- a/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java +++ b/vtm-mvt/src/org/oscim/tiling/source/mvt/TileDecoder.java @@ -22,16 +22,7 @@ import com.wdtinc.mapbox_vector_tile.adapt.jts.MvtReader; import com.wdtinc.mapbox_vector_tile.adapt.jts.TagKeyValueMapConverter; import com.wdtinc.mapbox_vector_tile.adapt.jts.model.JtsLayer; import com.wdtinc.mapbox_vector_tile.adapt.jts.model.JtsMvt; - -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.GeometryFactory; -import org.locationtech.jts.geom.LineString; -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.*; import org.oscim.core.MapElement; import org.oscim.core.Tag; import org.oscim.core.Tile; @@ -63,6 +54,7 @@ public class TileDecoder implements ITileDecoder { mMapElement.layer = 5; } + @SuppressWarnings("unchecked") @Override public boolean decode(Tile tile, ITileDataSink sink, InputStream is) throws IOException { diff --git a/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtInput.java b/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtInput.java index 471dfd6b..68ee7994 100644 --- a/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtInput.java +++ b/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtInput.java @@ -31,6 +31,7 @@ import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.dom.client.Touch; import com.google.gwt.event.dom.client.KeyCodes; +@SuppressWarnings("deprecation") public class GwtInput implements Input { static final int MAX_TOUCHES = 20; boolean justTouched = false; diff --git a/vtm/src/org/oscim/utils/RTree.java b/vtm/src/org/oscim/utils/RTree.java index 41848781..70b2c7e1 100644 --- a/vtm/src/org/oscim/utils/RTree.java +++ b/vtm/src/org/oscim/utils/RTree.java @@ -395,6 +395,7 @@ public class RTree implements SpatialIndex, Iterable { /** * See https://github.com/mourner/rbush-knn/blob/master/index.js */ + @SuppressWarnings("unchecked") @Override public List searchKNearestNeighbors(Point center, int k, double maxDistance, List results) { if (results == null)