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

cleanups

Browse Source
This commit is contained in:
Hannes Janetzek 2013-04-11 17:40:01 +02:00
parent eb6778a907
commit 9c3c860da8
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/oscim/database/test/MapDatabase.java
View File

@ -34,17 +34,13 @@ import org.oscim.generator.JobTile;
public class MapDatabase implements IMapDatabase { public class MapDatabase implements IMapDatabase {
private final static String PROJECTION = "Mercator"; private final static String PROJECTION = "Mercator";
//private float[] mCoords = new float[20];
//private short[] mIndex = new short[4];
GeometryBuffer mGeom = new GeometryBuffer(new float[20], new short[4]); GeometryBuffer mGeom = new GeometryBuffer(new float[20], new short[4]);
// private Tag[] mTags = { new Tag("boundary", "administrative"), new // private Tag[] mTags = { new Tag("boundary", "administrative"), new
// Tag("admin_level", "2") }; // Tag("admin_level", "2") };
private final Tag[] mTags = { new Tag("natural", "water") }; private final Tag[] mTags = { new Tag("natural", "water") };
private final Tag[] mTagsWay = { new Tag("highway", "primary"), new Tag("name", "Highway Rd") }; //private final Tag[] mTagsWay = { new Tag("highway", "primary"), new Tag("name", "Highway Rd") };
// private Tag[] mNameTags;
private final MapInfo mMapInfo = private final MapInfo mMapInfo =
new MapInfo(new BoundingBox(-180, -90, 180, 90), new MapInfo(new BoundingBox(-180, -90, 180, 90),

3
src/org/oscim/renderer/GLRenderer.java
View File

@ -75,8 +75,6 @@ public class GLRenderer implements GLSurfaceView.Renderer {
private static float[] mTileCoords; private static float[] mTileCoords;
private static float[] mDebugCoords;
public class Matrices { public class Matrices {
public final Matrix4 viewproj = new Matrix4(); public final Matrix4 viewproj = new Matrix4();
public final Matrix4 proj = new Matrix4(); public final Matrix4 proj = new Matrix4();
@ -186,7 +184,6 @@ public class GLRenderer implements GLSurfaceView.Renderer {
mMatrices = new Matrices(); mMatrices = new Matrices();
mTileCoords = new float[8]; mTileCoords = new float[8];
mDebugCoords = new float[8];
// tile fill coords // tile fill coords
short min = 0; short min = 0;

8
src/org/oscim/utils/pool/Inlist.java
View File

@ -20,14 +20,14 @@ public class Inlist<T extends Inlist<T>> {
public T next; public T next;
static <T extends Inlist<T>> int size(Inlist<T> list) { static <T extends Inlist<T>> int size(T list) {
int count = 0; int count = 0;
for (Inlist<T> l = list; l != null; l = l.next) for (Inlist<T> l = list; l != null; l = l.next)
count++; count++;
return count; return count;
} }
public static <T extends Inlist<T>> Inlist<T> remove(Inlist<T> list, Inlist<T> item) { public static <T extends Inlist<T>> T remove(T list, T item) {
if (item == list) { if (item == list) {
return item.next; return item.next;
} }
@ -44,12 +44,12 @@ public class Inlist<T extends Inlist<T>> {
} }
static <T extends Inlist<T>> Inlist<T> prepend(T list, T item) { public static <T extends Inlist<T>> T prepend(T list, T item) {
item.next = list; item.next = list;
return item; return item;
} }
static <T extends Inlist<T>> Inlist<T> append(T list, T item) { public static <T extends Inlist<T>> T append(T list, T item) {
if (debug) { if (debug) {
if (item.next != null) { if (item.next != null) {