diff --git a/build.gradle b/build.gradle
index f23dfd942..1b38a71a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,6 @@ allprojects {
ext.gdxVersion = "1.11.0"
ext.gwtVersion = "2.8.2"
- ext.slf4jVersion = "1.7.28"
if (JavaVersion.current().isJava8Compatible()) {
tasks.withType(Javadoc) {
diff --git a/docs/Changelog.md b/docs/Changelog.md
index bcad47f8c..df0c95f8b 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -2,6 +2,7 @@
## Next version
+- Remove SLF4J dependency [#1167](https://github.com/mapsforge/vtm/pull/1167)
- Disable `vtm-ios` [#1166](https://github.com/mapsforge/vtm/pull/1166)
- [Solved issues](https://github.com/mapsforge/vtm/issues?q=is%3Aclosed+milestone%3A0.24.0)
diff --git a/docs/Integration.md b/docs/Integration.md
index 962455505..832816e35 100644
--- a/docs/Integration.md
+++ b/docs/Integration.md
@@ -24,7 +24,6 @@ repositories {
```groovy
implementation '[PACKAGE]:vtm:[CURRENT-VERSION]'
implementation '[PACKAGE]:vtm-themes:[CURRENT-VERSION]'
-implementation 'org.slf4j:slf4j-api:1.7.28'
```
### Android
@@ -148,9 +147,7 @@ implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.9'
```groovy
implementation '[PACKAGE]:vtm-jeo:[CURRENT-VERSION]'
-implementation('com.github.jeo.jeo:jeo-carto:master-SNAPSHOT') {
- exclude group: 'org.slf4j', module: 'slf4j-jdk14'
-}
+implementation 'com.github.jeo.jeo:jeo-carto:master-SNAPSHOT'
```
## Snapshots
diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle
index a2a35409c..d3de3c9de 100644
--- a/vtm-android-example/build.gradle
+++ b/vtm-android-example/build.gradle
@@ -10,7 +10,6 @@ dependencies {
implementation project(':vtm-jts')
implementation project(':vtm-mvt')
implementation project(':vtm-themes')
- implementation "org.slf4j:slf4j-android:$slf4jVersion"
implementation project(':vtm-android-gdx')
implementation project(':vtm-gdx')
diff --git a/vtm-android-example/src/org/oscim/android/test/JeoIndoorActivity.java b/vtm-android-example/src/org/oscim/android/test/JeoIndoorActivity.java
index 61538119b..bacc39fcb 100644
--- a/vtm-android-example/src/org/oscim/android/test/JeoIndoorActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/JeoIndoorActivity.java
@@ -33,17 +33,16 @@
//import org.oscim.theme.internal.VtmThemes;
//import org.oscim.theme.styles.TextStyle;
//import org.oscim.utils.IOUtils;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
//
//import java.io.IOException;
//import java.io.InputStream;
//import java.net.URL;
//import java.net.URLConnection;
//import java.util.Arrays;
+//import java.util.logging.Logger;
//
//public class JeoIndoorActivity extends BaseMapActivity {
-// public static final Logger log = LoggerFactory.getLogger(JeoIndoorActivity.class);
+// private static final Logger log = Logger.getLogger(JeoIndoorActivity.class.getName());
//
// // from http://overpass-turbo.eu/s/2vp
// String PATH = "https://gist.githubusercontent.com/anonymous/09062103a66844a96048f25626078c8d/raw/1d3af6a5a55e9ea4adc9551fa633a051a44a5a9c/overpass.geojson";
@@ -165,7 +164,7 @@
// mIndoorLayer.activeLevels[i] ^= true;
// if (v instanceof ToggleButton)
// ((ToggleButton) v).setChecked(mIndoorLayer.activeLevels[i]);
-// log.debug(Arrays.toString(mIndoorLayer.activeLevels));
+// log.fine(Arrays.toString(mIndoorLayer.activeLevels));
// mIndoorLayer.update();
// }
//
diff --git a/vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java b/vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java
index e8c83f7d4..b502b5cc7 100644
--- a/vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/MapsforgeActivity.java
@@ -56,18 +56,17 @@
import org.oscim.theme.styles.RenderStyle;
import org.oscim.tiling.source.mapfile.MapFileTileSource;
import org.oscim.tiling.source.mapfile.MapInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.List;
+import java.util.logging.Logger;
import java.util.zip.ZipInputStream;
public class MapsforgeActivity extends MapActivity {
- private static final Logger log = LoggerFactory.getLogger(MapsforgeActivity.class);
+ private static final Logger log = Logger.getLogger(MapsforgeActivity.class.getName());
static final int SELECT_MAP_FILE = 0;
private static final int SELECT_THEME_ARCHIVE = 1;
@@ -227,7 +226,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
mPrefs.clear();
}
} catch (Exception e) {
- log.error(e.toString());
+ log.severe(e.toString());
finish();
}
} else if (requestCode == SELECT_THEME_ARCHIVE) {
diff --git a/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java b/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java
index 65943391f..e1a159042 100644
--- a/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java
@@ -44,13 +44,12 @@
import org.oscim.layers.marker.MarkerItem;
import org.oscim.layers.marker.MarkerSymbol;
import org.oscim.map.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.logging.Logger;
/**
* POI search.
@@ -60,7 +59,7 @@
@SuppressWarnings("deprecation")
public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLayer.OnItemGestureListener {
- private static final Logger log = LoggerFactory.getLogger(PoiSearchActivity.class);
+ private static final Logger log = Logger.getLogger(PoiSearchActivity.class.getName());
private static final String POI_CATEGORY = "Restaurants";
private static final int SELECT_POI_FILE = MapsforgeActivity.SELECT_THEME_FILE + 1;
@@ -299,7 +298,7 @@ protected Collection doInBackground(BoundingBox... params) {
params[0].getMaxLatitude(), params[0].getMaxLongitude());
return mPersistenceManager.findInRect(bb, categoryFilter, patterns, null, Integer.MAX_VALUE, true);
} catch (Throwable t) {
- log.error(t.toString(), t);
+ log.severe(t.toString());
}
return null;
}
diff --git a/vtm-android-example/src/org/oscim/android/test/ThemeStylerActivity.java b/vtm-android-example/src/org/oscim/android/test/ThemeStylerActivity.java
index 1a6dd74be..802039e32 100644
--- a/vtm-android-example/src/org/oscim/android/test/ThemeStylerActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/ThemeStylerActivity.java
@@ -21,11 +21,11 @@
import org.oscim.theme.styles.LineStyle;
import org.oscim.theme.styles.LineStyle.LineBuilder;
import org.oscim.theme.styles.RenderStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
public class ThemeStylerActivity extends BaseMapActivity implements OnSeekBarChangeListener {
- final Logger log = LoggerFactory.getLogger(ThemeStylerActivity.class);
+ final Logger log = Logger.getLogger(ThemeStylerActivity.class.getName());
public ThemeStylerActivity() {
super(R.layout.activity_map_styler);
@@ -124,7 +124,7 @@ else if (id == R.id.seekBarV)
else if (id == R.id.seekBarH)
c.hue = progress / 100f;
- log.debug((modArea ? "area" : "line")
+ log.fine((modArea ? "area" : "line")
+ " h:" + c.hue
+ " s:" + c.saturation
+ " v:" + c.value);
diff --git a/vtm-android-mvt/src/org/oscim/android/mvt/tiling/source/mbtiles/MBTilesMvtTileDataSource.java b/vtm-android-mvt/src/org/oscim/android/mvt/tiling/source/mbtiles/MBTilesMvtTileDataSource.java
index 420510b58..5d22c4d2d 100644
--- a/vtm-android-mvt/src/org/oscim/android/mvt/tiling/source/mbtiles/MBTilesMvtTileDataSource.java
+++ b/vtm-android-mvt/src/org/oscim/android/mvt/tiling/source/mbtiles/MBTilesMvtTileDataSource.java
@@ -24,13 +24,12 @@
import org.oscim.tiling.OverzoomDataSink;
import org.oscim.tiling.QueryResult;
import org.oscim.tiling.source.mvt.TileDecoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
+import java.util.logging.Logger;
import java.util.zip.GZIPInputStream;
/**
@@ -38,7 +37,7 @@
*/
public class MBTilesMvtTileDataSource extends MBTilesTileDataSource {
- private static final Logger log = LoggerFactory.getLogger(MBTilesMvtTileDataSource.class);
+ private static final Logger log = Logger.getLogger(MBTilesMvtTileDataSource.class.getName());
private static final List SUPPORTED_FORMATS = Collections.singletonList("pbf");
private static final String WHERE_FORMAT = "zoom_level=%d AND tile_column=%d AND tile_row=%d";
@@ -65,7 +64,7 @@ public MBTilesMvtTileDataSource(String path, String language) {
try {
assertDatabaseFormat();
} catch (MBTilesUnsupportedException e) {
- log.error("Invalid MBTiles database", e);
+ log.severe("Invalid MBTiles database" + e);
}
}
@@ -135,7 +134,7 @@ public void query(MapTile requestTile, ITileDataSink requestDataSink) {
} else
responseDataSink.completed(QueryResult.TILE_NOT_FOUND);
} catch (Throwable t) {
- log.error(t.toString(), t);
+ log.severe(t.toString());
responseDataSink.completed(QueryResult.FAILED);
} finally {
if (cursor != null)
diff --git a/vtm-android/src/org/oscim/android/MapView.java b/vtm-android/src/org/oscim/android/MapView.java
index 7a6941499..1e8700efa 100644
--- a/vtm-android/src/org/oscim/android/MapView.java
+++ b/vtm-android/src/org/oscim/android/MapView.java
@@ -43,11 +43,10 @@
import org.oscim.map.Map;
import org.oscim.renderer.MapRenderer;
import org.oscim.utils.Parameters;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
+import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -60,7 +59,7 @@
*/
public class MapView extends GLSurfaceView {
- static final Logger log = LoggerFactory.getLogger(MapView.class);
+ private static final Logger log = Logger.getLogger(MapView.class.getName());
private static final Pattern GL_PATTERN = Pattern.compile("OpenGL ES (\\d(\\.\\d){0,2})");
@@ -143,7 +142,7 @@ public MapView(Context context, AttributeSet attributeSet) {
try {
setEGLContextFactory(new GlContextFactory());
} catch (Throwable t) {
- log.error("Falling back to GLES 2", t);
+ log.severe("Falling back to GLES 2" + t);
setEGLContextClientVersion(2);
}
} else
@@ -314,7 +313,7 @@ public boolean postDelayed(Runnable action, long delay) {
}
public void pause(boolean pause) {
- log.debug("pause... {}", pause);
+ log.fine("pause... " + pause);
mPausing = pause;
}
}
@@ -338,7 +337,7 @@ private int[] extractVersion(String versionString) {
version[1] = split.length < 2 ? 0 : parseInt(split[1], 0);
version[2] = split.length < 3 ? 0 : parseInt(split[2], 0);
} else {
- log.error("Invalid version string: " + versionString);
+ log.severe("Invalid version string: " + versionString);
version[0] = 2;
version[1] = 0;
version[2] = 0;
@@ -353,7 +352,7 @@ private int parseInt(String value, int defaultValue) {
try {
return Integer.parseInt(value);
} catch (NumberFormatException e) {
- log.error("Error parsing number: " + value + ", assuming: " + defaultValue);
+ log.severe("Error parsing number: " + value + ", assuming: " + defaultValue);
return defaultValue;
}
}
@@ -378,7 +377,7 @@ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
else
GLAdapter.init(new AndroidGL());
} catch (Throwable t) {
- log.error("Falling back to GLES 2", t);
+ log.severe("Falling back to GLES 2" + t);
GLAdapter.init(new AndroidGL());
}
}
diff --git a/vtm-android/src/org/oscim/android/cache/TileCache.java b/vtm-android/src/org/oscim/android/cache/TileCache.java
index 43e915aed..833625f15 100644
--- a/vtm-android/src/org/oscim/android/cache/TileCache.java
+++ b/vtm-android/src/org/oscim/android/cache/TileCache.java
@@ -27,22 +27,16 @@
import android.database.sqlite.SQLiteStatement;
import android.os.Build;
import android.os.ParcelFileDescriptor;
-
import org.oscim.core.Tile;
import org.oscim.tiling.ITileCache;
-import org.slf4j.LoggerFactory;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+
+import java.io.*;
import java.util.ArrayList;
+import java.util.logging.Logger;
public class TileCache implements ITileCache {
- static final org.slf4j.Logger log = LoggerFactory.getLogger(TileCache.class);
+ private static final Logger log = Logger.getLogger(TileCache.class.getName());
static final boolean dbg = false;
class CacheTileReader implements TileReader {
@@ -106,7 +100,7 @@ public void dispose() {
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
public TileCache(Context context, String cacheDirectory, String dbName) {
if (dbg)
- log.debug("open cache {}, {}", cacheDirectory, dbName);
+ log.fine("open cache " + cacheDirectory + ", " + dbName);
if (cacheDirectory != null)
dbName = new File(cacheDirectory, dbName).getAbsolutePath();
@@ -178,13 +172,13 @@ public SQLiteHelper(Context context, String dbName) {
@Override
public void onCreate(SQLiteDatabase db) {
- log.debug("create table");
+ log.fine("create table");
db.execSQL(TILE_SCHEMA);
}
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- log.debug("drop table");
+ log.fine("drop table");
db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
onCreate(db);
}
@@ -207,7 +201,7 @@ public void saveTile(Tile tile, ByteArrayOutputStream data, boolean success) {
}
if (dbg)
- log.debug("store tile {} {}", tile, Boolean.valueOf(success));
+ log.fine("store tile " + tile + " " + success);
if (!success)
return;
@@ -237,14 +231,14 @@ public TileReader getTileApi11(Tile tile) {
ParcelFileDescriptor result = mStmtGetTile.simpleQueryForBlobFileDescriptor();
in = new FileInputStream(result.getFileDescriptor());
} catch (SQLiteDoneException e) {
- log.debug("not in cache {}", tile);
+ log.fine("not in cache " + tile);
return null;
} finally {
mStmtGetTile.clearBindings();
}
if (dbg)
- log.debug("load tile {}", tile);
+ log.fine("load tile " + tile);
return new CacheTileReader(tile, in);
}
@@ -267,7 +261,7 @@ public synchronized TileReader getTile(Tile tile) {
if (!cursor.moveToFirst()) {
if (dbg)
- log.debug("not in cache {}", tile);
+ log.fine("not in cache " + tile);
cursor.close();
return null;
@@ -277,7 +271,7 @@ public synchronized TileReader getTile(Tile tile) {
cursor.close();
if (dbg)
- log.debug("load tile {}", tile);
+ log.fine("load tile " + tile);
return new CacheTileReader(tile, in);
}
diff --git a/vtm-android/src/org/oscim/android/gl/GlContextFactory.java b/vtm-android/src/org/oscim/android/gl/GlContextFactory.java
index 4f80a685d..99aba1e26 100644
--- a/vtm-android/src/org/oscim/android/gl/GlContextFactory.java
+++ b/vtm-android/src/org/oscim/android/gl/GlContextFactory.java
@@ -29,13 +29,12 @@
import android.opengl.GLSurfaceView;
import org.oscim.android.MapView;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.egl.EGLContext;
import javax.microedition.khronos.egl.EGLDisplay;
+import java.util.logging.Logger;
/**
* https://developer.android.com/guide/topics/graphics/opengl.html#version-check
@@ -44,7 +43,7 @@
*/
public class GlContextFactory implements GLSurfaceView.EGLContextFactory {
- private static final Logger log = LoggerFactory.getLogger(GlContextFactory.class);
+ private static final Logger log = Logger.getLogger(GlContextFactory.class.getName());
private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
@@ -57,7 +56,7 @@ public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConf
boolean success = checkEglError("After eglCreateContext " + MapView.OPENGL_VERSION, egl);
if ((!success || context == null) && MapView.OPENGL_VERSION > 2) {
- log.warn("Falling back to GLES 2");
+ log.warning("Falling back to GLES 2");
MapView.OPENGL_VERSION = 2.0;
return createContext(egl, display, eglConfig);
}
@@ -75,7 +74,7 @@ private static boolean checkEglError(String prompt, EGL10 egl) {
boolean result = true;
while ((error = egl.eglGetError()) != EGL10.EGL_SUCCESS) {
result = false;
- log.error(String.format("%s: EGL error: 0x%x", prompt, error));
+ log.severe(String.format("%s: EGL error: 0x%x", prompt, error));
}
return result;
}
diff --git a/vtm-android/src/org/oscim/android/tiling/source/mbtiles/MBTilesBitmapTileDataSource.java b/vtm-android/src/org/oscim/android/tiling/source/mbtiles/MBTilesBitmapTileDataSource.java
index 86905682b..c5be6b74c 100644
--- a/vtm-android/src/org/oscim/android/tiling/source/mbtiles/MBTilesBitmapTileDataSource.java
+++ b/vtm-android/src/org/oscim/android/tiling/source/mbtiles/MBTilesBitmapTileDataSource.java
@@ -27,20 +27,19 @@
import org.oscim.layers.tile.MapTile;
import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.QueryResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.Arrays;
import java.util.List;
+import java.util.logging.Logger;
/**
* A tile data source for MBTiles raster databases.
*/
public class MBTilesBitmapTileDataSource extends MBTilesTileDataSource {
- private static final Logger log = LoggerFactory.getLogger(MBTilesBitmapTileDataSource.class);
+ private static final Logger log = Logger.getLogger(MBTilesBitmapTileDataSource.class.getName());
private static final List SUPPORTED_FORMATS = Arrays.asList("png", "jpg", "jpeg");
@@ -62,7 +61,7 @@ public MBTilesBitmapTileDataSource(String path, Integer alpha, Integer transpare
try {
assertDatabaseFormat();
} catch (MBTilesUnsupportedException e) {
- log.error("Invalid MBTiles database", e);
+ log.severe("Invalid MBTiles database" + e);
}
}
@@ -125,7 +124,7 @@ public void query(MapTile tile, ITileDataSink sink) {
sink.setTileImage(bitmap);
res = QueryResult.SUCCESS;
} catch (Throwable t) {
- log.error(t.toString(), t);
+ log.severe(t.toString());
} finally {
sink.completed(res);
}
diff --git a/vtm-app/build.gradle b/vtm-app/build.gradle
index 4c4636190..3d2fb6044 100644
--- a/vtm-app/build.gradle
+++ b/vtm-app/build.gradle
@@ -6,7 +6,6 @@ dependencies {
implementation project(':vtm-themes')
// https://github.com/square/okhttp/issues/4481
implementation 'com.squareup.okhttp3:okhttp:3.12.13'
- implementation "org.slf4j:slf4j-android:$slf4jVersion"
}
android {
diff --git a/vtm-desktop-lwjgl/src/org/oscim/gdx/GdxMapApp.java b/vtm-desktop-lwjgl/src/org/oscim/gdx/GdxMapApp.java
index 4f494f98a..f5d0ae456 100644
--- a/vtm-desktop-lwjgl/src/org/oscim/gdx/GdxMapApp.java
+++ b/vtm-desktop-lwjgl/src/org/oscim/gdx/GdxMapApp.java
@@ -31,13 +31,9 @@
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import org.oscim.utils.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class GdxMapApp extends GdxMap {
- public static final Logger log = LoggerFactory.getLogger(GdxMapApp.class);
-
public static void init() {
// load native library
new SharedLibraryLoader().load("vtm-jni");
diff --git a/vtm-desktop-lwjgl3/src/org/oscim/gdx/GdxMapApp.java b/vtm-desktop-lwjgl3/src/org/oscim/gdx/GdxMapApp.java
index 7277ef353..ad5b6dd67 100644
--- a/vtm-desktop-lwjgl3/src/org/oscim/gdx/GdxMapApp.java
+++ b/vtm-desktop-lwjgl3/src/org/oscim/gdx/GdxMapApp.java
@@ -31,13 +31,9 @@
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import org.oscim.utils.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class GdxMapApp extends GdxMap {
- public static final Logger log = LoggerFactory.getLogger(GdxMapApp.class);
-
public static void init() {
// load native library
new SharedLibraryLoader().load("vtm-jni");
diff --git a/vtm-desktop/src/org/oscim/awt/AwtBitmap.java b/vtm-desktop/src/org/oscim/awt/AwtBitmap.java
index aefb4f2bf..4e233d8e5 100644
--- a/vtm-desktop/src/org/oscim/awt/AwtBitmap.java
+++ b/vtm-desktop/src/org/oscim/awt/AwtBitmap.java
@@ -20,30 +20,25 @@
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.BufferUtils;
-
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.renderer.bucket.TextureBucket;
import org.oscim.utils.GraphicUtils;
import org.oscim.utils.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.awt.AlphaComposite;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
+import javax.imageio.ImageIO;
+import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.IntBuffer;
-
-import javax.imageio.ImageIO;
+import java.util.logging.Logger;
public class AwtBitmap implements Bitmap {
- private static final Logger log = LoggerFactory.getLogger(AwtBitmap.class);
+ private static final Logger log = Logger.getLogger(AwtBitmap.class.getName());
BufferedImage bitmap;
@@ -167,7 +162,7 @@ public byte[] getPngEncodedData() {
ImageIO.write(this.bitmap, "png", outputStream);
return outputStream.toByteArray();
} catch (IOException e) {
- log.error(e.toString(), e);
+ log.severe(e.toString());
} finally {
IOUtils.closeQuietly(outputStream);
}
diff --git a/vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java
index 4f2fda4dd..278412302 100644
--- a/vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java
+++ b/vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java
@@ -20,34 +20,23 @@
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
-
import org.oscim.core.GeometryBuffer.GeometryType;
import org.oscim.core.MapElement;
import org.oscim.core.Tile;
import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.source.ITileDecoder;
import org.oscim.utils.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.LinkedHashMap;
-import static com.fasterxml.jackson.core.JsonToken.END_ARRAY;
-import static com.fasterxml.jackson.core.JsonToken.END_OBJECT;
-import static com.fasterxml.jackson.core.JsonToken.FIELD_NAME;
-import static com.fasterxml.jackson.core.JsonToken.START_ARRAY;
-import static com.fasterxml.jackson.core.JsonToken.START_OBJECT;
-import static com.fasterxml.jackson.core.JsonToken.VALUE_NUMBER_FLOAT;
-import static com.fasterxml.jackson.core.JsonToken.VALUE_NUMBER_INT;
-import static com.fasterxml.jackson.core.JsonToken.VALUE_STRING;
+import static com.fasterxml.jackson.core.JsonToken.*;
import static org.oscim.core.MercatorProjection.latitudeToY;
import static org.oscim.core.MercatorProjection.longitudeToX;
public class GeoJsonTileDecoder implements ITileDecoder {
- static final Logger log = LoggerFactory.getLogger(GeoJsonTileDecoder.class);
private final MapElement mMapElement;
private final GeoJsonTileSource mTileSource;
diff --git a/vtm-extras/src/org/oscim/tiling/source/geojson/OsmLanduseJsonTileSource.java b/vtm-extras/src/org/oscim/tiling/source/geojson/OsmLanduseJsonTileSource.java
index c8c60e8a8..17e4ca598 100644
--- a/vtm-extras/src/org/oscim/tiling/source/geojson/OsmLanduseJsonTileSource.java
+++ b/vtm-extras/src/org/oscim/tiling/source/geojson/OsmLanduseJsonTileSource.java
@@ -19,14 +19,11 @@
import org.oscim.core.GeometryBuffer.GeometryType;
import org.oscim.core.MapElement;
import org.oscim.core.Tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.LinkedHashMap;
import java.util.Map;
public class OsmLanduseJsonTileSource extends GeoJsonTileSource {
- static final Logger log = LoggerFactory.getLogger(OsmLanduseJsonTileSource.class);
public OsmLanduseJsonTileSource() {
super("http://tile.openstreetmap.us/vectiles-land-usages");
diff --git a/vtm-extras/src/org/oscim/tiling/source/geojson/OsmRoadLabelJsonTileSource.java b/vtm-extras/src/org/oscim/tiling/source/geojson/OsmRoadLabelJsonTileSource.java
index 35b042ec5..8803f8cd0 100644
--- a/vtm-extras/src/org/oscim/tiling/source/geojson/OsmRoadLabelJsonTileSource.java
+++ b/vtm-extras/src/org/oscim/tiling/source/geojson/OsmRoadLabelJsonTileSource.java
@@ -18,15 +18,11 @@
import org.oscim.core.MapElement;
import org.oscim.core.Tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.Map;
public class OsmRoadLabelJsonTileSource extends GeoJsonTileSource {
- static final Logger log = LoggerFactory.getLogger(OsmRoadLabelJsonTileSource.class);
-
public OsmRoadLabelJsonTileSource() {
super("http://tile.openstreetmap.us/vectiles-skeletron");
}
diff --git a/vtm-extras/src/org/oscim/tiling/source/geojson/OsmRoadLineJsonTileSource.java b/vtm-extras/src/org/oscim/tiling/source/geojson/OsmRoadLineJsonTileSource.java
index 48587aca9..e42e934fb 100644
--- a/vtm-extras/src/org/oscim/tiling/source/geojson/OsmRoadLineJsonTileSource.java
+++ b/vtm-extras/src/org/oscim/tiling/source/geojson/OsmRoadLineJsonTileSource.java
@@ -18,15 +18,11 @@
import org.oscim.core.MapElement;
import org.oscim.core.Tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.Map;
public class OsmRoadLineJsonTileSource extends GeoJsonTileSource {
- static final Logger log = LoggerFactory.getLogger(OsmRoadLineJsonTileSource.class);
-
Tag mTagTunnel = new Tag("tunnel", Tag.VALUE_YES);
Tag mTagBridge = new Tag("bridge", Tag.VALUE_YES);
diff --git a/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
index 62618e051..fb70c7f65 100644
--- a/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
+++ b/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
@@ -24,16 +24,15 @@
import org.oscim.tiling.source.PbfDecoder;
import org.oscim.utils.pool.Inlist;
import org.oscim.utils.pool.Pool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.logging.Logger;
import java.util.zip.InflaterInputStream;
public class TileDecoder extends PbfDecoder {
- static final Logger log = LoggerFactory.getLogger(TileDecoder.class);
+ private static final Logger log = Logger.getLogger(TileDecoder.class.getName());
private static final int TAG_TILE_LAYERS = 3;
@@ -76,7 +75,7 @@ public boolean decode(Tile tile, ITileDataSink mapDataCallback, InputStream is)
throws IOException {
if (debug)
- log.debug(tile + " decode");
+ log.fine(tile + " decode");
setInputStream(new InflaterInputStream(is));
mTile = tile;
diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
index ea55d0707..4601c37d0 100644
--- a/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
+++ b/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
@@ -22,17 +22,16 @@
import org.oscim.core.Tile;
import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.source.PbfDecoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.logging.Logger;
public class TileDecoder extends PbfDecoder {
- static final Logger log = LoggerFactory.getLogger(TileDecoder.class);
+ private static final Logger log = Logger.getLogger(TileDecoder.class.getName());
private static final float REF_TILE_SIZE = 4096.0f;
@@ -121,7 +120,7 @@ private boolean decode() throws IOException {
break;
default:
- log.debug("invalid type for tile: " + tag);
+ log.fine("invalid type for tile: " + tag);
return false;
}
}
@@ -190,14 +189,14 @@ private boolean decodeTileWays(boolean polygon) throws IOException {
case TAG_WAY_COORDS:
if (coordCnt == 0) {
- log.debug(mTile + " no coordinates");
+ log.fine(mTile + " no coordinates");
}
mElem.ensurePointSize(coordCnt, false);
int cnt = decodeInterleavedPoints(mElem.points, mScale);
if (cnt != coordCnt) {
- log.debug(mTile + " wrong number of coordintes "
+ log.fine(mTile + " wrong number of coordinates "
+ coordCnt + "/" + cnt);
fail = true;
}
@@ -221,12 +220,12 @@ private boolean decodeTileWays(boolean polygon) throws IOException {
break;
default:
- log.debug("X invalid type for way: " + tag);
+ log.fine("X invalid type for way: " + tag);
}
}
if (fail || indexCnt == 0 || tagCnt == 0) {
- log.debug("failed reading way: bytes:" + bytes + " index:"
+ log.fine("failed reading way: bytes:" + bytes + " index:"
//+ (tags != null ? tags.toString() : "...") + " "
+ indexCnt + " " + coordCnt + " " + tagCnt);
return false;
@@ -266,7 +265,7 @@ private boolean decodeTileNodes() throws IOException {
case TAG_NODE_COORDS:
int cnt = decodeNodeCoordinates(coordCnt, layer);
if (cnt != coordCnt) {
- log.debug("X wrong number of coordintes");
+ log.fine("X wrong number of coordinates");
return false;
}
break;
@@ -284,7 +283,7 @@ private boolean decodeTileNodes() throws IOException {
break;
default:
- log.debug("X invalid type for node: " + tag);
+ log.fine("X invalid type for node: " + tag);
}
}
@@ -333,7 +332,7 @@ private boolean decodeWayTags(int tagCnt) throws IOException {
int tagNum = decodeVarint32();
if (tagNum < 0 || cnt == tagCnt) {
- log.debug("NULL TAG: " + mTile
+ log.fine("NULL TAG: " + mTile
+ " invalid tag:" + tagNum
+ " " + tagCnt + "/" + cnt);
continue;
@@ -349,7 +348,7 @@ private boolean decodeWayTags(int tagCnt) throws IOException {
if (tagNum >= 0 && tagNum < max) {
mElem.tags.add(curTags[tagNum]);
} else {
- log.debug("NULL TAG: " + mTile
+ log.fine("NULL TAG: " + mTile
+ " could find tag:"
+ tagNum + " " + tagCnt
+ "/" + cnt);
@@ -357,7 +356,7 @@ private boolean decodeWayTags(int tagCnt) throws IOException {
}
if (tagCnt != cnt) {
- log.debug("NULL TAG: " + mTile);
+ log.fine("NULL TAG: " + mTile);
return false;
}
diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java b/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
index 2f1c442b4..48fbc20de 100644
--- a/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
+++ b/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
@@ -27,12 +27,11 @@
import org.oscim.tiling.source.PbfDecoder;
import org.oscim.tiling.source.UrlTileDataSource;
import org.oscim.tiling.source.UrlTileSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
+import java.util.logging.Logger;
public class OSciMap2TileSource extends UrlTileSource {
@@ -46,7 +45,7 @@ public ITileDataSource getDataSource() {
}
static class TileDecoder extends PbfDecoder {
- static final Logger log = LoggerFactory.getLogger(TileDecoder.class);
+ private static final Logger log = Logger.getLogger(TileDecoder.class.getName());
private static final int TAG_TILE_NUM_TAGS = 1;
private static final int TAG_TILE_TAG_KEYS = 2;
private static final int TAG_TILE_TAG_VALUES = 3;
@@ -133,7 +132,7 @@ public boolean decode(Tile tile, ITileDataSink sink, InputStream is)
break;
default:
- log.debug(mTile + " invalid type for tile: " + tag);
+ log.fine(mTile + " invalid type for tile: " + tag);
return false;
}
}
@@ -153,7 +152,7 @@ private boolean decodeTileTags() throws IOException {
else
tag = new Tag(key, tagString, true);
if (debug)
- log.debug(mTile + " add tag: " + curTag + " " + tag);
+ log.fine(mTile + " add tag: " + curTag + " " + tag);
mTileTags.add(tag);
@@ -222,14 +221,14 @@ private boolean decodeTileElement(int type) throws IOException {
case TAG_ELEM_COORDS:
if (coordCnt == 0) {
- log.debug(mTile + " no coordinates");
+ log.fine(mTile + " no coordinates");
}
mElem.ensurePointSize(coordCnt, false);
int cnt = decodeInterleavedPoints(mElem, mScale);
if (cnt != coordCnt) {
- log.debug(mTile + " wrong number of coordintes");
+ log.fine(mTile + " wrong number of coordinates");
fail = true;
}
break;
@@ -254,12 +253,12 @@ private boolean decodeTileElement(int type) throws IOException {
break;
default:
- log.debug(mTile + " invalid type for way: " + tag);
+ log.fine(mTile + " invalid type for way: " + tag);
}
}
if (fail || indexCnt == 0) {
- log.debug(mTile + " failed reading way: bytes:" + bytes + " index:"
+ log.fine(mTile + " failed reading way: bytes:" + bytes + " index:"
+ (Arrays.toString(index)) + " tag:"
+ (mElem.tags.size() > 0 ? Arrays.deepToString(mElem.tags.getTags()) : "null")
+ " " + indexCnt + " " + coordCnt);
@@ -296,7 +295,7 @@ private boolean decodeElementTags() throws IOException {
int tagNum = decodeVarint32();
if (tagNum < 0) {
- log.debug("NULL TAG: " + mTile
+ log.fine("NULL TAG: " + mTile
+ " invalid tag:"
+ tagNum + " " + cnt);
return false;
@@ -309,7 +308,7 @@ private boolean decodeElementTags() throws IOException {
tagNum -= Tags.LIMIT;
if (tagNum < 0 || tagNum > max) {
- log.debug("NULL TAG: " + mTile
+ log.fine("NULL TAG: " + mTile
+ " could not find tag:"
+ tagNum + " " + cnt);
return false;
@@ -319,7 +318,7 @@ private boolean decodeElementTags() throws IOException {
}
if (cnt == 0) {
- log.debug("got no TAG!");
+ log.fine("got no TAG!");
return false;
}
return true;
diff --git a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelLayer.java b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelLayer.java
index 27e496dda..3b0c94478 100644
--- a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelLayer.java
+++ b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelLayer.java
@@ -20,7 +20,6 @@
import com.badlogic.gdx.graphics.g3d.ModelInstance;
import com.badlogic.gdx.graphics.g3d.model.Node;
import com.badlogic.gdx.utils.Array;
-
import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection;
import org.oscim.core.Tile;
@@ -30,17 +29,16 @@
import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.map.Map;
import org.oscim.model.VtmModels;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.HashMap;
+import java.util.logging.Logger;
/**
* Experimental layer to display 3d models.
*/
public class GdxModelLayer extends Layer implements Map.UpdateListener {
- private static final Logger log = LoggerFactory.getLogger(GdxModelLayer.class);
+ private static final Logger log = Logger.getLogger(GdxModelLayer.class.getName());
private static final int MIN_ZOOM = BuildingLayer.MIN_ZOOM;
@@ -93,7 +91,7 @@ private void doneLoading() {
for (ModelHolder poiModel : mScenes.values()) {
Model model = mAssets.get(poiModel.getPath());
for (Node node : model.nodes) {
- log.debug("loader node " + node.id);
+ log.fine("loader node " + node.id);
/* Use with {@link GdxRenderer3D} */
if (node.hasChildren() && ((Object) mG3d) instanceof GdxRenderer3D) {
@@ -101,7 +99,7 @@ private void doneLoading() {
throw new RuntimeException("Model has more than one node with GdxRenderer: " + model.toString());
}
node = node.getChild(0);
- log.debug("loader node " + node.id);
+ log.fine("loader node " + node.id);
model.nodes.removeIndex(0);
model.nodes.add(node);
diff --git a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelRenderer.java b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelRenderer.java
index 0ab8d7d4a..6068a5a36 100644
--- a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelRenderer.java
+++ b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxModelRenderer.java
@@ -1,11 +1,6 @@
package org.oscim.gdx.poi3d;
-import com.badlogic.gdx.graphics.g3d.Environment;
-import com.badlogic.gdx.graphics.g3d.Model;
-import com.badlogic.gdx.graphics.g3d.ModelBatch;
-import com.badlogic.gdx.graphics.g3d.ModelInstance;
-import com.badlogic.gdx.graphics.g3d.Renderable;
-import com.badlogic.gdx.graphics.g3d.Shader;
+import com.badlogic.gdx.graphics.g3d.*;
import com.badlogic.gdx.graphics.g3d.attributes.ColorAttribute;
import com.badlogic.gdx.graphics.g3d.environment.DirectionalLight;
import com.badlogic.gdx.graphics.g3d.utils.DefaultShaderProvider;
@@ -13,7 +8,6 @@
import com.badlogic.gdx.graphics.g3d.utils.RenderContext;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.Array;
-
import org.oscim.backend.GL;
import org.oscim.core.Tile;
import org.oscim.map.Map;
@@ -21,13 +15,10 @@
import org.oscim.renderer.GLState;
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.LayerRenderer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.backend.GLAdapter.gl;
public class GdxModelRenderer extends LayerRenderer {
- static final Logger log = LoggerFactory.getLogger(GdxModelRenderer.class);
ModelBatch modelBatch;
public MapCamera cam;
diff --git a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java
index 52b53f682..891685b10 100644
--- a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java
+++ b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D.java
@@ -1,11 +1,6 @@
package org.oscim.gdx.poi3d;
-import com.badlogic.gdx.graphics.g3d.Environment;
-import com.badlogic.gdx.graphics.g3d.Model;
-import com.badlogic.gdx.graphics.g3d.ModelBatch;
-import com.badlogic.gdx.graphics.g3d.ModelInstance;
-import com.badlogic.gdx.graphics.g3d.Renderable;
-import com.badlogic.gdx.graphics.g3d.Shader;
+import com.badlogic.gdx.graphics.g3d.*;
import com.badlogic.gdx.graphics.g3d.attributes.ColorAttribute;
import com.badlogic.gdx.graphics.g3d.environment.DirectionalLight;
import com.badlogic.gdx.graphics.g3d.shaders.DefaultShader;
@@ -14,7 +9,6 @@
import com.badlogic.gdx.graphics.g3d.utils.RenderContext;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.Array;
-
import org.oscim.backend.GL;
import org.oscim.core.Tile;
import org.oscim.map.Map;
@@ -23,13 +17,10 @@
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.LayerRenderer;
import org.oscim.utils.geom.GeometryUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.backend.GLAdapter.gl;
public class GdxRenderer3D extends LayerRenderer {
- static final Logger log = LoggerFactory.getLogger(GdxRenderer3D.class);
ModelBatch modelBatch;
public MapCamera cam;
diff --git a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D2.java b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D2.java
index b14b05443..09240c85e 100644
--- a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D2.java
+++ b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/GdxRenderer3D2.java
@@ -25,7 +25,6 @@
import com.badlogic.gdx.graphics.g3d.utils.DefaultShaderProvider;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.Array;
-
import org.oscim.backend.GL;
import org.oscim.core.Tile;
import org.oscim.map.Map;
@@ -34,8 +33,6 @@
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.LayerRenderer;
import org.oscim.utils.geom.GeometryUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.backend.GLAdapter.gl;
@@ -43,7 +40,6 @@
* Gdx renderer for more complex 3D models.
*/
public class GdxRenderer3D2 extends LayerRenderer {
- static final Logger log = LoggerFactory.getLogger(GdxRenderer3D2.class);
ModelBatch modelBatch;
public MapCamera cam;
diff --git a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/Poi3DLayer.java b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/Poi3DLayer.java
index 39c2fe09c..91f762f2c 100644
--- a/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/Poi3DLayer.java
+++ b/vtm-gdx-poi3d/src/org/oscim/gdx/poi3d/Poi3DLayer.java
@@ -21,14 +21,7 @@
import com.badlogic.gdx.graphics.g3d.ModelInstance;
import com.badlogic.gdx.graphics.g3d.model.Node;
import com.badlogic.gdx.utils.Array;
-
-import org.oscim.core.Box;
-import org.oscim.core.GeometryBuffer;
-import org.oscim.core.MapElement;
-import org.oscim.core.MapPosition;
-import org.oscim.core.MercatorProjection;
-import org.oscim.core.Tag;
-import org.oscim.core.Tile;
+import org.oscim.core.*;
import org.oscim.event.Event;
import org.oscim.gdx.GdxAssets;
import org.oscim.layers.Layer;
@@ -46,23 +39,17 @@
import org.oscim.utils.geom.GeometryUtils;
import org.oscim.utils.geom.TileClipper;
import org.oscim.utils.pool.Inlist;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
+
+import java.util.*;
import java.util.Map.Entry;
-import java.util.Set;
+import java.util.logging.Logger;
/**
* Experimental Layer to display POIs with 3D models.
*/
public class Poi3DLayer extends Layer implements Map.UpdateListener, ZoomLimiter.IZoomLimiter {
- private static final Logger log = LoggerFactory.getLogger(Poi3DLayer.class);
+ private static final Logger log = Logger.getLogger(Poi3DLayer.class.getName());
static class Poi3DTileData extends TileData {
public final HashMap> symbols = new HashMap<>();
@@ -294,7 +281,7 @@ private void doneLoading() {
for (ModelHolder holder : holders) {
Model model = mAssets.get(holder.getPath());
for (Node node : model.nodes) {
- log.debug("loader node " + node.id);
+ log.fine("loader node " + node.id);
/* Use with {@link GdxRenderer3D} */
if (node.hasChildren() && ((Object) mG3d) instanceof GdxRenderer3D) {
@@ -302,7 +289,7 @@ private void doneLoading() {
throw new RuntimeException("Model has more than one node with GdxRenderer: " + model.toString());
}
node = node.getChild(0);
- log.debug("loader node " + node.id);
+ log.fine("loader node " + node.id);
model.nodes.removeIndex(0);
model.nodes.add(node);
@@ -432,7 +419,7 @@ public void onMapEvent(Event ev, MapPosition pos) {
if (instances.size == 0)
continue;
- log.debug("add " + t + " " + instances.size);
+ log.fine("add " + t + " " + instances.size);
changed = true;
@@ -452,7 +439,7 @@ public void onMapEvent(Event ev, MapPosition pos) {
removed.addAll(instances);
mTileMap.remove(t);
- log.debug("remove " + t);
+ log.fine("remove " + t);
}
mPrevTiles.releaseTiles();
diff --git a/vtm-gdx/src/org/oscim/gdx/GdxAssets.java b/vtm-gdx/src/org/oscim/gdx/GdxAssets.java
index 591d8c3a3..85f9df9c1 100644
--- a/vtm-gdx/src/org/oscim/gdx/GdxAssets.java
+++ b/vtm-gdx/src/org/oscim/gdx/GdxAssets.java
@@ -21,15 +21,13 @@
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.GdxRuntimeException;
-
import org.oscim.backend.AssetAdapter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.InputStream;
+import java.util.logging.Logger;
public class GdxAssets extends AssetAdapter {
- private static final Logger log = LoggerFactory.getLogger(GdxAssets.class);
+ private static final Logger log = Logger.getLogger(GdxAssets.class.getName());
static String pathPrefix = "";
@@ -46,7 +44,7 @@ public InputStream openFileAsStream(String fileName) {
try {
return file.read();
} catch (GdxRuntimeException e) {
- log.debug(e.toString());
+ log.fine(e.toString());
return null;
}
}
diff --git a/vtm-gdx/src/org/oscim/gdx/GdxMap.java b/vtm-gdx/src/org/oscim/gdx/GdxMap.java
index b7f2586f3..06a5e26c1 100644
--- a/vtm-gdx/src/org/oscim/gdx/GdxMap.java
+++ b/vtm-gdx/src/org/oscim/gdx/GdxMap.java
@@ -36,12 +36,12 @@
import org.oscim.theme.internal.VtmThemes;
import org.oscim.tiling.TileSource;
import org.oscim.utils.Parameters;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
public abstract class GdxMap implements ApplicationListener {
- private static final Logger log = LoggerFactory.getLogger(GdxMap.class);
+ private static final Logger log = Logger.getLogger(GdxMap.class.getName());
protected Map mMap;
protected GestureDetector mGestureDetector;
diff --git a/vtm-http/src/org/oscim/tiling/source/OkHttpEngine.java b/vtm-http/src/org/oscim/tiling/source/OkHttpEngine.java
index be4877a21..2678fc9a1 100644
--- a/vtm-http/src/org/oscim/tiling/source/OkHttpEngine.java
+++ b/vtm-http/src/org/oscim/tiling/source/OkHttpEngine.java
@@ -23,8 +23,6 @@
import okhttp3.Request;
import okhttp3.Response;
import org.oscim.core.Tile;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -32,10 +30,11 @@
import java.io.OutputStream;
import java.net.URL;
import java.util.Map.Entry;
+import java.util.logging.Logger;
public class OkHttpEngine implements HttpEngine {
- private static final Logger log = LoggerFactory.getLogger(OkHttpEngine.class);
+ private static final Logger log = Logger.getLogger(OkHttpEngine.class.getName());
private final OkHttpClient mClient;
private final UrlTileSource mTileSource;
@@ -89,7 +88,7 @@ public void sendRequest(Tile tile) throws IOException {
} else
mInputStream = response.body().byteStream();
} catch (Exception e) {
- log.error(e.toString(), e);
+ log.severe(e.toString());
}
}
@@ -101,7 +100,7 @@ public void close() {
try {
mInputStream.close();
} catch (Exception e) {
- log.error(e.toString(), e);
+ log.severe(e.toString());
}
mInputStream = null;
}
@@ -112,7 +111,7 @@ public void setCache(OutputStream os) {
try {
os.write(mCachedData);
} catch (IOException e) {
- log.error(e.toString(), e);
+ log.severe(e.toString());
}
}
}
diff --git a/vtm-ios-example/build.gradle b/vtm-ios-example/build.gradle
index f42df311e..a0eeb7ef3 100644
--- a/vtm-ios-example/build.gradle
+++ b/vtm-ios-example/build.gradle
@@ -26,7 +26,6 @@ createIPA.dependsOn build
dependencies {
implementation project(':vtm-ios')
implementation project(':vtm-jts')
- implementation "org.slf4j:slf4j-simple:$slf4jVersion"
}
task copyVtmResources(type: Copy) {
diff --git a/vtm-jeo/build.gradle b/vtm-jeo/build.gradle
index 97f8be449..20b197e24 100644
--- a/vtm-jeo/build.gradle
+++ b/vtm-jeo/build.gradle
@@ -3,9 +3,7 @@ apply plugin: 'maven-publish'
dependencies {
api project(':vtm')
- api('com.github.jeo.jeo:jeo-carto:master-SNAPSHOT') {
- exclude group: 'org.slf4j', module: 'slf4j-jdk14'
- }
+ api 'com.github.jeo.jeo:jeo-carto:master-SNAPSHOT'
}
sourceSets {
diff --git a/vtm-jeo/src/org/oscim/layers/JeoTileSource.java b/vtm-jeo/src/org/oscim/layers/JeoTileSource.java
index c84ba9af1..06a53c68f 100644
--- a/vtm-jeo/src/org/oscim/layers/JeoTileSource.java
+++ b/vtm-jeo/src/org/oscim/layers/JeoTileSource.java
@@ -24,21 +24,20 @@
import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.TileSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.util.logging.Logger;
import static org.oscim.tiling.QueryResult.*;
public class JeoTileSource extends TileSource {
- static final Logger log = LoggerFactory.getLogger(JeoTileSource.class);
+ private static final Logger log = Logger.getLogger(JeoTileSource.class.getName());
final TileDataset mTileDataset;
public JeoTileSource(TileDataset tileDataset) {
- log.debug("load tileset {}", tileDataset.name());
+ log.fine("load tileset " + tileDataset.name());
mTileDataset = tileDataset;
//mTileDataset.pyramid().
mZoomMax = 1;
@@ -51,26 +50,26 @@ public ITileDataSource getDataSource() {
@Override
public void query(MapTile tile, ITileDataSink sink) {
- log.debug("query {}", tile);
+ log.fine("query " + tile);
try {
Tile t = mTileDataset.read(tile.zoomLevel, tile.tileX,
// flip Y axis
(1 << tile.zoomLevel) - 1 - tile.tileY);
if (t == null) {
- log.debug("not found {}", tile);
+ log.fine("not found " + tile);
sink.completed(TILE_NOT_FOUND);
return;
}
Bitmap b = CanvasAdapter.decodeBitmap(new ByteArrayInputStream(t.data()));
sink.setTileImage(b);
- log.debug("success {}", tile);
+ log.fine("success " + tile);
sink.completed(SUCCESS);
return;
} catch (IOException e) {
e.printStackTrace();
}
- log.debug("fail {}", tile);
+ log.fine("fail " + tile);
sink.completed(FAILED);
}
diff --git a/vtm-jeo/src/org/oscim/layers/JeoVectorLayer.java b/vtm-jeo/src/org/oscim/layers/JeoVectorLayer.java
index 9c43ca0bf..5833611b6 100644
--- a/vtm-jeo/src/org/oscim/layers/JeoVectorLayer.java
+++ b/vtm-jeo/src/org/oscim/layers/JeoVectorLayer.java
@@ -30,14 +30,13 @@
import org.oscim.renderer.bucket.MeshBucket;
import org.oscim.theme.styles.AreaStyle;
import org.oscim.theme.styles.LineStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.logging.Logger;
public class JeoVectorLayer extends JtsLayer {
- public static final Logger log = LoggerFactory.getLogger(JeoVectorLayer.class);
+ private static final Logger log = Logger.getLogger(JeoVectorLayer.class.getName());
static final boolean dbg = false;
private final VectorDataset mDataset;
@@ -53,7 +52,7 @@ public JeoVectorLayer(Map map, VectorDataset data, Style style) {
mRules = style.getRules().selectById(data.name(), true).flatten();
//mRules = style.getRules().selectById("way", true).flatten();
- log.debug(mRules.toString());
+ log.fine(mRules.toString());
mRenderer = new Renderer();
}
@@ -71,10 +70,10 @@ protected void processFeatures(Task t, Envelope b) {
try {
VectorQuery q = new VectorQuery().bounds(b);
if (dbg)
- log.debug("query {}", b);
+ log.fine("query " + b);
for (Feature f : mDataset.read(q)) {
if (dbg)
- log.debug("feature {}", f);
+ log.fine("feature " + f);
RuleList rs = mRules.match(f);
if (rs.isEmpty())
@@ -115,7 +114,7 @@ protected void processFeatures(Task t, Envelope b) {
}
}
} catch (IOException e) {
- log.error("Error querying layer " + mDataset.name() + e);
+ log.severe("Error querying layer " + mDataset.name() + e);
}
}
diff --git a/vtm-jts/src/org/oscim/layers/vector/VectorLayer.java b/vtm-jts/src/org/oscim/layers/vector/VectorLayer.java
index e21bd69a6..3dce0e636 100644
--- a/vtm-jts/src/org/oscim/layers/vector/VectorLayer.java
+++ b/vtm-jts/src/org/oscim/layers/vector/VectorLayer.java
@@ -40,13 +40,12 @@
import org.oscim.utils.QuadTree;
import org.oscim.utils.SpatialIndex;
import org.oscim.utils.geom.GeomBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.logging.Logger;
import static org.oscim.core.MercatorProjection.latitudeToY;
import static org.oscim.core.MercatorProjection.longitudeToX;
@@ -60,7 +59,7 @@
*/
public class VectorLayer extends AbstractVectorLayer implements GestureListener {
- public static final Logger log = LoggerFactory.getLogger(VectorLayer.class);
+ private static final Logger log = Logger.getLogger(VectorLayer.class.getName());
private static final int STROKE_MIN_ZOOM = 12;
@@ -182,7 +181,7 @@ public synchronized void remove(Geometry geometry) {
}
if (toRemove == null) {
- log.error("Can't find geometry to remove.");
+ log.severe("Can't find geometry to remove.");
return;
}
diff --git a/vtm-playground/build.gradle b/vtm-playground/build.gradle
index 015c38420..884704e8d 100644
--- a/vtm-playground/build.gradle
+++ b/vtm-playground/build.gradle
@@ -14,7 +14,6 @@ dependencies {
implementation project(':vtm-models')
implementation project(':vtm-mvt')
implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
- implementation "org.slf4j:slf4j-jdk14:$slf4jVersion"
}
sourceSets {
diff --git a/vtm-playground/src/org/oscim/test/RuleVisitorTest.java b/vtm-playground/src/org/oscim/test/RuleVisitorTest.java
index c84720b45..e6f1d2ef7 100644
--- a/vtm-playground/src/org/oscim/test/RuleVisitorTest.java
+++ b/vtm-playground/src/org/oscim/test/RuleVisitorTest.java
@@ -32,14 +32,11 @@
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.OkHttpEngine;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.utils.ColorUtil.saturate;
public class RuleVisitorTest extends GdxMapApp {
- final Logger log = LoggerFactory.getLogger(RuleVisitorTest.class);
RenderTheme mTheme;
double mSaturation = 1;
diff --git a/vtm-playground/src/org/oscim/test/TileRenderTest.java b/vtm-playground/src/org/oscim/test/TileRenderTest.java
index 80171f578..9ae7fd6c4 100644
--- a/vtm-playground/src/org/oscim/test/TileRenderTest.java
+++ b/vtm-playground/src/org/oscim/test/TileRenderTest.java
@@ -35,8 +35,12 @@
import org.oscim.tiling.source.OkHttpEngine;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
+import java.util.logging.Logger;
+
public class TileRenderTest extends GdxMapApp {
+ private static final Logger log = Logger.getLogger(TileRenderTest.class.getName());
+
static boolean loadOneTile = true;
// static int tileX = 34365 >> 2;
// static int tileY = 21333 >> 2;
@@ -107,9 +111,9 @@ public void createLayers() {
mMap.setBaseMap(tileLayer);
mMap.setTheme(VtmThemes.DEFAULT);
- log.debug("load tiles:");
+ log.fine("load tiles:");
if (loadOneTile) {
- log.debug("load {}", tile);
+ log.fine("load " + tile);
tileLoader[0].loadTile(tile);
tileManager.jobCompleted(tile, QueryResult.SUCCESS);
@@ -117,7 +121,7 @@ public void createLayers() {
tileManager.update(mapPosition);
MapTile t = tileManager.getTileJob();
while (t != null) {
- log.debug("load {}", t);
+ log.fine("load " + t);
tileLoader[0].loadTile(t);
tileManager.jobCompleted(t, QueryResult.SUCCESS);
diff --git a/vtm-playground/src/org/oscim/test/renderer/AtlasTest.java b/vtm-playground/src/org/oscim/test/renderer/AtlasTest.java
index 4e67117c8..49c98f1e3 100644
--- a/vtm-playground/src/org/oscim/test/renderer/AtlasTest.java
+++ b/vtm-playground/src/org/oscim/test/renderer/AtlasTest.java
@@ -30,10 +30,9 @@
import org.oscim.renderer.bucket.TextItem;
import org.oscim.theme.styles.LineStyle;
import org.oscim.theme.styles.TextStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.Arrays;
+import java.util.logging.Logger;
public class AtlasTest extends GdxMapApp {
@@ -50,7 +49,7 @@ public static void main(String[] args) {
static class AtlasRenderLayer extends BucketRenderer {
- Logger log = LoggerFactory.getLogger(AtlasRenderLayer.class);
+ Logger log = Logger.getLogger(AtlasRenderLayer.class.getName());
public AtlasRenderLayer() {
@@ -79,7 +78,7 @@ public AtlasRenderLayer() {
int h = (int) (20 + Math.random() * 56);
Rect r = mAtlas.getRegion(w, h);
if (r == null) {
- log.debug("no space left");
+ log.fine("no space left");
continue;
}
r.x += 1;
@@ -110,7 +109,7 @@ public AtlasRenderLayer() {
points[8] = r.x;
points[9] = r.y;
- log.debug("add region: " + Arrays.toString(points));
+ log.fine("add region: " + Arrays.toString(points));
ll2.addLine(points, 10, false);
TextItem ti = TextItem.pool.get();
diff --git a/vtm-tests/build.gradle b/vtm-tests/build.gradle
index a2bc7ddde..92fae8832 100644
--- a/vtm-tests/build.gradle
+++ b/vtm-tests/build.gradle
@@ -7,7 +7,6 @@ dependencies {
testImplementation 'junit:junit:4.12'
testImplementation 'org.easytesting:fest-assert-core:2.0M10'
testImplementation 'org.mockito:mockito-all:1.10.19'
- testImplementation "org.slf4j:slf4j-jdk14:$slf4jVersion"
}
sourceSets {
diff --git a/vtm/build.gradle b/vtm/build.gradle
index 943142b30..53fe2b24c 100644
--- a/vtm/build.gradle
+++ b/vtm/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'maven-publish'
dependencies {
compileOnly 'net.sf.kxml:kxml2:2.3.0'
- api "org.slf4j:slf4j-api:$slf4jVersion"
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
}
diff --git a/vtm/src/org/oscim/backend/CanvasAdapter.java b/vtm/src/org/oscim/backend/CanvasAdapter.java
index e59988924..fbe960b25 100644
--- a/vtm/src/org/oscim/backend/CanvasAdapter.java
+++ b/vtm/src/org/oscim/backend/CanvasAdapter.java
@@ -23,20 +23,19 @@
import org.oscim.backend.canvas.Canvas;
import org.oscim.backend.canvas.Paint;
import org.oscim.theme.XmlThemeResourceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Locale;
+import java.util.logging.Logger;
/**
* The Class CanvasAdapter.
*/
public abstract class CanvasAdapter {
- private static final Logger log = LoggerFactory.getLogger(CanvasAdapter.class);
+ private static final Logger log = Logger.getLogger(CanvasAdapter.class.getName());
private static final String PREFIX_ASSETS = "assets:";
public static final String PREFIX_FILE = "file:";
@@ -184,7 +183,7 @@ protected static Bitmap createBitmap(String relativePathPrefix, String src, XmlT
try {
inputStream = resourceProvider.createInputStream(relativePathPrefix, src);
} catch (IOException ioe) {
- log.debug("Exception trying to access resource: " + src + " using custom provider: " + ioe);
+ log.fine("Exception trying to access resource: " + src + " using custom provider: " + ioe);
// Ignore and try to resolve input stream using the standard process
}
}
@@ -212,7 +211,7 @@ protected static Bitmap createBitmap(String relativePathPrefix, String src, XmlT
}
if (inputStream == null) {
- log.error("invalid resource: " + src);
+ log.severe("invalid resource: " + src);
return null;
}
diff --git a/vtm/src/org/oscim/layers/CustomRenderLayer.java b/vtm/src/org/oscim/layers/CustomRenderLayer.java
index a62fba3e8..fdfad4fb8 100644
--- a/vtm/src/org/oscim/layers/CustomRenderLayer.java
+++ b/vtm/src/org/oscim/layers/CustomRenderLayer.java
@@ -22,12 +22,12 @@
import org.oscim.map.Map.UpdateListener;
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.LayerRenderer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
public class CustomRenderLayer extends Layer implements UpdateListener {
- static final Logger log = LoggerFactory.getLogger(CustomRenderLayer.class);
+ private static final Logger log = Logger.getLogger(CustomRenderLayer.class.getName());
class CustomRenderer extends LayerRenderer {
@@ -40,7 +40,7 @@ public void update(GLViewport v) {
currentState = someConccurentVariable;
compile();
}
- log.debug("state " + currentState);
+ log.fine("state " + currentState);
}
diff --git a/vtm/src/org/oscim/layers/tile/JobQueue.java b/vtm/src/org/oscim/layers/tile/JobQueue.java
index 5d52bbfce..602edbb37 100644
--- a/vtm/src/org/oscim/layers/tile/JobQueue.java
+++ b/vtm/src/org/oscim/layers/tile/JobQueue.java
@@ -16,19 +16,16 @@
*/
package org.oscim.layers.tile;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.logging.Logger;
-import static org.oscim.layers.tile.MapTile.State.CANCEL;
-import static org.oscim.layers.tile.MapTile.State.LOADING;
-import static org.oscim.layers.tile.MapTile.State.NONE;
+import static org.oscim.layers.tile.MapTile.State.*;
/**
* A JobQueue keeps the list of pending jobs for a MapView and prioritizes them.
*/
public class JobQueue {
- static final Logger log = LoggerFactory.getLogger(JobQueue.class);
+ private static final Logger log = Logger.getLogger(JobQueue.class.getName());
private int mCurrentJob = 0;
private MapTile[] mJobs;
@@ -56,7 +53,7 @@ public synchronized void clear() {
if (t.state(LOADING | CANCEL)) {
t.setState(NONE);
} else {
- log.debug("Wrong tile in queue {} {}", t, t.state());
+ log.fine("Wrong tile in queue " + t + " " + t.state());
}
tiles[i] = null;
}
diff --git a/vtm/src/org/oscim/layers/tile/MapTile.java b/vtm/src/org/oscim/layers/tile/MapTile.java
index 1765bfa76..1a1a30d5b 100644
--- a/vtm/src/org/oscim/layers/tile/MapTile.java
+++ b/vtm/src/org/oscim/layers/tile/MapTile.java
@@ -25,15 +25,10 @@
import org.oscim.utils.pool.Inlist;
import org.oscim.utils.quadtree.TileIndex;
import org.oscim.utils.quadtree.TreeNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import static org.oscim.layers.tile.MapTile.State.CANCEL;
-import static org.oscim.layers.tile.MapTile.State.DEADBEEF;
-import static org.oscim.layers.tile.MapTile.State.LOADING;
-import static org.oscim.layers.tile.MapTile.State.NEW_DATA;
-import static org.oscim.layers.tile.MapTile.State.NONE;
-import static org.oscim.layers.tile.MapTile.State.READY;
+import java.util.logging.Logger;
+
+import static org.oscim.layers.tile.MapTile.State.*;
/**
* Extends Tile class to hold state and data.
@@ -43,7 +38,7 @@
*/
public class MapTile extends Tile {
- static final Logger log = LoggerFactory.getLogger(MapTile.class);
+ private static final Logger log = Logger.getLogger(MapTile.class.getName());
public static class TileNode extends TreeNode {
}
@@ -195,7 +190,7 @@ boolean isLocked() {
*/
void lock() {
if (state == DEADBEEF) {
- log.debug("Locking dead tile {}", this);
+ log.fine("Locking dead tile " + this);
return;
}
@@ -265,7 +260,7 @@ void unlock() {
proxy = 0;
if (state == DEADBEEF) {
- log.debug("Unlock dead tile {}", this);
+ log.fine("Unlock dead tile " + this);
clear();
}
}
diff --git a/vtm/src/org/oscim/layers/tile/TileLoader.java b/vtm/src/org/oscim/layers/tile/TileLoader.java
index 838dec5f5..075f9f5bd 100644
--- a/vtm/src/org/oscim/layers/tile/TileLoader.java
+++ b/vtm/src/org/oscim/layers/tile/TileLoader.java
@@ -22,16 +22,12 @@
import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.QueryResult;
import org.oscim.utils.PausableThread;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.tiling.QueryResult.FAILED;
import static org.oscim.tiling.QueryResult.SUCCESS;
public abstract class TileLoader extends PausableThread implements ITileDataSink {
- static final Logger log = LoggerFactory.getLogger(TileLoader.class);
-
private static int id;
private final String THREAD_NAME;
diff --git a/vtm/src/org/oscim/layers/tile/TileManager.java b/vtm/src/org/oscim/layers/tile/TileManager.java
index 8a99a0b0e..551791f78 100644
--- a/vtm/src/org/oscim/layers/tile/TileManager.java
+++ b/vtm/src/org/oscim/layers/tile/TileManager.java
@@ -30,24 +30,18 @@
import org.oscim.tiling.QueryResult;
import org.oscim.utils.ScanBox;
import org.oscim.utils.quadtree.TileIndex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.logging.Logger;
-import static org.oscim.layers.tile.MapTile.State.CANCEL;
-import static org.oscim.layers.tile.MapTile.State.DEADBEEF;
-import static org.oscim.layers.tile.MapTile.State.LOADING;
-import static org.oscim.layers.tile.MapTile.State.NEW_DATA;
-import static org.oscim.layers.tile.MapTile.State.NONE;
-import static org.oscim.layers.tile.MapTile.State.READY;
+import static org.oscim.layers.tile.MapTile.State.*;
import static org.oscim.utils.FastMath.clamp;
public class TileManager {
- static final Logger log = LoggerFactory.getLogger(TileManager.class);
+ private static final Logger log = Logger.getLogger(TileManager.class.getName());
static final boolean dbg = false;
public static final Event TILE_LOADED = new Event();
@@ -382,7 +376,7 @@ public boolean update(MapPosition pos) {
if (BufferObject.isMaxFill()) {
mCacheReduce += 10;
if (dbg)
- log.debug("reduce cache {}", (mCacheLimit - mCacheReduce));
+ log.fine("reduce cache " + (mCacheLimit - mCacheReduce));
} else {
mCacheReduce = 0;
}
@@ -481,7 +475,7 @@ private void addToCache(MapTile tile) {
}
if (mTilesEnd == mTiles.length) {
- log.debug("realloc tiles {}", mTilesEnd);
+ log.fine("realloc tiles " + mTilesEnd);
MapTile[] tmp = new MapTile[mTiles.length + 20];
System.arraycopy(mTiles, 0, tmp, 0, mTilesCount);
mTiles = tmp;
@@ -497,8 +491,7 @@ private boolean removeFromCache(MapTile t) {
* TileLoader thread, defer clearing to jobCompleted() */
if (dbg)
- log.debug("remove from cache {} {} {}",
- t, t.state(), t.isLocked());
+ log.fine("remove from cache " + t + " " + t.state() + " " + t.isLocked());
if (t.isLocked())
return false;
@@ -529,7 +522,7 @@ private void limitCache(MapPosition pos, int remove) {
newTileCnt++;
if (t.state(DEADBEEF)) {
- log.debug("found DEADBEEF {}", t);
+ log.fine("found DEADBEEF " + t);
t.clear();
tiles[i] = null;
continue;
@@ -560,8 +553,7 @@ private void limitCache(MapPosition pos, int remove) {
* try again in next run. */
if (t.isLocked()) {
if (dbg)
- log.debug("{} locked (state={}, d={})",
- t, t.state(), t.distance);
+ log.fine(t + " locked (state=" + t.state() + ", d=" + t.distance + ")");
continue;
}
@@ -573,7 +565,7 @@ private void limitCache(MapPosition pos, int remove) {
if (t.state(LOADING)) {
t.setState(CANCEL);
if (dbg)
- log.debug("{} canceled (d={})", t, t.distance);
+ log.fine(t + " canceled (d=" + t.distance + ")");
continue;
}
@@ -581,11 +573,11 @@ private void limitCache(MapPosition pos, int remove) {
if (t.state(NEW_DATA)) {
newTileCnt--;
if (dbg)
- log.debug("{} unused (d=({})", t, t.distance);
+ log.fine(t + " unused (d=(" + t.distance + ")");
}
if (!t.state(READY | NEW_DATA)) {
- log.error("stuff that should be here! {} {}", t, t.state());
+ log.severe("stuff that should be here! " + t + " " + t.state());
}
if (removeFromCache(t)) {
@@ -646,9 +638,7 @@ public void run() {
return;
}
// TODO use mMap.update(true) to retry tile loading?
- log.debug("Load: {} {} state:{}",
- tile, result,
- tile.state());
+ log.fine("Load: " + tile + " " + result + " state: " + tile.state());
/* got orphaned tile */
if (tile.state(DEADBEEF)) {
@@ -709,7 +699,7 @@ protected void setVisible(int y, int x1, int x2) {
MapTile tile = null;
if (cnt == maxTiles) {
- log.debug("too many tiles {}", maxTiles);
+ log.fine("too many tiles " + maxTiles);
break;
}
int xx = x;
diff --git a/vtm/src/org/oscim/layers/tile/TileRenderer.java b/vtm/src/org/oscim/layers/tile/TileRenderer.java
index 8ab434db4..2c5fd3454 100644
--- a/vtm/src/org/oscim/layers/tile/TileRenderer.java
+++ b/vtm/src/org/oscim/layers/tile/TileRenderer.java
@@ -24,15 +24,12 @@
import org.oscim.renderer.MapRenderer;
import org.oscim.renderer.bucket.RenderBuckets;
import org.oscim.utils.ScanBox;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.layers.tile.MapTile.PROXY_PARENT;
import static org.oscim.layers.tile.MapTile.State.NEW_DATA;
import static org.oscim.layers.tile.MapTile.State.READY;
public abstract class TileRenderer extends LayerRenderer {
- static final Logger log = LoggerFactory.getLogger(TileRenderer.class);
/**
* fade-in time
diff --git a/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java b/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java
index 2a467778c..447a7f255 100644
--- a/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java
+++ b/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java
@@ -23,32 +23,22 @@
import org.oscim.renderer.GLMatrix;
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.MapRenderer;
-import org.oscim.renderer.bucket.BitmapBucket;
-import org.oscim.renderer.bucket.CircleBucket;
-import org.oscim.renderer.bucket.HairLineBucket;
-import org.oscim.renderer.bucket.LineBucket;
-import org.oscim.renderer.bucket.LineTexBucket;
-import org.oscim.renderer.bucket.MeshBucket;
-import org.oscim.renderer.bucket.PolygonBucket;
-import org.oscim.renderer.bucket.RenderBucket;
-import org.oscim.renderer.bucket.RenderBuckets;
+import org.oscim.renderer.bucket.*;
import org.oscim.utils.FastMath;
+import java.util.logging.Logger;
+
import static org.oscim.backend.GLAdapter.gl;
import static org.oscim.layers.tile.MapTile.PROXY_GRAMPA;
import static org.oscim.layers.tile.MapTile.PROXY_PARENT;
import static org.oscim.layers.tile.MapTile.State.READY;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
-import static org.oscim.renderer.bucket.RenderBucket.BITMAP;
-import static org.oscim.renderer.bucket.RenderBucket.CIRCLE;
-import static org.oscim.renderer.bucket.RenderBucket.HAIRLINE;
-import static org.oscim.renderer.bucket.RenderBucket.LINE;
-import static org.oscim.renderer.bucket.RenderBucket.MESH;
-import static org.oscim.renderer.bucket.RenderBucket.POLYGON;
-import static org.oscim.renderer.bucket.RenderBucket.TEXLINE;
+import static org.oscim.renderer.bucket.RenderBucket.*;
public class VectorTileRenderer extends TileRenderer {
+ private static final Logger log = Logger.getLogger(VectorTileRenderer.class.getName());
+
static final boolean debugOverdraw = false;
protected int mClipMode;
@@ -226,7 +216,7 @@ private void drawTile(MapTile tile, GLViewport v, int proxyLevel) {
break;
default:
/* just in case */
- log.error("unknown layer {}", b.type);
+ log.severe("unknown layer " + b.type);
b = b.next;
break;
}
diff --git a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
index 14c69d108..aa926fa16 100644
--- a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
@@ -29,13 +29,9 @@
import org.oscim.renderer.bucket.TextureItem.TexturePool;
import org.oscim.tiling.TileSource;
import org.oscim.utils.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class BitmapTileLayer extends TileLayer {
- protected static final Logger log = LoggerFactory.getLogger(BitmapTileLayer.class);
-
private static final int CACHE_LIMIT = 40;
/**
diff --git a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLoader.java b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLoader.java
index 78563fbab..14cbcdc15 100644
--- a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLoader.java
+++ b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLoader.java
@@ -24,14 +24,14 @@
import org.oscim.renderer.bucket.RenderBuckets;
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.TileSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.layers.tile.MapTile.State.LOADING;
public class BitmapTileLoader extends TileLoader {
- protected static final Logger log = LoggerFactory.getLogger(BitmapTileLoader.class);
+ private static final Logger log = Logger.getLogger(BitmapTileLoader.class.getName());
private final ITileDataSource mTileDataSource;
private final BitmapTileLayer mLayer;
@@ -47,7 +47,7 @@ protected boolean loadTile(MapTile tile) {
try {
mTileDataSource.query(tile, this);
} catch (Exception e) {
- log.debug("{} {}", tile, e.toString());
+ log.fine(tile + " " + e);
return false;
}
return true;
diff --git a/vtm/src/org/oscim/layers/tile/buildings/BuildingRenderer.java b/vtm/src/org/oscim/layers/tile/buildings/BuildingRenderer.java
index 314a3ef2a..588b4da22 100644
--- a/vtm/src/org/oscim/layers/tile/buildings/BuildingRenderer.java
+++ b/vtm/src/org/oscim/layers/tile/buildings/BuildingRenderer.java
@@ -18,18 +18,12 @@
*/
package org.oscim.layers.tile.buildings;
-import org.oscim.layers.tile.MapTile;
-import org.oscim.layers.tile.TileDistanceSort;
-import org.oscim.layers.tile.TileRenderer;
-import org.oscim.layers.tile.TileSet;
-import org.oscim.layers.tile.ZoomLimiter;
+import org.oscim.layers.tile.*;
import org.oscim.renderer.ExtrusionRenderer;
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.MapRenderer;
import org.oscim.renderer.bucket.ExtrusionBuckets;
import org.oscim.renderer.bucket.RenderBuckets;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
@@ -40,7 +34,6 @@
import static org.oscim.utils.FastMath.clamp;
public class BuildingRenderer extends ExtrusionRenderer {
- static final Logger log = LoggerFactory.getLogger(BuildingRenderer.class);
private final TileRenderer mTileRenderer;
private final TileSet mTileSet;
diff --git a/vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java b/vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java
index 8c3bb63ad..c54f611a9 100644
--- a/vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java
+++ b/vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java
@@ -23,12 +23,11 @@
import org.oscim.theme.styles.ExtrusionStyle;
import org.oscim.utils.ExtrusionUtils;
import org.oscim.utils.geom.GeometryUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.logging.Logger;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
@@ -37,7 +36,7 @@
*/
public class S3DBLayer extends BuildingLayer {
- private static final Logger log = LoggerFactory.getLogger(S3DBLayer.class);
+ private static final Logger log = Logger.getLogger(S3DBLayer.class.getName());
private final float TILE_SCALE = (ExtrusionUtils.REF_TILE_SIZE / (Tile.SIZE * COORD_SCALE));
@@ -329,7 +328,7 @@ else if ((v = getTransformedValue(element, Tag.KEY_ROOF_MATERIAL)) != null)
get(tile).addMeshElement(specialParts, groundScale, buildingColor);
}
} else {
- log.debug("Roof calculation failed: " + element.toString());
+ log.fine("Roof calculation failed: " + element);
}
}
}
diff --git a/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLoader.java b/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLoader.java
index b57d9cce2..c8c2bc346 100644
--- a/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLoader.java
+++ b/vtm/src/org/oscim/layers/tile/buildings/S3DBTileLoader.java
@@ -29,11 +29,11 @@
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.QueryResult;
import org.oscim.tiling.TileSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
class S3DBTileLoader extends TileLoader {
- static final Logger log = LoggerFactory.getLogger(S3DBTileLoader.class);
+ private static final Logger log = Logger.getLogger(S3DBTileLoader.class.getName());
private static final Color.HSV HSV = new Color.HSV(0f, 0.5f, 1.2f);
@@ -89,7 +89,7 @@ protected boolean loadTile(MapTile tile) {
/* query database, which calls process() callback */
mTileDataSource.query(mTile, this);
} catch (Exception e) {
- log.debug("{}", e);
+ log.fine(e.toString());
return false;
}
@@ -114,7 +114,7 @@ private void initTile(MapTile tile) {
public void process(MapElement element) {
if (element.type != GeometryType.TRIS) {
- log.debug("wrong type " + element.type);
+ log.fine("wrong type " + element.type);
return;
}
diff --git a/vtm/src/org/oscim/layers/tile/buildings/S3DBUtils.java b/vtm/src/org/oscim/layers/tile/buildings/S3DBUtils.java
index c4e5dc042..903dabc2f 100644
--- a/vtm/src/org/oscim/layers/tile/buildings/S3DBUtils.java
+++ b/vtm/src/org/oscim/layers/tile/buildings/S3DBUtils.java
@@ -24,16 +24,15 @@
import org.oscim.utils.Tessellator;
import org.oscim.utils.geom.GeometryUtils;
import org.oscim.utils.math.MathUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.*;
+import java.util.logging.Logger;
/**
* Provides utils for S3DB layers.
*/
public final class S3DBUtils {
- private static final Logger log = LoggerFactory.getLogger(S3DBUtils.class);
+ private static final Logger log = Logger.getLogger(S3DBUtils.class.getName());
// Toggle this to debug and improve ridge calculation, you can see the faults in map then.
private static final boolean IMPROVE_RIDGE_CALCULATION = false;
@@ -73,7 +72,7 @@ private static void addSnapRidgePoint(int id, float[] point, TreeMap 1) {
if (ridgePoints.get(currentRidgeInd) == null) {
- log.debug("Gabled intersection calc failed");
+ log.fine("Gabled intersection calc failed");
currentRidgeInd = null;
continue;
}
intersection = GeometryUtils.intersectionLines2D(ridgePoints.get(currentRidgeInd), ridgeLines.get(currentRidgeInd), point3Fs.get(shift), normVectors.get(shift));
if (intersection == null) {
- log.debug("Gabled intersection calc failed");
+ log.fine("Gabled intersection calc failed");
currentRidgeInd = null;
continue;
}
@@ -614,7 +613,7 @@ public static boolean calcRidgeMesh(GeometryBuffer element, float minHeight, flo
Map.Entry ridgeEntry = ridgeIt.next();
Integer key = ridgeEntry.getKey();
if (ridgeEntry.getValue() == null) {
- log.debug("Ridge calculation failed at point " + key);
+ log.fine("Ridge calculation failed at point " + key);
ridgeIt.remove();
continue;
}
@@ -1126,7 +1125,7 @@ public static int getColor(String color, Color.HSV hsv, boolean relative) {
else {
Integer css = ColorsCSS.get(color);
if (css == null) {
- log.debug("unknown color:{}", color);
+ log.fine("unknown color: " + color);
c = Color.CYAN;
} else
c = css;
@@ -1345,7 +1344,7 @@ public static int getMaterialColor(String material, Color.HSV hsv, boolean relat
break;
default:
c = Color.CYAN;
- log.debug("unknown material:{}", material);
+ log.fine("unknown material: " + material);
break;
}
}
diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
index 40be175d3..11ed044ad 100644
--- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
@@ -28,8 +28,8 @@
import org.oscim.tiling.TileSource.OpenResult;
import org.oscim.utils.pool.Inlist.List;
import org.oscim.utils.pool.LList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
/**
* The vector-tile-map layer. This class manages instances of
@@ -37,7 +37,7 @@
* for rendering.
*/
public class VectorTileLayer extends TileLayer {
- static final Logger log = LoggerFactory.getLogger(VectorTileLayer.class);
+ private static final Logger log = Logger.getLogger(VectorTileLayer.class.getName());
private final List> mLoaderProcessHooks = new List<>();
@@ -87,7 +87,7 @@ public boolean setTileSource(TileSource tileSource) {
OpenResult msg = tileSource.open();
if (msg != OpenResult.SUCCESS) {
- log.debug(msg.getErrorMessage());
+ log.fine(msg.getErrorMessage());
return false;
}
diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
index 747cf3c4b..04110805a 100644
--- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
+++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
@@ -27,14 +27,14 @@
import org.oscim.theme.styles.*;
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.QueryResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.layers.tile.MapTile.State.LOADING;
public class VectorTileLoader extends TileLoader implements RenderStyle.Callback {
- static final Logger log = LoggerFactory.getLogger(VectorTileLoader.class);
+ private static final Logger log = Logger.getLogger(VectorTileLoader.class.getName());
protected static final double STROKE_INCREASE = 1.4;
protected static final byte LAYERS = 11;
@@ -93,12 +93,12 @@ public void cancel() {
public boolean loadTile(MapTile tile) {
if (mTileDataSource == null) {
- log.error("no tile source is set");
+ log.severe("no tile source is set");
return false;
}
renderTheme = mTileLayer.getTheme();
if (renderTheme == null) {
- log.error("no theme is set");
+ log.severe("no theme is set");
return false;
}
@@ -119,10 +119,10 @@ public boolean loadTile(MapTile tile) {
/* query data source, which calls process() callback */
mTileDataSource.query(tile, this);
} catch (NullPointerException e) {
- log.debug("NPE {} {}", tile, e.toString());
+ log.fine("NPE " + tile + " " + e);
e.printStackTrace();
} catch (Throwable t) {
- log.debug("{} {}", tile, t.toString());
+ log.fine(tile + " " + t);
t.printStackTrace();
return false;
}
@@ -229,7 +229,7 @@ public void renderWay(LineStyle line, int level) {
int nLevel = mCurBucket + level;
if (line.outline && mCurLineBucket == null) {
- log.debug("missing line for outline! " + mElement.tags
+ log.fine("missing line for outline! " + mElement.tags
+ " lvl:" + level + " layer:" + mElement.layer);
return;
}
diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
index 40dc9eb1b..ce2cc2148 100644
--- a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
@@ -34,8 +34,6 @@
public class LabelLayer extends Layer implements Map.UpdateListener, TileManager.Listener,
ZoomLimiter.IZoomLimiter {
- //private static final Logger log = LoggerFactory.getLogger(LabelLayer.class);
-
static final String LABEL_DATA = LabelLayer.class.getName();
private static final long MAX_RELABEL_DELAY = 100;
diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java
index 68ec15264..fcdec38cf 100644
--- a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java
+++ b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java
@@ -34,8 +34,6 @@
import org.oscim.utils.FastMath;
import org.oscim.utils.Parameters;
import org.oscim.utils.geom.OBB2D;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
@@ -45,7 +43,6 @@
public class LabelPlacement {
static final boolean dbg = false;
- static final Logger log = LoggerFactory.getLogger(LabelPlacement.class);
public static final LabelTileData getLabels(MapTile tile) {
return (LabelTileData) tile.getData(LabelLayer.LABEL_DATA);
diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java b/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java
index e08c03fe4..ad0fdd350 100644
--- a/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java
@@ -36,11 +36,8 @@
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.bucket.RenderBucket;
import org.oscim.renderer.bucket.TextureBucket;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
class TextRenderer extends BucketRenderer {
- static final Logger log = LoggerFactory.getLogger(TextRenderer.class);
static final boolean dbg = false;
private final Worker mWorker;
diff --git a/vtm/src/org/oscim/layers/vector/AbstractVectorLayer.java b/vtm/src/org/oscim/layers/vector/AbstractVectorLayer.java
index 9de0acf35..0a78561ff 100644
--- a/vtm/src/org/oscim/layers/vector/AbstractVectorLayer.java
+++ b/vtm/src/org/oscim/layers/vector/AbstractVectorLayer.java
@@ -32,11 +32,8 @@
import org.oscim.renderer.bucket.RenderBuckets;
import org.oscim.utils.async.SimpleWorker;
import org.oscim.utils.geom.TileClipper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AbstractVectorLayer extends Layer implements UpdateListener {
- public static final Logger log = LoggerFactory.getLogger(AbstractVectorLayer.class);
protected static final double UNSCALE_COORD = 4;
diff --git a/vtm/src/org/oscim/map/Animator.java b/vtm/src/org/oscim/map/Animator.java
index 0f3690b7f..44f470baf 100644
--- a/vtm/src/org/oscim/map/Animator.java
+++ b/vtm/src/org/oscim/map/Animator.java
@@ -27,15 +27,15 @@
import org.oscim.utils.ThreadUtils;
import org.oscim.utils.animation.Easing;
import org.oscim.utils.async.Task;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.core.MercatorProjection.latitudeToY;
import static org.oscim.core.MercatorProjection.longitudeToX;
import static org.oscim.utils.FastMath.clamp;
public class Animator {
- static final Logger log = LoggerFactory.getLogger(Animator.class);
+ private static final Logger log = Logger.getLogger(Animator.class.getName());
public static final int ANIM_NONE = 0;
public static final int ANIM_MOVE = 1 << 0;
@@ -89,7 +89,7 @@ public synchronized void animateTo(long duration, BoundingBox bbox, Easing.Type
double dy = Math.abs(latitudeToY(bbox.getMinLatitude())
- latitudeToY(bbox.getMaxLatitude()));
- log.debug("anim bbox " + bbox);
+ log.fine("anim bbox " + bbox);
double zx = mMap.getWidth() / (dx * Tile.SIZE);
double zy = mMap.getHeight() / (dy * Tile.SIZE);
@@ -248,7 +248,7 @@ public void animateFling(float velocityX, float velocityY,
mVelocity.x = clamp(mVelocity.x, xmin, xmax);
mVelocity.y = clamp(mVelocity.y, ymin, ymax);
if (Double.isNaN(mVelocity.x) || Double.isNaN(mVelocity.y)) {
- log.debug("fling NaN!");
+ log.fine("fling NaN!");
return;
}
@@ -280,7 +280,7 @@ void updateAnimation() {
/* cancel animation when position was changed since last
* update, i.e. when it was modified outside the animator. */
if (v.getMapPosition(mCurPos)) {
- log.debug("cancel anim - changed");
+ log.fine("cancel anim - changed");
cancel();
return;
}
diff --git a/vtm/src/org/oscim/map/Animator2.java b/vtm/src/org/oscim/map/Animator2.java
index 1ac0f9ab1..c91df9f07 100644
--- a/vtm/src/org/oscim/map/Animator2.java
+++ b/vtm/src/org/oscim/map/Animator2.java
@@ -28,13 +28,13 @@
import org.oscim.utils.ThreadUtils;
import org.oscim.utils.animation.DragForce;
import org.oscim.utils.animation.Easing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.utils.FastMath.clamp;
public class Animator2 extends Animator {
- private static final Logger log = LoggerFactory.getLogger(Animator2.class);
+ private static final Logger log = Logger.getLogger(Animator2.class.getName());
private static final int ANIM_KINETIC = 1 << 5;
@@ -203,7 +203,7 @@ public void kineticScroll(float velocityX, float velocityY,
velocityX = clamp(velocityX, xmin, xmax);
velocityY = clamp(velocityY, ymin, ymax);
if (Float.isNaN(velocityX) || Float.isNaN(velocityY)) {
- log.debug("fling NaN!");
+ log.fine("fling NaN!");
return;
}
@@ -228,7 +228,7 @@ void updateAnimation() {
/* cancel animation when position was changed since last
* update, i.e. when it was modified outside the animator. */
if (v.getMapPosition(mCurPos)) {
- log.debug("cancel anim - changed");
+ log.fine("cancel anim - changed");
cancel();
return;
}
diff --git a/vtm/src/org/oscim/map/Layers.java b/vtm/src/org/oscim/map/Layers.java
index 6bdde295d..f3fa6f93e 100644
--- a/vtm/src/org/oscim/map/Layers.java
+++ b/vtm/src/org/oscim/map/Layers.java
@@ -29,18 +29,17 @@
import org.oscim.map.Map.InputListener;
import org.oscim.map.Map.UpdateListener;
import org.oscim.renderer.LayerRenderer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Logger;
public final class Layers extends AbstractList {
- private static final Logger log = LoggerFactory.getLogger(Layers.class);
+ private static final Logger log = Logger.getLogger(Layers.class.getName());
private final Map mMap;
private final Layer.EnableHandler mEnableHandler;
@@ -81,7 +80,7 @@ public synchronized int size() {
@Override
public synchronized void add(int index, Layer layer) {
if (mLayerList.contains(layer)) {
- log.warn("layer already exists");
+ log.warning("layer already exists");
return;
}
@@ -117,12 +116,12 @@ public synchronized void add(int index, Layer layer) {
*/
public synchronized void add(Layer layer, int group) {
if (mLayerList.contains(layer)) {
- log.warn("layer already exists");
+ log.warning("layer already exists");
return;
}
int index = mGroupList.indexOf(group);
if (index < 0) {
- log.warn("unknown / adding layer group" + group);
+ log.warning("unknown / adding layer group" + group);
addGroup(group);
}
@@ -180,7 +179,7 @@ public synchronized Layer remove(int index) {
@Override
public synchronized Layer set(int index, Layer layer) {
if (mLayerList.contains(layer)) {
- log.warn("layer already exists");
+ log.warning("layer already exists");
return layer;
}
@@ -239,7 +238,7 @@ public synchronized Layer set(int index, Layer layer) {
public synchronized void addGroup(int group) {
if (mGroupList.contains(group)) {
- log.warn("group " + group + " already exists");
+ log.warning("group " + group + " already exists");
return;
}
@@ -345,7 +344,7 @@ public synchronized void updateLayers() {
mDirtyLayers = false;
} catch (Exception e) {
- log.error(e.toString(), e);
+ log.severe(e.toString());
}
}
}
diff --git a/vtm/src/org/oscim/map/Map.java b/vtm/src/org/oscim/map/Map.java
index 80a397551..362f9d73e 100644
--- a/vtm/src/org/oscim/map/Map.java
+++ b/vtm/src/org/oscim/map/Map.java
@@ -41,12 +41,12 @@
import org.oscim.utils.ThreadUtils;
import org.oscim.utils.async.AsyncExecutor;
import org.oscim.utils.async.TaskQueue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
public abstract class Map implements TaskQueue {
- private static final Logger log = LoggerFactory.getLogger(Map.class);
+ private static final Logger log = Logger.getLogger(Map.class.getName());
/**
* Listener interface for map update notifications.
@@ -218,7 +218,7 @@ public void setTheme(IRenderTheme theme, boolean allLayers) {
}
}
if (!themeSet) {
- log.error("No vector layers set");
+ log.severe("No vector layers set");
throw new IllegalStateException();
}
diff --git a/vtm/src/org/oscim/renderer/BucketRenderer.java b/vtm/src/org/oscim/renderer/BucketRenderer.java
index a1b8ad4e9..2589ebb1a 100644
--- a/vtm/src/org/oscim/renderer/BucketRenderer.java
+++ b/vtm/src/org/oscim/renderer/BucketRenderer.java
@@ -19,29 +19,13 @@
import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
-import org.oscim.renderer.bucket.BitmapBucket;
-import org.oscim.renderer.bucket.CircleBucket;
-import org.oscim.renderer.bucket.HairLineBucket;
-import org.oscim.renderer.bucket.LineBucket;
-import org.oscim.renderer.bucket.LineTexBucket;
-import org.oscim.renderer.bucket.MeshBucket;
-import org.oscim.renderer.bucket.PolygonBucket;
-import org.oscim.renderer.bucket.RenderBucket;
-import org.oscim.renderer.bucket.RenderBuckets;
-import org.oscim.renderer.bucket.TextureBucket;
+import org.oscim.renderer.bucket.*;
import org.oscim.utils.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
-import static org.oscim.renderer.bucket.RenderBucket.BITMAP;
-import static org.oscim.renderer.bucket.RenderBucket.CIRCLE;
-import static org.oscim.renderer.bucket.RenderBucket.HAIRLINE;
-import static org.oscim.renderer.bucket.RenderBucket.LINE;
-import static org.oscim.renderer.bucket.RenderBucket.MESH;
-import static org.oscim.renderer.bucket.RenderBucket.POLYGON;
-import static org.oscim.renderer.bucket.RenderBucket.SYMBOL;
-import static org.oscim.renderer.bucket.RenderBucket.TEXLINE;
+import static org.oscim.renderer.bucket.RenderBucket.*;
/**
* Base class to use the renderer.elements for drawing.
@@ -50,7 +34,7 @@
*/
public class BucketRenderer extends LayerRenderer {
- public static final Logger log = LoggerFactory.getLogger(BucketRenderer.class);
+ private static final Logger log = Logger.getLogger(BucketRenderer.class.getName());
/**
* Use mMapPosition.copy(position) to keep the position for which
@@ -146,7 +130,7 @@ public synchronized void render(GLViewport v) {
b = CircleBucket.Renderer.draw(b, v);
break;
default:
- log.error("invalid bucket {}", b.type);
+ log.severe("invalid bucket " + b.type);
b = b.next;
break;
}
diff --git a/vtm/src/org/oscim/renderer/BufferObject.java b/vtm/src/org/oscim/renderer/BufferObject.java
index 3c30a7508..775f5c8be 100644
--- a/vtm/src/org/oscim/renderer/BufferObject.java
+++ b/vtm/src/org/oscim/renderer/BufferObject.java
@@ -20,17 +20,15 @@
import org.oscim.backend.GL;
import org.oscim.backend.GLAdapter;
import org.oscim.utils.pool.Inlist;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.Buffer;
import javax.annotation.CheckReturnValue;
+import java.nio.Buffer;
+import java.util.logging.Logger;
import static org.oscim.backend.GLAdapter.gl;
public final class BufferObject extends Inlist {
- static final Logger log = LoggerFactory.getLogger(BufferObject.class);
+ private static final Logger log = Logger.getLogger(BufferObject.class.getName());
private static final int MB = 1024 * 1024;
private static final int LIMIT_BUFFERS = 16 * MB;
@@ -61,7 +59,7 @@ public void loadBufferData(Buffer buf, int newSize) {
boolean clear = false;
if (buf.position() != 0) {
- log.debug("flip your buffer!");
+ log.fine("flip your buffer!");
buf.flip();
}
@@ -97,9 +95,9 @@ public static void checkBufferUsage(boolean force) {
if (mBufferMemoryUsage < LIMIT_BUFFERS)
return;
- log.debug("use: " + mBufferMemoryUsage / MB + "MB");
+ log.fine("use: " + mBufferMemoryUsage / MB + "MB");
mBufferMemoryUsage -= BufferObject.limitUsage(MB);
- log.debug("now: " + mBufferMemoryUsage / MB + "MB");
+ log.fine("now: " + mBufferMemoryUsage / MB + "MB");
}
private static final BufferObject pool[] = new BufferObject[2];
@@ -180,7 +178,7 @@ static synchronized int limitUsage(int reduce) {
BufferObject prev = pool[t];
if (prev == null) {
- log.debug("nothing to free");
+ log.fine("nothing to free");
continue;
}
diff --git a/vtm/src/org/oscim/renderer/ExtrusionRenderer.java b/vtm/src/org/oscim/renderer/ExtrusionRenderer.java
index 630d58505..82d968b07 100644
--- a/vtm/src/org/oscim/renderer/ExtrusionRenderer.java
+++ b/vtm/src/org/oscim/renderer/ExtrusionRenderer.java
@@ -27,14 +27,11 @@
import org.oscim.renderer.light.ShadowRenderer;
import org.oscim.renderer.light.Sun;
import org.oscim.utils.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.backend.GLAdapter.gl;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
public abstract class ExtrusionRenderer extends LayerRenderer {
- static final Logger log = LoggerFactory.getLogger(ExtrusionRenderer.class);
// Don't draw extrusions which are covered by others
private final boolean mTranslucent;
diff --git a/vtm/src/org/oscim/renderer/GLMatrix.java b/vtm/src/org/oscim/renderer/GLMatrix.java
index 21413fc9f..08685ba74 100644
--- a/vtm/src/org/oscim/renderer/GLMatrix.java
+++ b/vtm/src/org/oscim/renderer/GLMatrix.java
@@ -17,9 +17,6 @@
*/
package org.oscim.renderer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
@@ -28,7 +25,6 @@
public class GLMatrix {
- static final Logger log = LoggerFactory.getLogger(GLMatrix.class);
private static final boolean dbg = false;
private final long pointer;
diff --git a/vtm/src/org/oscim/renderer/GLShader.java b/vtm/src/org/oscim/renderer/GLShader.java
index 23e50bbc8..103cd1014 100644
--- a/vtm/src/org/oscim/renderer/GLShader.java
+++ b/vtm/src/org/oscim/renderer/GLShader.java
@@ -21,15 +21,14 @@
import org.oscim.backend.AssetAdapter;
import org.oscim.backend.GL;
import org.oscim.backend.GLAdapter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.IntBuffer;
+import java.util.logging.Logger;
import static org.oscim.backend.GLAdapter.gl;
public abstract class GLShader {
- static final Logger log = LoggerFactory.getLogger(GLShader.class);
+ private static final Logger log = Logger.getLogger(GLShader.class.getName());
public int program;
@@ -64,14 +63,14 @@ protected boolean createVersioned(String fileName, String version) {
protected int getAttrib(String name) {
int loc = gl.getAttribLocation(program, name);
if (loc < 0)
- log.debug("missing attribute: {}", name);
+ log.fine("missing attribute: " + name);
return loc;
}
protected int getUniform(String name) {
int loc = gl.getUniformLocation(program, name);
if (loc < 0)
- log.debug("missing uniform: {}", name);
+ log.fine("missing uniform: " + name);
return loc;
}
@@ -116,8 +115,8 @@ public static int loadShader(int shaderType, String source) {
gl.getShaderiv(shader, GL.COMPILE_STATUS, compiled);
compiled.position(0);
if (compiled.get() == 0) {
- log.error("Could not compile shader " + shaderType + ":");
- log.error(gl.getShaderInfoLog(shader));
+ log.severe("Could not compile shader " + shaderType + ":");
+ log.severe(gl.getShaderInfoLog(shader));
gl.deleteShader(shader);
shader = 0;
}
@@ -162,8 +161,8 @@ public static int createProgramDirective(String vertexSource, String fragmentSou
gl.getProgramiv(program, GL.LINK_STATUS, linkStatus);
linkStatus.position(0);
if (linkStatus.get() != GL.TRUE) {
- log.error("Could not link program: ");
- log.error(gl.getProgramInfoLog(program));
+ log.severe("Could not link program: ");
+ log.severe(gl.getProgramInfoLog(program));
gl.deleteProgram(program);
program = 0;
}
diff --git a/vtm/src/org/oscim/renderer/GLState.java b/vtm/src/org/oscim/renderer/GLState.java
index d0e51cb9d..68fd76e1f 100644
--- a/vtm/src/org/oscim/renderer/GLState.java
+++ b/vtm/src/org/oscim/renderer/GLState.java
@@ -20,13 +20,13 @@
import org.oscim.backend.GL;
import org.oscim.backend.GLAdapter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.backend.GLAdapter.gl;
public class GLState {
- static final Logger log = LoggerFactory.getLogger(GLState.class);
+ private static final Logger log = Logger.getLogger(GLState.class.getName());
public static final int DISABLED = -1;
public static final int UNBIND = 0;
@@ -128,7 +128,7 @@ public static void test(boolean depthTest, boolean stencilTest) {
*/
public static void enableVertexArrays(int va1, int va2) {
if (va1 > 1 || va2 > 1)
- log.debug("FIXME: enableVertexArrays...");
+ log.fine("FIXME: enableVertexArrays...");
if ((va1 == 0 || va2 == 0)) {
if (!vertexArray[0]) {
@@ -205,7 +205,7 @@ public static void bindBuffer(int target, int id) {
return;
glIndexBuffer = id;
} else {
- log.debug("invalid target {}", target);
+ log.fine("invalid target " + target);
return;
}
//log.debug("bind buffer {} {}", target == GL20.ARRAY_BUFFER, id);
diff --git a/vtm/src/org/oscim/renderer/GLUtils.java b/vtm/src/org/oscim/renderer/GLUtils.java
index 7e33be672..6a3b0dda4 100644
--- a/vtm/src/org/oscim/renderer/GLUtils.java
+++ b/vtm/src/org/oscim/renderer/GLUtils.java
@@ -21,8 +21,6 @@
import org.oscim.backend.GL;
import org.oscim.backend.GLAdapter;
import org.oscim.utils.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -30,6 +28,7 @@
import java.nio.IntBuffer;
import java.util.ArrayList;
import java.util.List;
+import java.util.logging.Logger;
import static org.oscim.backend.GLAdapter.gl;
import static org.oscim.backend.GLAdapter.gl30;
@@ -38,7 +37,7 @@
* Utility functions
*/
public class GLUtils {
- static final Logger log = LoggerFactory.getLogger(GLUtils.class);
+ private static final Logger log = Logger.getLogger(GLUtils.class.getName());
/**
* Set int color argb to uniform wxyz.
@@ -132,7 +131,7 @@ public static int loadTexture(byte[] pixel, int width, int height, int format,
public static int checkFramebufferStatus(String op) {
int status = gl.checkFramebufferStatus(GL.FRAMEBUFFER);
if (status != GL.FRAMEBUFFER_COMPLETE)
- log.error(op + ": \tglFramebuffer " + getFramebufferStatusString(status) + " (" + status + ")");
+ log.severe(op + ": \tglFramebuffer " + getFramebufferStatusString(status) + " (" + status + ")");
return status;
}
@@ -166,7 +165,7 @@ public static String getFramebufferStatusString(int status) {
public static void checkGlError(String op) {
int error; // GL.NO_ERROR
while ((error = gl.getError()) != GL.NO_ERROR) {
- log.error(op + ": \tglError " + getGlErrorString(error) + " (" + error + ")");
+ log.severe(op + ": \tglError " + getGlErrorString(error) + " (" + error + ")");
// throw new RuntimeException(op + ": glError " + error);
}
}
@@ -183,7 +182,7 @@ public static boolean checkGlError(String op, int id) {
boolean hasError = false;
int error; // GL.NO_ERROR
while ((error = gl.getError()) != GL.NO_ERROR) {
- log.error(op + ": \tglError " + getGlErrorString(error) + " (" + error + ")");
+ log.severe(op + ": \tglError " + getGlErrorString(error) + " (" + error + ")");
// throw new RuntimeException(op + ": glError " + error);
if (error == id)
hasError = true;
@@ -202,7 +201,7 @@ public static List checkGlErrors(String op) {
List errors = new ArrayList<>();
int error; // GL.NO_ERROR
while ((error = gl.getError()) != GL.NO_ERROR) {
- log.error(op + ": \tglError " + getGlErrorString(error) + " (" + error + ")");
+ log.severe(op + ": \tglError " + getGlErrorString(error) + " (" + error + ")");
// throw new RuntimeException(op + ": glError " + error);
errors.add(error);
}
@@ -245,7 +244,7 @@ public static void setColor(int handle, float[] c, float alpha) {
gl.uniform4f(handle, c[0], c[1], c[2], c[3]);
} else {
if (alpha < 0) {
- log.debug("setColor: " + alpha);
+ log.fine("setColor: " + alpha);
alpha = 0;
gl.uniform4f(handle, 0, 0, 0, 0);
}
diff --git a/vtm/src/org/oscim/renderer/MapRenderer.java b/vtm/src/org/oscim/renderer/MapRenderer.java
index 57b613463..ba6924383 100644
--- a/vtm/src/org/oscim/renderer/MapRenderer.java
+++ b/vtm/src/org/oscim/renderer/MapRenderer.java
@@ -24,17 +24,16 @@
import org.oscim.map.Map;
import org.oscim.renderer.bucket.RenderBuckets;
import org.oscim.renderer.bucket.TextureItem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.nio.ShortBuffer;
+import java.util.logging.Logger;
import static org.oscim.backend.GLAdapter.gl;
public class MapRenderer {
- private static final Logger log = LoggerFactory.getLogger(MapRenderer.class);
+ private static final Logger log = Logger.getLogger(MapRenderer.class.getName());
/**
* scale factor used for short vertices
@@ -96,7 +95,7 @@ public void onDrawFrame() {
try {
draw();
} catch (Throwable t) {
- log.error(t.toString(), t);
+ log.severe(t.toString());
}
mMap.doneFrame(rerender);
@@ -244,11 +243,11 @@ public void onSurfaceCreated() {
String vendor = gl.getString(GL.VENDOR);
String renderer = gl.getString(GL.RENDERER);
String version = gl.getString(GL.VERSION);
- log.debug("{}/{}/{}", vendor, renderer, version);
+ log.fine(vendor + "/" + renderer + "/" + version);
// Prevent issue with Adreno 3xx series
if (renderer != null && renderer.startsWith("Adreno (TM) 3")) {
- log.debug("==> not using glBufferSubData");
+ log.fine("==> not using glBufferSubData");
GLAdapter.NO_BUFFER_SUB_DATA = true;
}
diff --git a/vtm/src/org/oscim/renderer/OffscreenRenderer.java b/vtm/src/org/oscim/renderer/OffscreenRenderer.java
index 3f5140044..3457b83a8 100644
--- a/vtm/src/org/oscim/renderer/OffscreenRenderer.java
+++ b/vtm/src/org/oscim/renderer/OffscreenRenderer.java
@@ -18,13 +18,10 @@
package org.oscim.renderer;
import org.oscim.backend.GL;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.backend.GLAdapter.gl;
public class OffscreenRenderer extends LayerRenderer {
- static final Logger log = LoggerFactory.getLogger(OffscreenRenderer.class);
public enum Mode {
FXAA, // Fast Approximate Anti-Aliasing
diff --git a/vtm/src/org/oscim/renderer/atlas/TextureAtlas.java b/vtm/src/org/oscim/renderer/atlas/TextureAtlas.java
index 4af6146a3..fc197143e 100644
--- a/vtm/src/org/oscim/renderer/atlas/TextureAtlas.java
+++ b/vtm/src/org/oscim/renderer/atlas/TextureAtlas.java
@@ -65,14 +65,11 @@
import org.oscim.backend.canvas.Bitmap;
import org.oscim.renderer.bucket.TextureItem;
import org.oscim.utils.pool.Inlist;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
public class TextureAtlas extends Inlist {
- static final Logger log = LoggerFactory.getLogger(TextureAtlas.class);
/**
* Allocated slots
diff --git a/vtm/src/org/oscim/renderer/bucket/BitmapBucket.java b/vtm/src/org/oscim/renderer/bucket/BitmapBucket.java
index e9ecdf01b..5696f8642 100644
--- a/vtm/src/org/oscim/renderer/bucket/BitmapBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/BitmapBucket.java
@@ -26,9 +26,7 @@
import java.nio.ShortBuffer;
import static org.oscim.backend.GLAdapter.gl;
-import static org.oscim.renderer.MapRenderer.COORD_SCALE;
-import static org.oscim.renderer.MapRenderer.MAX_INDICES;
-import static org.oscim.renderer.MapRenderer.bindQuadIndicesVBO;
+import static org.oscim.renderer.MapRenderer.*;
/**
* Renderer for a single bitmap, width and height must be power of 2.
@@ -36,7 +34,6 @@
public class BitmapBucket extends TextureBucket {
// TODO share layers.vbo() between BitmapTileLayers
- // static final Logger log = LoggerFactory.getLogger(BitmapLayer.class);
private Bitmap mBitmap;
private final boolean mReuseBitmap;
private final short[] mVertices;
diff --git a/vtm/src/org/oscim/renderer/bucket/CircleBucket.java b/vtm/src/org/oscim/renderer/bucket/CircleBucket.java
index 56e2070ec..1b3b522a9 100644
--- a/vtm/src/org/oscim/renderer/bucket/CircleBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/CircleBucket.java
@@ -25,15 +25,15 @@
import org.oscim.renderer.GLUtils;
import org.oscim.renderer.GLViewport;
import org.oscim.theme.styles.CircleStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.backend.GLAdapter.gl;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
public class CircleBucket extends RenderBucket {
- private static final Logger log = LoggerFactory.getLogger(CircleBucket.class);
+ private static final Logger log = Logger.getLogger(CircleBucket.class.getName());
public CircleStyle circle;
@@ -44,7 +44,7 @@ public CircleBucket(int level) {
public void addCircle(GeometryBuffer geom) {
if (!geom.isPoint()) {
- log.error("Circle style applied to non-point geometry");
+ log.severe("Circle style applied to non-point geometry");
return;
}
diff --git a/vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java b/vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java
index 544584344..2dd9c540c 100644
--- a/vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java
@@ -27,15 +27,14 @@
import org.oscim.utils.Tessellator;
import org.oscim.utils.geom.LineClipper;
import org.oscim.utils.pool.Pool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.ShortBuffer;
+import java.util.logging.Logger;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
public class ExtrusionBucket extends RenderBucket {
- static final Logger log = LoggerFactory.getLogger(ExtrusionBucket.class);
+ private static final Logger log = Logger.getLogger(ExtrusionBucket.class.getName());
private VertexData mIndices[];
private LineClipper mClipper;
@@ -388,7 +387,7 @@ public void addPoly(GeometryBuffer element, float height, float minHeight) {
if (points[ppos] == points[ppos + len - 2]
&& points[ppos + 1] == points[ppos + len - 1]) {
len -= 2;
- log.debug("explicit closed poly " + len);
+ log.fine("explicit closed poly " + len);
}
/* need at least three points (x and y) */
diff --git a/vtm/src/org/oscim/renderer/bucket/ExtrusionBuckets.java b/vtm/src/org/oscim/renderer/bucket/ExtrusionBuckets.java
index 6c93f5a1c..1239f78d6 100644
--- a/vtm/src/org/oscim/renderer/bucket/ExtrusionBuckets.java
+++ b/vtm/src/org/oscim/renderer/bucket/ExtrusionBuckets.java
@@ -24,13 +24,12 @@
import org.oscim.renderer.BufferObject;
import org.oscim.renderer.MapRenderer;
import org.oscim.utils.pool.Inlist;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.ShortBuffer;
+import java.util.logging.Logger;
public class ExtrusionBuckets extends TileData {
- static final Logger log = LoggerFactory.getLogger(ExtrusionBuckets.class);
+ private static final Logger log = Logger.getLogger(ExtrusionBuckets.class.getName());
public ExtrusionBucket buckets;
@@ -154,7 +153,7 @@ public boolean compile() {
int size = sumIndices * 2;
if (iboData.position() != sumIndices) {
int pos = iboData.position();
- log.error("invalid indice size: {} {}", sumIndices, pos);
+ log.severe("invalid indice size: " + sumIndices + " " + pos);
size = pos * 2;
}
ibo = BufferObject.get(GL.ELEMENT_ARRAY_BUFFER, size);
@@ -163,7 +162,7 @@ public boolean compile() {
size = sumVertices * 4 * 2;
if (vboData.position() != sumVertices * 4) {
int pos = vboData.position();
- log.error("invalid vertex size: {} {}", sumVertices, pos);
+ log.severe("invalid vertex size: " + sumVertices + " " + pos);
size = pos * 2;
}
diff --git a/vtm/src/org/oscim/renderer/bucket/HairLineBucket.java b/vtm/src/org/oscim/renderer/bucket/HairLineBucket.java
index 7484ab924..11cd8790d 100644
--- a/vtm/src/org/oscim/renderer/bucket/HairLineBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/HairLineBucket.java
@@ -24,14 +24,11 @@
import org.oscim.renderer.GLUtils;
import org.oscim.renderer.GLViewport;
import org.oscim.theme.styles.LineStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.backend.GLAdapter.gl;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
public class HairLineBucket extends RenderBucket {
- static final Logger log = LoggerFactory.getLogger(HairLineBucket.class);
public LineStyle line;
diff --git a/vtm/src/org/oscim/renderer/bucket/LineBucket.java b/vtm/src/org/oscim/renderer/bucket/LineBucket.java
index ad458578f..e99f33ef6 100644
--- a/vtm/src/org/oscim/renderer/bucket/LineBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/LineBucket.java
@@ -28,8 +28,8 @@
import org.oscim.renderer.GLUtils;
import org.oscim.renderer.GLViewport;
import org.oscim.theme.styles.LineStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.backend.GLAdapter.gl;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
@@ -41,7 +41,7 @@
* to fixed point values.
*/
public class LineBucket extends RenderBucket {
- static final Logger log = LoggerFactory.getLogger(LineBucket.class);
+ private static final Logger log = Logger.getLogger(LineBucket.class.getName());
/**
* scale factor mapping extrusion vector to short values
@@ -121,7 +121,7 @@ public void addLine(GeometryBuffer geom) {
else if (geom.isLine())
addLine(geom.points, geom.index, -1, false);
else
- log.debug("geometry must be LINE or POLYGON");
+ log.fine("geometry must be LINE or POLYGON");
}
public void addLine(float[] points, int numPoints, boolean closed) {
diff --git a/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java b/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java
index d475b0daf..4c5f3e730 100644
--- a/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java
@@ -24,8 +24,6 @@
import org.oscim.renderer.*;
import org.oscim.theme.styles.LineStyle;
import org.oscim.utils.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -81,8 +79,6 @@
*/
public final class LineTexBucket extends LineBucket {
- static final Logger log = LoggerFactory.getLogger(LineTexBucket.class);
-
public int evenQuads;
public int oddQuads;
diff --git a/vtm/src/org/oscim/renderer/bucket/MeshBucket.java b/vtm/src/org/oscim/renderer/bucket/MeshBucket.java
index 2df07a921..03182ac0a 100644
--- a/vtm/src/org/oscim/renderer/bucket/MeshBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/MeshBucket.java
@@ -30,14 +30,14 @@
import org.oscim.theme.styles.AreaStyle;
import org.oscim.utils.ColorUtil;
import org.oscim.utils.TessJNI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.backend.GLAdapter.gl;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
public class MeshBucket extends RenderBucket {
- static final Logger log = LoggerFactory.getLogger(MeshBucket.class);
+ private static final Logger log = Logger.getLogger(MeshBucket.class.getName());
static final boolean dbgRender = false;
public AreaStyle area;
@@ -102,7 +102,7 @@ protected void prepare() {
}
if (!tess.tesselate()) {
tess.dispose();
- log.error("error in tessellation {}", numPoints);
+ log.severe("error in tessellation " + numPoints);
return;
}
diff --git a/vtm/src/org/oscim/renderer/bucket/PolygonBucket.java b/vtm/src/org/oscim/renderer/bucket/PolygonBucket.java
index 9ebf6339a..b31289454 100644
--- a/vtm/src/org/oscim/renderer/bucket/PolygonBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/PolygonBucket.java
@@ -28,8 +28,6 @@
import org.oscim.utils.ArrayUtils;
import org.oscim.utils.geom.LineClipper;
import org.oscim.utils.math.Interpolation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.ShortBuffer;
@@ -42,8 +40,6 @@
*/
public final class PolygonBucket extends RenderBucket {
- static final Logger log = LoggerFactory.getLogger(PolygonBucket.class);
-
public static final int CLIP_STENCIL = 1;
public static final int CLIP_DEPTH = 2;
public static final int CLIP_TEST_DEPTH = 3;
diff --git a/vtm/src/org/oscim/renderer/bucket/RenderBuckets.java b/vtm/src/org/oscim/renderer/bucket/RenderBuckets.java
index 8bb6edf1e..bd81a1b9e 100644
--- a/vtm/src/org/oscim/renderer/bucket/RenderBuckets.java
+++ b/vtm/src/org/oscim/renderer/bucket/RenderBuckets.java
@@ -24,10 +24,9 @@
import org.oscim.theme.styles.AreaStyle;
import org.oscim.theme.styles.CircleStyle;
import org.oscim.theme.styles.LineStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.ShortBuffer;
+import java.util.logging.Logger;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
import static org.oscim.renderer.bucket.RenderBucket.*;
@@ -39,7 +38,7 @@
*/
public class RenderBuckets extends TileData {
- static final Logger log = LoggerFactory.getLogger(RenderBuckets.class);
+ private static final Logger log = Logger.getLogger(RenderBuckets.class.getName());
/* Count of units needed for one vertex */
public static final int[] VERTEX_CNT = {
@@ -206,7 +205,7 @@ private RenderBucket getBucket(int level, int type) {
if (mCurBucket != null && mCurBucket.level == level) {
bucket = mCurBucket;
if (bucket.type != type) {
- log.error("BUG wrong bucket {} {} on level {}", bucket.type, type, level);
+ log.severe("BUG wrong bucket " + bucket.type + " " + type + " on level " + level);
throw new IllegalArgumentException();
}
return bucket;
@@ -264,7 +263,7 @@ else if (type == CIRCLE)
/* check if found buckets matches requested type */
if (bucket.type != type) {
- log.error("BUG wrong bucket {} {} on level {}", bucket.type, type, level);
+ log.severe("BUG wrong bucket " + bucket.type + " " + type + " on level " + level);
throw new IllegalArgumentException();
}
@@ -403,7 +402,7 @@ public boolean compile(boolean addFill) {
}
if (vboSize != vboData.position()) {
- log.debug("wrong vertex buffer size: "
+ log.fine("wrong vertex buffer size: "
+ " new size: " + vboSize
+ " buffer pos: " + vboData.position()
+ " buffer limit: " + vboData.limit()
@@ -412,7 +411,7 @@ public boolean compile(boolean addFill) {
}
if (iboSize > 0 && iboSize != iboData.position()) {
- log.debug("wrong indice buffer size: "
+ log.fine("wrong indice buffer size: "
+ " new size: " + iboSize
+ " buffer pos: " + iboData.position()
+ " buffer limit: " + iboData.limit()
diff --git a/vtm/src/org/oscim/renderer/bucket/SymbolBucket.java b/vtm/src/org/oscim/renderer/bucket/SymbolBucket.java
index 783b5d508..786e66276 100755
--- a/vtm/src/org/oscim/renderer/bucket/SymbolBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/SymbolBucket.java
@@ -23,15 +23,14 @@
import org.oscim.renderer.GLMatrix;
import org.oscim.renderer.atlas.TextureAtlas;
import org.oscim.utils.pool.Inlist;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.ShortBuffer;
+import java.util.logging.Logger;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
public final class SymbolBucket extends TextureBucket {
- static final Logger log = LoggerFactory.getLogger(SymbolBucket.class);
+ private static final Logger log = Logger.getLogger(SymbolBucket.class.getName());
private static final int VERTICES_PER_SPRITE = 4;
private static final int LBIT_MASK = 0xfffffffe;
@@ -129,7 +128,7 @@ protected void compile(ShortBuffer vboData, ShortBuffer iboData) {
height = t.height;
} else { //if (to == null) {
- log.debug("Bad SymbolItem");
+ log.fine("Bad SymbolItem");
continue;
}
diff --git a/vtm/src/org/oscim/renderer/bucket/TextBucket.java b/vtm/src/org/oscim/renderer/bucket/TextBucket.java
index ec21998b9..a7534e40a 100644
--- a/vtm/src/org/oscim/renderer/bucket/TextBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/TextBucket.java
@@ -19,13 +19,10 @@
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Canvas;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
public class TextBucket extends TextureBucket {
- static final Logger log = LoggerFactory.getLogger(TextBucket.class);
protected static final int LBIT_MASK = 0xfffffffe;
diff --git a/vtm/src/org/oscim/renderer/bucket/TextItem.java b/vtm/src/org/oscim/renderer/bucket/TextItem.java
index 550bc7fe6..0c1496a23 100644
--- a/vtm/src/org/oscim/renderer/bucket/TextItem.java
+++ b/vtm/src/org/oscim/renderer/bucket/TextItem.java
@@ -22,7 +22,7 @@
import org.oscim.utils.pool.SyncPool;
public class TextItem extends Inlist {
- //static final Logger log = LoggerFactory.getLogger(TextItem.class);
+
private static final int MAX_POOL = 250;
public static final SyncPool pool = new SyncPool(MAX_POOL) {
diff --git a/vtm/src/org/oscim/renderer/bucket/TextureBucket.java b/vtm/src/org/oscim/renderer/bucket/TextureBucket.java
index 823c26036..fbc60c595 100644
--- a/vtm/src/org/oscim/renderer/bucket/TextureBucket.java
+++ b/vtm/src/org/oscim/renderer/bucket/TextureBucket.java
@@ -23,8 +23,6 @@
import org.oscim.renderer.GLViewport;
import org.oscim.renderer.MapRenderer;
import org.oscim.renderer.bucket.TextureItem.TexturePool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.ShortBuffer;
@@ -34,8 +32,6 @@
public class TextureBucket extends RenderBucket {
- static final Logger log = LoggerFactory.getLogger(TextureBucket.class);
-
public static final int INDICES_PER_SPRITE = 6;
static final int VERTICES_PER_SPRITE = 4;
static final int SHORTS_PER_VERTICE = 6;
diff --git a/vtm/src/org/oscim/renderer/bucket/TextureItem.java b/vtm/src/org/oscim/renderer/bucket/TextureItem.java
index 0a3bd8dd4..4ae29fdad 100755
--- a/vtm/src/org/oscim/renderer/bucket/TextureItem.java
+++ b/vtm/src/org/oscim/renderer/bucket/TextureItem.java
@@ -26,17 +26,15 @@
import org.oscim.renderer.GLUtils;
import org.oscim.utils.pool.Inlist;
import org.oscim.utils.pool.SyncPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
import javax.annotation.CheckReturnValue;
+import java.util.ArrayList;
+import java.util.logging.Logger;
import static org.oscim.backend.GLAdapter.gl;
public class TextureItem extends Inlist {
- static final Logger log = LoggerFactory.getLogger(TextureItem.class);
+ private static final Logger log = Logger.getLogger(TextureItem.class.getName());
static final boolean dbg = false;
@@ -287,7 +285,7 @@ private void uploadTexture(TextureItem t) {
initTexture(t);
if (dbg)
- log.debug("fill:" + getFill()
+ log.fine("fill:" + getFill()
+ " count:" + mTexCnt
+ " new texture " + t.id);
diff --git a/vtm/src/org/oscim/renderer/bucket/VertexData.java b/vtm/src/org/oscim/renderer/bucket/VertexData.java
index 9c4c95295..b4422bdba 100644
--- a/vtm/src/org/oscim/renderer/bucket/VertexData.java
+++ b/vtm/src/org/oscim/renderer/bucket/VertexData.java
@@ -20,8 +20,6 @@
import org.oscim.utils.FastMath;
import org.oscim.utils.pool.Inlist;
import org.oscim.utils.pool.SyncPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.ShortBuffer;
@@ -31,7 +29,6 @@
* TODO override append() etc to update internal (cur) state.
*/
public class VertexData extends Inlist.List {
- static final Logger log = LoggerFactory.getLogger(VertexData.class);
/**
* Size of array chunks. Must be multiple of:
diff --git a/vtm/src/org/oscim/renderer/light/ShadowRenderer.java b/vtm/src/org/oscim/renderer/light/ShadowRenderer.java
index ae2532e00..a0210b21d 100644
--- a/vtm/src/org/oscim/renderer/light/ShadowRenderer.java
+++ b/vtm/src/org/oscim/renderer/light/ShadowRenderer.java
@@ -16,24 +16,14 @@
package org.oscim.renderer.light;
import org.oscim.backend.GL;
-import org.oscim.renderer.ExtrusionRenderer;
-import org.oscim.renderer.GLMatrix;
-import org.oscim.renderer.GLShader;
-import org.oscim.renderer.GLState;
-import org.oscim.renderer.GLUtils;
-import org.oscim.renderer.GLViewport;
-import org.oscim.renderer.LayerRenderer;
-import org.oscim.renderer.MapRenderer;
+import org.oscim.renderer.*;
import org.oscim.utils.math.MathUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.nio.FloatBuffer;
import static org.oscim.backend.GLAdapter.gl;
public class ShadowRenderer extends LayerRenderer {
- private static final Logger log = LoggerFactory.getLogger(ShadowRenderer.class);
public static boolean DEBUG = false;
diff --git a/vtm/src/org/oscim/theme/RenderTheme.java b/vtm/src/org/oscim/theme/RenderTheme.java
index eb3b32072..37b3afef4 100644
--- a/vtm/src/org/oscim/theme/RenderTheme.java
+++ b/vtm/src/org/oscim/theme/RenderTheme.java
@@ -28,16 +28,15 @@
import org.oscim.theme.styles.RenderStyle;
import org.oscim.utils.ArrayUtils;
import org.oscim.utils.LRUCache;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
public class RenderTheme implements IRenderTheme {
- static final Logger log = LoggerFactory.getLogger(RenderTheme.class);
+ private static final Logger log = Logger.getLogger(RenderTheme.class.getName());
private static final int MATCHING_CACHE_SIZE = 8192;
@@ -161,7 +160,7 @@ public RenderStyle[] matchElement(GeometryType geometryType, TagSet tags, int zo
int type = geometryType.nativeInt;
if (type < 1 || type > 3) {
- log.debug("invalid geometry type for RenderTheme " + geometryType.name());
+ log.fine("invalid geometry type for RenderTheme " + geometryType.name());
return null;
}
@@ -216,7 +215,7 @@ public RenderStyle[] matchElement(GeometryType geometryType, TagSet tags, int zo
RenderStyle r = matches.get(i);
for (int j = i + 1; j < size; j++) {
if (matches.get(j) == r) {
- log.debug("fix duplicate instruction! "
+ log.fine("fix duplicate instruction! "
+ Arrays.deepToString(cache.cacheKey.mTags)
+ " zoom:" + zoomLevel + " "
+ r.getClass().getName());
diff --git a/vtm/src/org/oscim/theme/ThemeUtils.java b/vtm/src/org/oscim/theme/ThemeUtils.java
index 5dca678dd..10b102a3b 100644
--- a/vtm/src/org/oscim/theme/ThemeUtils.java
+++ b/vtm/src/org/oscim/theme/ThemeUtils.java
@@ -16,20 +16,19 @@
package org.oscim.theme;
import org.oscim.backend.XMLReaderAdapter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Logger;
/**
* A utility class with theme specific helper methods.
*/
public final class ThemeUtils {
- private static final Logger log = LoggerFactory.getLogger(ThemeUtils.class);
+ private static final Logger log = Logger.getLogger(ThemeUtils.class.getName());
/**
* Check if the given theme is a Mapsforge one.
@@ -53,7 +52,7 @@ public void startElement(String uri, String localName, String qName, Attributes
}
return isMapsforgeTheme.get();
} catch (Exception e) {
- log.error(e.toString(), e);
+ log.severe(e.toString());
return false;
}
}
diff --git a/vtm/src/org/oscim/theme/XmlThemeBuilder.java b/vtm/src/org/oscim/theme/XmlThemeBuilder.java
index 66f25a05e..4b78dbf2e 100644
--- a/vtm/src/org/oscim/theme/XmlThemeBuilder.java
+++ b/vtm/src/org/oscim/theme/XmlThemeBuilder.java
@@ -53,8 +53,6 @@
import org.oscim.utils.IOUtils;
import org.oscim.utils.Parameters;
import org.oscim.utils.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
@@ -62,10 +60,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
+import java.util.logging.Logger;
public class XmlThemeBuilder {
- private static final Logger log = LoggerFactory.getLogger(XmlThemeBuilder.class);
+ private static final Logger log = Logger.getLogger(XmlThemeBuilder.class.getName());
private static final int RENDER_THEME_VERSION_MAPSFORGE = 6;
private static final int RENDER_THEME_VERSION_VTM = 1;
@@ -144,7 +143,7 @@ public static void setXmlPullParserFactory(XmlPullParserFactory xmlPullParserFac
* @param attributeIndex the XML attribute index position.
*/
private static void logUnknownAttribute(String element, String name, String value, int attributeIndex) {
- log.warn("unknown attribute in element {} {} : {} = {}", element, attributeIndex, name, value);
+ log.warning("unknown attribute in element " + element + " " + attributeIndex + " : " + name + " = " + value);
}
private final ArrayList mRulesList = new ArrayList<>();
@@ -405,7 +404,7 @@ public void startElement() throws ThemeException {
// no-op
} else {
- log.error("unknown element: {}", qName);
+ log.severe("unknown element: " + qName);
throw new XmlPullParserException("unknown element: " + qName);
}
} catch (XmlPullParserException | IOException e) {
@@ -492,7 +491,7 @@ private TextureRegion getAtlasRegion(String src) {
TextureRegion texture = mTextureAtlas.getTextureRegion(src);
if (texture == null)
- log.debug("missing texture atlas item '" + src + "'");
+ log.fine("missing texture atlas item '" + src + "'");
return texture;
}
@@ -505,7 +504,7 @@ private void handleLineElement(String qName, boolean isStyle, boolean hasSymbol)
if (use != null) {
style = (LineStyle) mStyles.get(LINE_STYLE + use);
if (style == null) {
- log.debug("missing line style 'use': " + use);
+ log.fine("missing line style 'use': " + use);
return;
}
}
@@ -714,7 +713,7 @@ private void handleAreaElement(String qName, boolean isStyle) {
if (use != null) {
style = (AreaStyle) mStyles.get(AREA_STYLE + use);
if (style == null) {
- log.debug("missing area style 'use': " + use);
+ log.fine("missing area style 'use': " + use);
return;
}
}
@@ -819,7 +818,7 @@ private LineStyle createOutline(String style) {
.setCat(cat);
}
}
- log.debug("BUG not an outline style: " + style);
+ log.fine("BUG not an outline style: " + style);
return null;
}
@@ -996,14 +995,14 @@ private void handleTextElement(String qName, boolean isStyle, boolean isCaption)
if (style != null) {
pt = mTextStyles.get(style);
if (pt == null) {
- log.debug("missing text style: " + style);
+ log.fine("missing text style: " + style);
return;
}
}
TextBuilder b = createText(qName, isCaption, pt);
if (isStyle) {
- log.debug("put style {}", b.style);
+ log.fine("put style " + b.style);
mTextStyles.put(b.style, TextStyle.builder().from(b));
} else {
TextStyle text = b.buildInternal();
@@ -1124,7 +1123,7 @@ else if ("position".equals(name)) {
try {
b.bitmap = CanvasAdapter.getBitmapAsset(mTheme.getRelativePathPrefix(), symbol, mTheme.getResourceProvider(), b.symbolWidth, b.symbolHeight, (int) (b.symbolPercent * CanvasAdapter.symbolScale));
} catch (Exception e) {
- log.error("{}: {}", symbol, e.toString());
+ log.severe(symbol + ": " + e);
}
} else
b.texture = getAtlasRegion(symbol);
@@ -1183,14 +1182,14 @@ private void handleSymbolElement(String qName, boolean isStyle) {
if (style != null) {
ps = mSymbolStyles.get(style);
if (ps == null) {
- log.debug("missing symbol style: " + style);
+ log.fine("missing symbol style: " + style);
return;
}
}
SymbolBuilder b = createSymbol(qName, ps);
if (isStyle) {
- log.debug("put style {}", b.style);
+ log.fine("put style " + b.style);
mSymbolStyles.put(b.style, SymbolStyle.builder().from(b));
} else {
SymbolStyle symbol = buildSymbol(b);
@@ -1280,7 +1279,7 @@ private SymbolStyle buildSymbol(SymbolBuilder b) {
if (bitmap != null)
return buildSymbol(b, b.src, bitmap);
} catch (Exception e) {
- log.error("{}: {}", b.src, e.toString());
+ log.severe(b.src + ": " + e);
}
return null;
}
@@ -1393,7 +1392,7 @@ private void tagTransform(String qName) {
}
if (k == null || k.isEmpty() || libK == null || libK.isEmpty()) {
- log.debug("empty key in element " + qName);
+ log.fine("empty key in element " + qName);
return;
}
diff --git a/vtm/src/org/oscim/tiling/OverzoomTileDataSource.java b/vtm/src/org/oscim/tiling/OverzoomTileDataSource.java
index 98c1219c0..64447c92e 100644
--- a/vtm/src/org/oscim/tiling/OverzoomTileDataSource.java
+++ b/vtm/src/org/oscim/tiling/OverzoomTileDataSource.java
@@ -15,12 +15,12 @@
package org.oscim.tiling;
import org.oscim.layers.tile.MapTile;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
public class OverzoomTileDataSource implements ITileDataSource {
- private static final Logger log = LoggerFactory.getLogger(OverzoomTileDataSource.class);
+ private static final Logger log = Logger.getLogger(OverzoomTileDataSource.class.getName());
private final ITileDataSource tileDataSource;
private final int overZoom;
@@ -46,7 +46,7 @@ public void query(MapTile tile, ITileDataSink sink) {
}
tileDataSource.query(mapTile, dataSink);
} catch (Throwable t) {
- log.error(t.toString(), t);
+ log.severe(t.toString());
}
}
diff --git a/vtm/src/org/oscim/tiling/source/LwHttp.java b/vtm/src/org/oscim/tiling/source/LwHttp.java
index a73a79fa9..45bedf981 100644
--- a/vtm/src/org/oscim/tiling/source/LwHttp.java
+++ b/vtm/src/org/oscim/tiling/source/LwHttp.java
@@ -20,8 +20,6 @@
import org.oscim.core.Tile;
import org.oscim.utils.ArrayUtils;
import org.oscim.utils.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -32,6 +30,7 @@
import java.net.URL;
import java.net.UnknownHostException;
import java.util.Map.Entry;
+import java.util.logging.Logger;
import java.util.zip.GZIPInputStream;
/**
@@ -39,7 +38,7 @@
* https, full header parsing or other stuff.
*/
public class LwHttp implements HttpEngine {
- static final Logger log = LoggerFactory.getLogger(LwHttp.class);
+ private static final Logger log = Logger.getLogger(LwHttp.class.getName());
static final boolean dbg = false;
private static final byte[] HEADER_HTTP_OK = "200 OK".getBytes();
@@ -145,7 +144,7 @@ public boolean finishedReading() {
try {
while (bytesRead < contentLength && read() >= 0) ;
} catch (IOException e) {
- log.debug(e.toString());
+ log.fine(e.toString());
}
return bytesRead == contentLength;
@@ -154,13 +153,13 @@ public boolean finishedReading() {
@Override
public void close() throws IOException {
if (dbg)
- log.debug("close()... ignored");
+ log.fine("close()... ignored");
}
@Override
public synchronized void mark(int readlimit) {
if (dbg)
- log.debug("mark {}", readlimit);
+ log.fine("mark " + readlimit);
marked = bytesRead;
super.mark(readlimit);
@@ -187,7 +186,7 @@ public synchronized long skip(long n) throws IOException {
}
if (dbg)
- log.debug("skip:{}/{} pos:{}", n, sumSkipped, bytesRead);
+ log.fine("skip:" + n + "/" + sumSkipped + " pos:" + bytesRead);
bytesRead += sumSkipped;
return sumSkipped;
@@ -196,7 +195,7 @@ public synchronized long skip(long n) throws IOException {
@Override
public synchronized void reset() throws IOException {
if (dbg)
- log.debug("reset");
+ log.fine("reset");
if (marked >= 0)
bytesRead = marked;
@@ -233,7 +232,7 @@ public int read(byte[] buffer, int offset, int byteCount)
int len = super.read(buffer, offset, byteCount);
if (dbg)
- log.debug("read {} {} {}", len, bytesRead, contentLength);
+ log.fine("read " + len + " " + bytesRead + " " + contentLength);
if (len <= 0)
return len;
@@ -315,7 +314,7 @@ public synchronized InputStream read() throws IOException {
if (dbg) {
String line = new String(buf, pos, end - pos - 1);
- log.debug("> {} <", line);
+ log.fine("> " + line + " <");
}
pos += (end - pos) + 1;
@@ -346,11 +345,11 @@ else if (System.nanoTime() - mLastRequest > RESPONSE_TIMEOUT)
try {
int n = mResponseStream.available();
if (n > 0) {
- log.debug("left over bytes {} ", n);
+ log.fine("left over bytes " + n);
close();
}
} catch (IOException e) {
- log.debug(e.toString());
+ log.fine(e.toString());
close();
}
}
@@ -372,12 +371,12 @@ else if (System.nanoTime() - mLastRequest > RESPONSE_TIMEOUT)
len += pos;
if (dbg)
- log.debug("request: {}", new String(mRequestBuffer, 0, len));
+ log.fine("request: " + new String(mRequestBuffer, 0, len));
try {
writeRequest(len);
} catch (IOException e) {
- log.debug("recreate connection");
+ log.fine("recreate connection");
close();
lwHttpConnect();
diff --git a/vtm/src/org/oscim/tiling/source/PbfDecoder.java b/vtm/src/org/oscim/tiling/source/PbfDecoder.java
index bcf47d05a..48c365cfc 100644
--- a/vtm/src/org/oscim/tiling/source/PbfDecoder.java
+++ b/vtm/src/org/oscim/tiling/source/PbfDecoder.java
@@ -18,14 +18,13 @@
import org.oscim.core.GeometryBuffer;
import org.oscim.utils.UTF8Decoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
+import java.util.logging.Logger;
public abstract class PbfDecoder implements ITileDecoder {
- static final Logger log = LoggerFactory.getLogger(PbfDecoder.class);
+ private static final Logger log = Logger.getLogger(PbfDecoder.class.getName());
private static final int S1 = 7;
private static final int S2 = 14;
@@ -483,7 +482,7 @@ public int fillBuffer(int size) throws IOException {
if (size > maxSize) {
if (debug)
- log.debug("increase read buffer to " + size + " bytes");
+ log.fine("increase read buffer to " + size + " bytes");
maxSize = size;
@@ -504,7 +503,7 @@ public int fillBuffer(int size) throws IOException {
} else if (bufferPos + size > maxSize) {
// copy bytes left to the beginning of buffer
if (debug)
- log.debug("shift " + bufferFill + " " + bufferPos + " " + size);
+ log.fine("shift " + bufferFill + " " + bufferPos + " " + size);
System.arraycopy(buffer, bufferPos, buffer, 0, bytesLeft);
@@ -526,7 +525,7 @@ public int fillBuffer(int size) throws IOException {
if (len < 0) {
if (debug)
- log.debug("finished reading {}", mMsgPos);
+ log.fine("finished reading " + mMsgPos);
// finished reading, mark end
buffer[bufferFill] = 0;
diff --git a/vtm/src/org/oscim/tiling/source/UrlTileDataSource.java b/vtm/src/org/oscim/tiling/source/UrlTileDataSource.java
index 191aad233..9c15d85ea 100644
--- a/vtm/src/org/oscim/tiling/source/UrlTileDataSource.java
+++ b/vtm/src/org/oscim/tiling/source/UrlTileDataSource.java
@@ -25,18 +25,17 @@
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.QueryResult;
import org.oscim.utils.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
+import java.util.logging.Logger;
public class UrlTileDataSource implements ITileDataSource {
- private static final Logger log = LoggerFactory.getLogger(UrlTileDataSource.class);
+ private static final Logger log = Logger.getLogger(UrlTileDataSource.class.getName());
protected final HttpEngine mConn;
protected final ITileDecoder mTileDecoder;
@@ -64,7 +63,7 @@ public void query(MapTile tile, ITileDataSink sink) {
return;
}
} catch (IOException e) {
- log.debug("{} Cache read: {}", tile, e);
+ log.fine(tile + " Cache read: " + e);
} finally {
IOUtils.closeQuietly(is);
}
@@ -84,18 +83,18 @@ public void query(MapTile tile, ITileDataSink sink) {
if (mTileDecoder.decode(tile, sink, is))
res = QueryResult.SUCCESS;
} catch (SocketException e) {
- log.debug("{} Socket Error: {}", tile, e.toString());
+ log.fine(tile + " Socket Error: " + e);
} catch (SocketTimeoutException e) {
- log.debug("{} Socket Timeout", tile);
+ log.fine(tile + " Socket Timeout");
res = QueryResult.DELAYED;
} catch (UnknownHostException e) {
- log.debug("{} Unknown host: {}", tile, e.toString());
+ log.fine(tile + " Unknown host: " + e);
} catch (IOException e) {
- log.debug("{} Network Error: {}", tile, e.toString());
+ log.fine(tile + " Network Error: " + e);
} catch (Exception e) {
- log.debug("{} Error: {}", tile, e.toString());
+ log.fine(tile + " Error: " + e);
} catch (Throwable t) {
- log.error(t.toString(), t);
+ log.severe(t.toString());
} finally {
boolean ok = (res == QueryResult.SUCCESS);
diff --git a/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java b/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java
index 3039b79dc..7a6e479fd 100644
--- a/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java
@@ -23,17 +23,15 @@
import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.source.ITileDecoder;
-import org.oscim.tiling.source.LwHttp;
import org.oscim.tiling.source.UrlTileDataSource;
import org.oscim.tiling.source.UrlTileSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
+import java.util.logging.Logger;
public class BitmapTileSource extends UrlTileSource {
- static final Logger log = LoggerFactory.getLogger(LwHttp.class);
+ private static final Logger log = Logger.getLogger(BitmapTileSource.class.getName());
public static class Builder> extends UrlTileSource.Builder {
@@ -92,7 +90,7 @@ public boolean decode(Tile tile, ITileDataSink sink, InputStream is)
Bitmap bitmap = CanvasAdapter.decodeBitmap(is);
if (!bitmap.isValid()) {
- log.debug("{} invalid bitmap", tile);
+ log.fine(tile + " invalid bitmap");
return false;
}
sink.setTileImage(bitmap);
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
index 1ead5b1d5..25750151d 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
@@ -37,8 +37,6 @@
import org.oscim.utils.Parameters;
import org.oscim.utils.geom.TileClipper;
import org.oscim.utils.geom.TileSeparator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.FileInputStream;
import java.io.IOException;
@@ -46,6 +44,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.logging.Logger;
/**
* A class for reading binary map files.
@@ -81,7 +80,7 @@ public class MapDatabase implements ITileDataSource {
*/
private static final String INVALID_FIRST_WAY_OFFSET = "invalid first way offset: ";
- private static final Logger log = LoggerFactory.getLogger(MapDatabase.class);
+ private static final Logger log = Logger.getLogger(MapDatabase.class.getName());
/**
* Bitmask for the optional POI feature "elevation".
@@ -236,7 +235,7 @@ public MapDatabase(MapFileTileSource tileSource) throws IOException {
}
mFileSize = mInputChannel.size();
} catch (IOException e) {
- log.error(e.toString());
+ log.severe(e.toString());
/* make sure that the file is closed */
dispose();
throw new IOException();
@@ -295,7 +294,7 @@ public void query(MapTile tile, ITileDataSink sink) {
mTileSource.fileHeader.getSubFileParameter(queryParameters.queryZoomLevel);
if (subFileParameter == null) {
- log.warn("no sub-file for zoom level: "
+ log.warning("no sub-file for zoom level: "
+ queryParameters.queryZoomLevel);
sink.completed(QueryResult.FAILED);
@@ -310,7 +309,7 @@ public void query(MapTile tile, ITileDataSink sink) {
processBlocks(sink, queryParameters, subFileParameter);
sink.completed(QueryResult.SUCCESS);
} catch (Throwable t) {
- log.error(t.toString(), t);
+ log.severe(t.toString());
sink.completed(QueryResult.FAILED);
}
}
@@ -322,7 +321,7 @@ public void dispose() {
mInputChannel.close();
mInputChannel = null;
} catch (IOException e) {
- log.error(e.toString());
+ log.severe(e.toString());
}
}
}
@@ -336,8 +335,8 @@ public void cancel() {
*/
private void logDebugSignatures() {
if (mDebugFile) {
- log.warn(DEBUG_SIGNATURE_WAY + mSignatureWay);
- log.warn(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
+ log.warning(DEBUG_SIGNATURE_WAY + mSignatureWay);
+ log.warning(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
}
}
@@ -369,9 +368,9 @@ private void processBlock(QueryParameters queryParameters,
/* get the relative offset to the first stored way in the block */
int firstWayOffset = readBuffer.readUnsignedInt();
if (firstWayOffset < 0) {
- log.warn(INVALID_FIRST_WAY_OFFSET + firstWayOffset);
+ log.warning(INVALID_FIRST_WAY_OFFSET + firstWayOffset);
if (mDebugFile) {
- log.warn(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
+ log.warning(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
}
return;
}
@@ -379,9 +378,9 @@ private void processBlock(QueryParameters queryParameters,
/* add the current buffer position to the relative first way offset */
firstWayOffset += readBuffer.getBufferPosition();
if (firstWayOffset > readBuffer.getBufferSize()) {
- log.warn(INVALID_FIRST_WAY_OFFSET + firstWayOffset);
+ log.warning(INVALID_FIRST_WAY_OFFSET + firstWayOffset);
if (mDebugFile) {
- log.warn(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
+ log.warning(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
}
return;
}
@@ -398,9 +397,9 @@ private void processBlock(QueryParameters queryParameters,
/* finished reading POIs, check if the current buffer position is valid */
if (readBuffer.getBufferPosition() > firstWayOffset) {
- log.warn("invalid buffer position: " + readBuffer.getBufferPosition());
+ log.warning("invalid buffer position: " + readBuffer.getBufferPosition());
if (mDebugFile) {
- log.warn(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
+ log.warning(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
}
return;
}
@@ -537,8 +536,8 @@ private void processBlocks(ITileDataSink mapDataSink, QueryParameters queryParam
/* get and check the current block pointer */
long blockPointer = blockIndexEntry & BITMASK_INDEX_OFFSET;
if (blockPointer < 1 || blockPointer > subFileParameter.subFileSize) {
- log.warn("invalid current block pointer: " + blockPointer);
- log.warn("subFileSize: " + subFileParameter.subFileSize);
+ log.warning("invalid current block pointer: " + blockPointer);
+ log.warning("subFileSize: " + subFileParameter.subFileSize);
return;
}
@@ -554,8 +553,8 @@ private void processBlocks(ITileDataSink mapDataSink, QueryParameters queryParam
nextBlockPointer &= BITMASK_INDEX_OFFSET;
if (nextBlockPointer < 1 || nextBlockPointer > subFileParameter.subFileSize) {
- log.warn("invalid next block pointer: " + nextBlockPointer);
- log.warn("sub-file size: " + subFileParameter.subFileSize);
+ log.warning("invalid next block pointer: " + nextBlockPointer);
+ log.warning("sub-file size: " + subFileParameter.subFileSize);
return;
}
}
@@ -563,7 +562,7 @@ private void processBlocks(ITileDataSink mapDataSink, QueryParameters queryParam
/* calculate the size of the current block */
int blockSize = (int) (nextBlockPointer - blockPointer);
if (blockSize < 0) {
- log.warn("current block size must not be negative: "
+ log.warning("current block size must not be negative: "
+ blockSize);
return;
} else if (blockSize == 0) {
@@ -572,10 +571,10 @@ private void processBlocks(ITileDataSink mapDataSink, QueryParameters queryParam
} else if (blockSize > Parameters.MAXIMUM_BUFFER_SIZE) {
/* the current block is too large, continue with the next
* block */
- log.warn("current block size too large: " + blockSize);
+ log.warning("current block size too large: " + blockSize);
continue;
} else if (blockPointer + blockSize > mFileSize) {
- log.warn("current block larger than file size: "
+ log.warning("current block larger than file size: "
+ blockSize);
return;
}
@@ -585,7 +584,7 @@ private void processBlocks(ITileDataSink mapDataSink, QueryParameters queryParam
ReadBuffer readBuffer = new ReadBuffer(mInputChannel);
if (!readBuffer.readFromFile(subFileParameter.startAddress + blockPointer, blockSize)) {
/* skip the current block */
- log.warn("reading current block has failed: " + blockSize);
+ log.warning("reading current block has failed: " + blockSize);
return;
}
@@ -616,7 +615,7 @@ private boolean processBlockSignature(ReadBuffer readBuffer) {
/* get and check the block signature */
mSignatureBlock = readBuffer.readUTF8EncodedString(SIGNATURE_LENGTH_BLOCK);
if (!mSignatureBlock.startsWith("###TileStart")) {
- log.warn("invalid block signature: " + mSignatureBlock);
+ log.warning("invalid block signature: " + mSignatureBlock);
return false;
}
}
@@ -644,8 +643,8 @@ private boolean processPOIs(ITileDataSink mapDataSink, int numberOfPois, Boundin
/* get and check the POI signature */
mSignaturePoi = readBuffer.readUTF8EncodedString(SIGNATURE_LENGTH_POI);
if (!mSignaturePoi.startsWith("***POIStart")) {
- log.warn("invalid POI signature: " + mSignaturePoi);
- log.warn(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
+ log.warning("invalid POI signature: " + mSignaturePoi);
+ log.warning(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
return false;
}
}
@@ -724,7 +723,7 @@ private boolean processWayDataBlock(MapElement e, boolean doubleDeltaEncoding, b
/* get and check the number of way coordinate blocks (VBE-U) */
int numBlocks = readBuffer.readUnsignedInt();
if (numBlocks < 1 || numBlocks > Short.MAX_VALUE) {
- log.warn("invalid number of way coordinate blocks: " + numBlocks);
+ log.warning("invalid number of way coordinate blocks: " + numBlocks);
return false;
}
@@ -737,7 +736,7 @@ private boolean processWayDataBlock(MapElement e, boolean doubleDeltaEncoding, b
int numWayNodes = readBuffer.readUnsignedInt();
if (numWayNodes < 2 || numWayNodes > Short.MAX_VALUE) {
- log.warn("invalid number of way nodes: " + numWayNodes);
+ log.warning("invalid number of way nodes: " + numWayNodes);
logDebugSignatures();
return false;
}
@@ -884,8 +883,8 @@ private boolean processWays(QueryParameters queryParameters, ITileDataSink mapDa
// get and check the way signature
mSignatureWay = readBuffer.readUTF8EncodedString(SIGNATURE_LENGTH_WAY);
if (!mSignatureWay.startsWith("---WayStart")) {
- log.warn("invalid way signature: " + mSignatureWay);
- log.warn(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
+ log.warning("invalid way signature: " + mSignatureWay);
+ log.warning(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
return false;
}
}
@@ -914,11 +913,11 @@ private boolean processWays(QueryParameters queryParameters, ITileDataSink mapDa
} else {
int wayDataSize = readBuffer.readUnsignedInt();
if (wayDataSize < 0) {
- log.warn("invalid way data size: " + wayDataSize);
+ log.warning("invalid way data size: " + wayDataSize);
if (mDebugFile) {
- log.warn(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
+ log.warning(DEBUG_SIGNATURE_BLOCK + mSignatureBlock);
}
- log.error("BUG way 2");
+ log.severe("BUG way 2");
return false;
}
@@ -990,7 +989,7 @@ private boolean processWays(QueryParameters queryParameters, ITileDataSink mapDa
wayDataBlocks = readBuffer.readUnsignedInt();
if (wayDataBlocks < 1) {
- log.warn("invalid number of way data blocks: " + wayDataBlocks);
+ log.warning("invalid number of way data blocks: " + wayDataBlocks);
logDebugSignatures();
return false;
}
@@ -1151,7 +1150,7 @@ private MapReadResult readMapData(Tile upperLeft, Tile lowerRight, Selector sele
mTileSource.fileHeader.getSubFileParameter(queryParameters.queryZoomLevel);
if (subFileParameter == null) {
- log.warn("no sub-file for zoom level: "
+ log.warning("no sub-file for zoom level: "
+ queryParameters.queryZoomLevel);
return null;
@@ -1161,7 +1160,7 @@ private MapReadResult readMapData(Tile upperLeft, Tile lowerRight, Selector sele
QueryCalculations.calculateBlocks(queryParameters, subFileParameter);
processBlocks(queryParameters, subFileParameter, Tile.getBoundingBox(upperLeft, lowerRight), selector, mapReadResult);
} catch (IOException e) {
- log.error(e.toString());
+ log.severe(e.toString());
return null;
}
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java b/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
index db6cc7c5e..b2befeecc 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MapFileTileSource.java
@@ -25,16 +25,15 @@
import org.oscim.tiling.TileSource;
import org.oscim.tiling.source.mapfile.header.MapFileHeader;
import org.oscim.tiling.source.mapfile.header.MapFileInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.channels.FileChannel;
+import java.util.logging.Logger;
public class MapFileTileSource extends TileSource implements IMapFileTileSource {
- private static final Logger log = LoggerFactory.getLogger(MapFileTileSource.class);
+ private static final Logger log = Logger.getLogger(MapFileTileSource.class.getName());
/**
* Amount of cache blocks that the index cache should store.
@@ -150,10 +149,10 @@ public OpenResult open() {
mapFile = file;
databaseIndexCache = new IndexCache(inputChannel, INDEX_CACHE_SIZE);
- log.debug("File version: " + fileInfo.fileVersion);
+ log.fine("File version: " + fileInfo.fileVersion);
return OpenResult.SUCCESS;
} catch (IOException e) {
- log.error(e.toString());
+ log.severe(e.toString());
// make sure that the file is closed
close();
return new OpenResult(e.toString());
@@ -165,7 +164,7 @@ public ITileDataSource getDataSource() {
try {
return new OverzoomTileDataSource(new MapDatabase(this), mOverZoom);
} catch (IOException e) {
- log.debug(e.toString());
+ log.fine(e.toString());
}
return null;
}
@@ -177,7 +176,7 @@ public void close() {
inputChannel.close();
inputChannel = null;
} catch (IOException e) {
- log.error(e.toString());
+ log.severe(e.toString());
}
}
fileHeader = null;
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java b/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java
index 0b19808bf..d6c967aaa 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java
@@ -20,15 +20,14 @@
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.QueryResult;
import org.oscim.tiling.TileDataSink;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
+import java.util.logging.Logger;
public class MultiMapDatabase implements ITileDataSource {
- private static final Logger log = LoggerFactory.getLogger(MultiMapDatabase.class);
+ private static final Logger log = Logger.getLogger(MultiMapDatabase.class.getName());
private final boolean deduplicate;
private final List mapDatabases = new ArrayList<>();
@@ -76,7 +75,7 @@ public void query(MapTile tile, ITileDataSink sink) {
}
sink.completed(QueryResult.SUCCESS);
} catch (Throwable t) {
- log.error(t.toString(), t);
+ log.severe(t.toString());
sink.completed(QueryResult.FAILED);
}
}
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/MultiMapFileTileSource.java b/vtm/src/org/oscim/tiling/source/mapfile/MultiMapFileTileSource.java
index 61f32f926..84a802606 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/MultiMapFileTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/MultiMapFileTileSource.java
@@ -20,18 +20,17 @@
import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.OverzoomTileDataSource;
import org.oscim.tiling.TileSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
public class MultiMapFileTileSource extends TileSource implements IMapFileTileSource {
- private static final Logger log = LoggerFactory.getLogger(MultiMapFileTileSource.class);
+ private static final Logger log = Logger.getLogger(MultiMapFileTileSource.class.getName());
private boolean deduplicate;
private final List mapFileTileSources = new ArrayList<>();
@@ -82,7 +81,7 @@ public ITileDataSource getDataSource() {
mapDatabase.restrictToZoomRange(zoomLevels[0], zoomLevels[1]);
multiMapDatabase.add(mapDatabase);
} catch (IOException e) {
- log.debug(e.toString());
+ log.fine(e.toString());
}
}
return new OverzoomTileDataSource(multiMapDatabase, mOverZoom);
diff --git a/vtm/src/org/oscim/tiling/source/mapzen/TileDecoder.java b/vtm/src/org/oscim/tiling/source/mapzen/TileDecoder.java
index 2b25137c4..91162637c 100644
--- a/vtm/src/org/oscim/tiling/source/mapzen/TileDecoder.java
+++ b/vtm/src/org/oscim/tiling/source/mapzen/TileDecoder.java
@@ -27,15 +27,14 @@
import org.oscim.utils.FastMath;
import org.oscim.utils.pool.Inlist;
import org.oscim.utils.pool.Pool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.logging.Logger;
public class TileDecoder extends PbfDecoder {
- private static final Logger log = LoggerFactory.getLogger(TileDecoder.class);
+ private static final Logger log = Logger.getLogger(TileDecoder.class.getName());
private static final int TAG_TILE_LAYERS = 3;
@@ -86,7 +85,7 @@ public boolean decode(Tile tile, ITileDataSink mapDataCallback, InputStream is)
throws IOException {
if (debug)
- log.debug(tile + " decode");
+ log.fine(tile + " decode");
//setInputStream(new InflaterInputStream(is));
setInputStream(is);
@@ -178,7 +177,7 @@ private boolean decodeLayer() throws IOException {
Tag layerTag = new Tag("layer", name);
if (debug)
- log.debug("add layer " + name);
+ log.fine("add layer " + name);
if (numFeatures == 0)
return true;
diff --git a/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java b/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java
index c4ca3d81c..6bd710d2d 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap4/TileDecoder.java
@@ -26,14 +26,13 @@
import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.source.PbfDecoder;
import org.oscim.utils.FastMath;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
+import java.util.logging.Logger;
public class TileDecoder extends PbfDecoder {
- static final Logger log = LoggerFactory.getLogger(TileDecoder.class);
+ private static final Logger log = Logger.getLogger(TileDecoder.class.getName());
private static final int TAG_TILE_VERSION = 1;
//private static final int TAG_TILE_TIMESTAMP = 2;
@@ -124,8 +123,7 @@ public boolean decode(Tile tile, ITileDataSink sink, InputStream is)
case TAG_TILE_TAG_KEYS:
if (keys == null || curKey >= numKeys) {
- log.debug("{} wrong number of keys {}",
- mTile, numKeys);
+ log.fine(mTile + " wrong number of keys " + numKeys);
return false;
}
keys[curKey++] = decodeString().intern();
@@ -133,8 +131,7 @@ public boolean decode(Tile tile, ITileDataSink sink, InputStream is)
case TAG_TILE_TAG_VALUES:
if (values == null || curValue >= numValues) {
- log.debug("{} wrong number of values {}",
- mTile, numValues);
+ log.fine(mTile + " wrong number of values " + numValues);
return false;
}
values[curValue++] = decodeString();
@@ -164,7 +161,7 @@ public boolean decode(Tile tile, ITileDataSink sink, InputStream is)
decodeVarintArray(len, mSArray);
if (!decodeTileTags(numTags, mSArray, keys, values)) {
- log.debug("{} invalid tags", mTile);
+ log.fine(mTile + " invalid tags");
return false;
}
break;
@@ -172,15 +169,13 @@ public boolean decode(Tile tile, ITileDataSink sink, InputStream is)
case TAG_TILE_VERSION:
int version = decodeVarint32();
if (version < 4 || mVersion > 5) {
- log.debug("{} invalid version:{}",
- mTile, version);
+ log.fine(mTile + " invalid version: " + version);
return false;
}
break;
default:
- log.debug("{} invalid type for tile:{}",
- mTile, tag);
+ log.fine(mTile + " invalid type for tile: " + tag);
return false;
}
}
@@ -315,7 +310,7 @@ private boolean decodeTileElement(int type) throws IOException {
case TAG_ELEM_COORDS:
if (coordCnt == 0) {
- log.debug("{} no coordinates", mTile);
+ log.fine(mTile + " no coordinates");
}
if (type == TAG_TILE_MESH) {
@@ -323,9 +318,7 @@ private boolean decodeTileElement(int type) throws IOException {
int cnt = decodeInterleavedPoints3D(mElem.points, 1);
if (cnt != (3 * coordCnt)) {
- log.debug("{} wrong number of coordintes {}/{}", mTile,
- Integer.valueOf(coordCnt),
- Integer.valueOf(cnt));
+ log.fine(mTile + " wrong number of coordinates " + coordCnt + "/" + cnt);
fail = true;
}
mElem.pointNextPos = cnt;
@@ -334,9 +327,7 @@ private boolean decodeTileElement(int type) throws IOException {
int cnt = decodeInterleavedPoints(mElem, mScaleFactor);
if (cnt != coordCnt) {
- log.debug("{} wrong number of coordintes {}/{}", mTile,
- Integer.valueOf(coordCnt),
- Integer.valueOf(cnt));
+ log.fine(mTile + " wrong number of coordinates " + coordCnt + "/" + cnt);
fail = true;
}
}
@@ -347,16 +338,12 @@ private boolean decodeTileElement(int type) throws IOException {
break;
default:
- log.debug("{} invalid type for way: {}", mTile, tag);
+ log.fine(mTile + " invalid type for way: " + tag);
}
}
if (fail || numTags == 0 || numIndices == 0) {
- log.debug("{} failed: bytes:{} tags:{} ({},{})",
- mTile, Integer.valueOf(bytes),
- mElem.tags,
- Integer.valueOf(numIndices),
- Integer.valueOf(coordCnt));
+ log.fine(mTile + " failed: bytes:" + bytes + " tags:" + mElem.tags + " (" + numIndices + "," + coordCnt + ")");
return false;
}
@@ -395,9 +382,7 @@ private boolean decodeElementTags(int numTags) throws IOException {
int idx = tagIds[i];
if (idx < 0 || idx > max) {
- log.debug("{} invalid tag:{}", mTile,
- Integer.valueOf(idx),
- Integer.valueOf(i));
+ log.fine(mTile + " invalid tag: " + idx);
return false;
}
mElem.tags.add(mTileTags.get(idx));
diff --git a/vtm/src/org/oscim/utils/IOUtils.java b/vtm/src/org/oscim/utils/IOUtils.java
index 6a0482ad1..3e9aa3319 100644
--- a/vtm/src/org/oscim/utils/IOUtils.java
+++ b/vtm/src/org/oscim/utils/IOUtils.java
@@ -16,18 +16,16 @@
*/
package org.oscim.utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.Closeable;
import java.io.IOException;
import java.net.Socket;
+import java.util.logging.Logger;
/**
* A utility class with IO-specific helper methods.
*/
public final class IOUtils {
- static final Logger log = LoggerFactory.getLogger(IOUtils.class);
+ private static final Logger log = Logger.getLogger(IOUtils.class.getName());
/**
* Invokes the {@link Closeable#close()} method on the given object. If an
@@ -43,7 +41,7 @@ public static void closeQuietly(Closeable closeable) {
try {
closeable.close();
} catch (IOException e) {
- log.debug(e.toString());
+ log.fine(e.toString());
}
}
@@ -55,7 +53,7 @@ public static void closeQuietly(Socket closeable) {
try {
closeable.close();
} catch (IOException e) {
- log.debug(e.toString());
+ log.fine(e.toString());
}
}
diff --git a/vtm/src/org/oscim/utils/PausableThread.java b/vtm/src/org/oscim/utils/PausableThread.java
index 24431895d..75a3f3de1 100644
--- a/vtm/src/org/oscim/utils/PausableThread.java
+++ b/vtm/src/org/oscim/utils/PausableThread.java
@@ -17,14 +17,13 @@
*/
package org.oscim.utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.logging.Logger;
/**
* An abstract base class for threads which support pausing and resuming.
*/
public abstract class PausableThread extends Thread {
- private static final Logger log = LoggerFactory.getLogger(PausableThread.class);
+ private static final Logger log = Logger.getLogger(PausableThread.class.getName());
private static final boolean dbg = false;
private boolean mPausing = true;
@@ -41,7 +40,7 @@ public final void awaitPausing() {
while (!isPausing()) {
if (dbg)
- log.debug("Await Pause {}", getThreadName());
+ log.fine("Await Pause " + getThreadName());
try {
wait(100);
@@ -57,7 +56,7 @@ public synchronized void finish() {
if (!mRunning)
return;
- log.debug("Finish {}", getThreadName());
+ log.fine("Finish " + getThreadName());
mShouldStop = true;
this.interrupt();
@@ -113,18 +112,14 @@ public final void run() {
mPausing = true;
if (dbg)
- log.debug("Pausing: {}",
- getThreadName());
+ log.fine("Pausing: " + getThreadName());
}
wait();
} catch (InterruptedException e) {
if (dbg)
- log.debug("Interrupted {} {}:{}",
- getThreadName(),
- mShouldPause,
- mShouldStop);
+ log.fine("Interrupted " + getThreadName() + " " + mShouldPause + ":" + mShouldStop);
if (mShouldStop)
break O;
@@ -141,15 +136,12 @@ public final void run() {
doWork();
} catch (InterruptedException e) {
if (dbg)
- log.debug("Interrupted {} {}:{}",
- getThreadName(),
- mShouldPause,
- mShouldStop);
+ log.fine("Interrupted " + getThreadName() + " " + mShouldPause + ":" + mShouldStop);
}
}
- log.debug("Done {}", getThreadName());
+ log.fine("Done " + getThreadName());
mPausing = true;
mRunning = false;
diff --git a/vtm/src/org/oscim/utils/QuadTree.java b/vtm/src/org/oscim/utils/QuadTree.java
index ee25487f1..6e6b22a4f 100644
--- a/vtm/src/org/oscim/utils/QuadTree.java
+++ b/vtm/src/org/oscim/utils/QuadTree.java
@@ -5,8 +5,6 @@
import org.oscim.utils.pool.Pool;
import org.oscim.utils.quadtree.BoxTree;
import org.oscim.utils.quadtree.BoxTree.BoxItem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.List;
@@ -17,8 +15,6 @@
*/
public class QuadTree extends BoxTree, T> implements SpatialIndex {
- static final Logger log = LoggerFactory.getLogger(QuadTree.class);
-
public QuadTree(int extents, int maxDepth) {
super(extents, maxDepth);
}
diff --git a/vtm/src/org/oscim/utils/RTree.java b/vtm/src/org/oscim/utils/RTree.java
index 70b2c7e11..3267fc3e3 100644
--- a/vtm/src/org/oscim/utils/RTree.java
+++ b/vtm/src/org/oscim/utils/RTree.java
@@ -24,8 +24,6 @@
import org.oscim.utils.RTree.Rect;
import org.oscim.utils.pool.Inlist;
import org.oscim.utils.pool.SyncPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Arrays;
@@ -44,8 +42,6 @@
*/
public class RTree implements SpatialIndex, Iterable {
- static final Logger log = LoggerFactory.getLogger(RTree.class);
-
static final int MAXNODES = 8;
static final int MINNODES = 4;
diff --git a/vtm/src/org/oscim/utils/Tessellator.java b/vtm/src/org/oscim/utils/Tessellator.java
index 26a7ed982..78fbcc0e7 100644
--- a/vtm/src/org/oscim/utils/Tessellator.java
+++ b/vtm/src/org/oscim/utils/Tessellator.java
@@ -20,13 +20,12 @@
import org.oscim.core.GeometryBuffer;
import org.oscim.renderer.bucket.VertexData;
import org.oscim.utils.math.MathUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.Arrays;
+import java.util.logging.Logger;
public class Tessellator {
- static final Logger log = LoggerFactory.getLogger(Tessellator.class);
+ private static final Logger log = Logger.getLogger(Tessellator.class.getName());
/**
* Special version for ExtrusionLayer to match indices with vertex positions.
@@ -63,7 +62,7 @@ public static int tessellate(float[] points, int ppos, int numPoints, int[] inde
//log.debug("tess elems:{} verts:{} points:{}", nelems, nverts, numPoints);
if (numPoints != nverts) {
- log.debug("tess ----- skip poly: " + nverts + " " + numPoints);
+ log.fine("tess ----- skip poly: " + nverts + " " + numPoints);
tess.dispose();
return 0;
}
@@ -90,9 +89,7 @@ public static int tessellate(float[] points, int ppos, int numPoints, int[] inde
for (int i = start; i < end; i++) {
if (indices[i] < 0) {
- log.debug(">>>> eeek {} {} {}",
- start, end,
- Arrays.toString(Arrays.copyOfRange(indices, start, end)));
+ log.fine(">>>> eeek " + start + " " + end + " " + Arrays.toString(Arrays.copyOfRange(indices, start, end)));
break;
}
indices[i] *= 2;
@@ -166,7 +163,7 @@ public static int tessellate(GeometryBuffer geom, GeometryBuffer outMesh) {
int nelems = tess.getElementCount() * 3;
if (numPoints != nverts) {
- log.debug("tess ----- skip poly: " + nverts + " " + numPoints);
+ log.fine("tess ----- skip poly: " + nverts + " " + numPoints);
tess.dispose();
return 0;
}
diff --git a/vtm/src/org/oscim/utils/Utils.java b/vtm/src/org/oscim/utils/Utils.java
index da013cb92..494110f35 100644
--- a/vtm/src/org/oscim/utils/Utils.java
+++ b/vtm/src/org/oscim/utils/Utils.java
@@ -21,12 +21,12 @@
import org.oscim.renderer.bucket.TextureItem;
import org.oscim.theme.XmlThemeResourceProvider;
import org.oscim.utils.math.MathUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
public final class Utils {
- private static final Logger log = LoggerFactory.getLogger(Utils.class);
+ private static final Logger log = Logger.getLogger(Utils.class.getName());
/**
* Null safe equals.
@@ -45,11 +45,11 @@ public static TextureItem loadTexture(String relativePathPrefix, String src, Xml
try {
Bitmap bitmap = CanvasAdapter.getBitmapAsset(relativePathPrefix, src, resourceProvider, width, height, percent);
if (bitmap != null) {
- log.debug("loading {}", src);
+ log.fine("loading " + src);
return new TextureItem(potBitmap(bitmap), true);
}
} catch (Exception e) {
- log.error("{}: missing file / {}", src, e.toString());
+ log.severe(src + ": missing file / " + e);
}
return null;
}
@@ -64,7 +64,7 @@ public static Bitmap potBitmap(Bitmap bitmap) {
int potWidth = MathUtils.nextPowerOfTwo(bitmap.getWidth());
int potHeight = MathUtils.nextPowerOfTwo(bitmap.getHeight());
if (potWidth != bitmap.getWidth() || potHeight != bitmap.getHeight()) {
- log.debug("POT texture: {}x{} -> {}x{}", bitmap.getWidth(), bitmap.getHeight(), potWidth, potHeight);
+ log.fine("POT texture: " + bitmap.getWidth() + "x" + bitmap.getHeight() + " -> " + potWidth + "x" + potHeight);
Bitmap potBitmap = CanvasAdapter.newBitmap(potWidth, potHeight, 0);
Canvas potCanvas = CanvasAdapter.newCanvas();
potCanvas.setBitmap(potBitmap);
diff --git a/vtm/src/org/oscim/utils/geom/SimplifyDP.java b/vtm/src/org/oscim/utils/geom/SimplifyDP.java
index 1c92a47d1..8d27e38f1 100644
--- a/vtm/src/org/oscim/utils/geom/SimplifyDP.java
+++ b/vtm/src/org/oscim/utils/geom/SimplifyDP.java
@@ -18,8 +18,8 @@
package org.oscim.utils.geom;
import org.oscim.core.GeometryBuffer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
import static org.oscim.utils.geom.GeometryUtils.squareSegmentDistance;
@@ -30,7 +30,7 @@
* https://github.com/ekeneijeoma/simplify-java
*/
public class SimplifyDP {
- static final Logger log = LoggerFactory.getLogger(SimplifyDP.class);
+ private static final Logger log = Logger.getLogger(SimplifyDP.class.getName());
boolean[] markers = new boolean[128];
int[] stack = new int[32];
@@ -53,7 +53,7 @@ public void simplify(GeometryBuffer geom, float sqTolerance) {
int end = simplify(geom.points, inPos, len, outPos, sqTolerance);
if (end > inPos + len)
- log.error("out larger than cur: {} > {}", end, inPos + len);
+ log.severe("out larger than cur: " + end + " > " + (inPos + len));
idx[i] = (short) (end - outPos);
outPos = end;
diff --git a/vtm/src/org/oscim/utils/geom/TileSeparator.java b/vtm/src/org/oscim/utils/geom/TileSeparator.java
index 2e8d03629..7d83cabf7 100644
--- a/vtm/src/org/oscim/utils/geom/TileSeparator.java
+++ b/vtm/src/org/oscim/utils/geom/TileSeparator.java
@@ -16,12 +16,12 @@
package org.oscim.utils.geom;
import org.oscim.core.GeometryBuffer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.logging.Logger;
public class TileSeparator {
- private static final Logger log = LoggerFactory.getLogger(TileSeparator.class);
+ private static final Logger log = Logger.getLogger(TileSeparator.class.getName());
private float xmin;
private float xmax;
@@ -61,7 +61,7 @@ public boolean separate(GeometryBuffer geom) {
if (isInside(cx, cy))
return true;
} else
- log.warn("Geometry (Point) has wrong format: " + geom.toString());
+ log.warning("Geometry (Point) has wrong format: " + geom);
} else if (geom.isPoly()) {
int pointPos = 0;
diff --git a/vtm/src/org/oscim/utils/quadtree/BoxTree.java b/vtm/src/org/oscim/utils/quadtree/BoxTree.java
index 0fb36eed0..691156199 100644
--- a/vtm/src/org/oscim/utils/quadtree/BoxTree.java
+++ b/vtm/src/org/oscim/utils/quadtree/BoxTree.java
@@ -5,10 +5,9 @@
import org.oscim.utils.pool.Pool;
import org.oscim.utils.quadtree.BoxTree.BoxItem;
import org.oscim.utils.quadtree.BoxTree.BoxNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.Arrays;
+import java.util.logging.Logger;
/**
* A BoxTree is made of BoxNodes which hold a list of
@@ -18,7 +17,7 @@
*/
public class BoxTree, E> extends TileIndex, T> {
- static final Logger log = LoggerFactory.getLogger(BoxTree.class);
+ private static final Logger log = Logger.getLogger(BoxTree.class.getName());
static boolean dbg = false;
protected final int extents;
@@ -476,7 +475,7 @@ public void insert(T box) {
cur.item = box;
if (dbg)
- log.debug("insert: " + level
+ log.fine("insert: " + level
+ " cnt:" + Inlist.size(cur.item) + " " + x1 + ":" + y1
+ " /" + (x2) + "x" + (y2) + " " + box.item);
break;
@@ -528,7 +527,7 @@ public boolean remove(T box, E item) {
for (BoxItem it = cur.item; it != null; it = it.next) {
if (it.item == item) {
if (dbg)
- log.debug("remove: " + level
+ log.fine("remove: " + level
+ " cnt:" + Inlist.size(cur.item) + " " + x1 + ":" + y1
+ " /" + (x2) + "x" + (y2) + " " + item);