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

switch to slf4j

Browse Source
This commit is contained in:
Hannes Janetzek
2013-10-08 22:02:14 +02:00
parent 1cf2ea60a7
commit 2d18e7d25f
79 changed files with 418 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vtm-gdx-html/src/org/oscim/gdx/client/GwtBitmap.java
View File

@@ -1,6 +1,5 @@
package org.oscim.gdx.client;
import org.oscim.backend.Log;
import org.oscim.backend.canvas.Bitmap;
import com.badlogic.gdx.Gdx;
@@ -65,7 +64,7 @@ public class GwtBitmap implements Bitmap {
pixmap.getGLFormat(), pixmap.getGLType(), pixmap.getPixels());
if (disposable || image != null) {
Log.d("", "dispose pixmap " + getWidth() + "/" + getHeight());
//log.debug("dispose pixmap " + getWidth() + "/" + getHeight());
pixmap.dispose();
if (image != null)

3
vtm-gdx-html/src/org/oscim/gdx/client/GwtCanvas.java
View File

@@ -1,6 +1,5 @@
package org.oscim.gdx.client;
import org.oscim.backend.Log;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Paint;
@@ -26,7 +25,7 @@ public class GwtCanvas implements org.oscim.backend.canvas.Canvas {
@Override
public void drawText(String string, float x, float y, Paint paint) {
if (bitmap == null) {
Log.d("BUG", "no bitmap set");
//log.debug("no bitmap set");
return;
}

7
vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
View File

@@ -3,7 +3,8 @@ package org.oscim.gdx.client;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.backend.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection;
import org.oscim.gdx.GdxMap;
@@ -20,7 +21,7 @@ import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.Window;
class GwtGdxMap extends GdxMap {
private static final String TAG = GwtGdxMap.class.getName();
static final Logger log = LoggerFactory.getLogger(GwtGdxMap.class);
SearchBox mSearchBox;
@@ -77,7 +78,7 @@ class GwtGdxMap extends GdxMap {
MapPosition p = new MapPosition();
p.setZoomLevel(zoom);
p.setPosition(lat, lon);
Log.d(TAG, "map position: " + p.x + "/" + p.y + " " + lat + "/" + lon);
log.debug("map position: " + p.x + "/" + p.y + " " + lat + "/" + lon);
p.angle = rotation;
p.tilt = tilt;

3
vtm-gdx-html/src/org/oscim/gdx/client/GwtLauncher.java
View File

@@ -1,7 +1,6 @@
package org.oscim.gdx.client;
// -draftCompile -localWorkers 2
import org.oscim.backend.Log;
import org.oscim.core.Tile;
import com.badlogic.gdx.ApplicationListener;
@@ -66,7 +65,7 @@ public class GwtLauncher extends GwtApplication {
@Override
public void error(String file) {
Log.d(this.getClass().getName(), "error loading " + file);
//log.debug("error loading " + file);
}
};
}

13
vtm-gdx-html/src/org/oscim/gdx/client/SearchBox.java
View File

@@ -3,7 +3,8 @@ package org.oscim.gdx.client;
import java.util.ArrayList;
import java.util.List;
import org.oscim.backend.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.oscim.core.BoundingBox;
import org.oscim.core.GeometryBuffer;
import org.oscim.core.MapPosition;
@@ -40,7 +41,7 @@ import com.google.gwt.view.client.SingleSelectionModel;
*/
public class SearchBox {
protected static final String TAG = SearchBox.class.getName();
protected static final Logger log = LoggerFactory.getLogger(SearchBox.class);
private static final String NOMINATIM_GLOBAL = "http://nominatim.openstreetmap.org/search?polygon_text=1&addressdetails=0&format=json&limit=25&q=";
@@ -230,7 +231,7 @@ public class SearchBox {
mOverlay.clearPath();
//Log.d(TAG, "selected " + d.getName() + " " + d.getLatitude() + " "
//log.debug("selected " + d.getName() + " " + d.getLatitude() + " "
// + d.getLongitude());
BoundingBox b = d.getBoundingBox();
@@ -249,11 +250,11 @@ public class SearchBox {
try {
r.parse(wkt, g);
} catch (Exception e) {
Log.d(TAG, wkt);
log.debug(wkt);
}
mOverlay.setGeom(g);
//Log.d(TAG, "add polygon " + p.length());
//log.debug("add polygon " + p.length());
} else {
mOverlay.addPoint(b.maxLatitudeE6, b.minLongitudeE6);
mOverlay.addPoint(b.maxLatitudeE6, b.maxLongitudeE6);
@@ -319,7 +320,7 @@ public class SearchBox {
builder.setCallbackParam("json_callback");
builder.requestObject(url, new AsyncCallback<JsArray<NominatimData>>() {
public void onFailure(Throwable caught) {
Log.d(TAG, "request failed");
log.debug("request failed");
searchButton.setEnabled(true);
}