- started overlays

- started symbol layer
- move renderer and generator out of view package
  - hopefully the last big refactoring for a while...
- improve perspective, plane should be more far away to decrease foreshortening

src/org/oscim/database/IMapDatabase.java

@@ -16,7 +16,7 @@ package org.oscim.database;
 
 import java.util.Map;
 
-import org.oscim.view.generator.JobTile;
+import org.oscim.generator.JobTile;
 
 /**
  *

src/org/oscim/database/mapfile/MapDatabase.java

@@ -30,7 +30,7 @@ import org.oscim.database.QueryResult;
 import org.oscim.database.mapfile.header.MapFileHeader;
 import org.oscim.database.mapfile.header.MapFileInfo;
 import org.oscim.database.mapfile.header.SubFileParameter;
-import org.oscim.view.generator.JobTile;
+import org.oscim.generator.JobTile;
 
 import android.os.Environment;
 
@@ -819,7 +819,7 @@ public class MapDatabase implements IMapDatabase {
 		Tag[] wayTags = sMapFileHeader.getMapFileInfo().wayTags;
 		int[] textPos = new int[3];
 		// float[] labelPosition;
-		boolean skippedWays = false;
+		// boolean skippedWays = false;
 		int wayDataBlocks;
 
 		// skip string block
@@ -858,7 +858,7 @@ public class MapDatabase implements IMapDatabase {
 					if (tags == null)
 						return false;
 
-					skippedWays = true;
+					// skippedWays = true;
 
 					mReadBuffer.setBufferPosition(pos);
 				}
@@ -885,12 +885,12 @@ public class MapDatabase implements IMapDatabase {
 			// bit 5-8 represent the number of tag IDs
 			byte numberOfTags = (byte) (specialByte & WAY_NUMBER_OF_TAGS_BITMASK);
 
-			boolean changed = skippedWays;
-			skippedWays = false;
+			// boolean changed = skippedWays;
+			// skippedWays = false;
 
 			if (numberOfTags != 0) {
 				tags = mReadBuffer.readTags(wayTags, numberOfTags);
-				changed = true;
+				// changed = true;
 			}
 			if (tags == null)
 				return false;
@@ -904,8 +904,8 @@ public class MapDatabase implements IMapDatabase {
 			// check if the way has a name
 			if ((featureByte & WAY_FEATURE_NAME) != 0) {
 				textPos[0] = mReadBuffer.readUnsignedInt();
-				String str = mReadBuffer.readUTF8EncodedStringAt(stringOffset
-						+ textPos[0]);
+				// String str =
+				mReadBuffer.readUTF8EncodedStringAt(stringOffset + textPos[0]);
 				// if (changed) {
 				// Tag[] tmp = tags;
 				// tags = new Tag[tmp.length + 1];

src/org/oscim/database/oscimap/MapDatabase.java

@@ -39,7 +39,7 @@ import org.oscim.database.IMapDatabaseCallback;
 import org.oscim.database.MapInfo;
 import org.oscim.database.OpenResult;
 import org.oscim.database.QueryResult;
-import org.oscim.view.generator.JobTile;
+import org.oscim.generator.JobTile;
 
 import android.os.Environment;
 import android.os.SystemClock;
@@ -65,8 +65,8 @@ public class MapDatabase implements IMapDatabase {
 	private static final String CACHE_FILE = "%d-%d-%d.tile";
 
 	private static final String SERVER_ADDR = "city.informatik.uni-bremen.de";
-	// private static final String URL = "/osci/map-live/";
-	private static final String URL = "/osci/oscim/";
+	private static final String URL = "/osci/map-live/";
+	// private static final String URL = "/osci/oscim/";
 
 	private final static float REF_TILE_SIZE = 4096.0f;
 

src/org/oscim/database/pbmap/MapDatabase.java

@@ -62,7 +62,7 @@ import org.oscim.database.IMapDatabaseCallback;
 import org.oscim.database.MapInfo;
 import org.oscim.database.OpenResult;
 import org.oscim.database.QueryResult;
-import org.oscim.view.generator.JobTile;
+import org.oscim.generator.JobTile;
 
 import android.os.Environment;
 import android.os.SystemClock;

src/org/oscim/database/postgis/MapDatabase.java

@@ -33,7 +33,7 @@ import org.oscim.database.IMapDatabaseCallback;
 import org.oscim.database.MapInfo;
 import org.oscim.database.OpenResult;
 import org.oscim.database.QueryResult;
-import org.oscim.view.generator.JobTile;
+import org.oscim.generator.JobTile;
 import org.postgresql.PGConnection;
 
 import android.util.Log;

src/org/oscim/database/test/MapDatabase.java

@@ -24,7 +24,7 @@ import org.oscim.database.IMapDatabaseCallback;
 import org.oscim.database.MapInfo;
 import org.oscim.database.OpenResult;
 import org.oscim.database.QueryResult;
-import org.oscim.view.generator.JobTile;
+import org.oscim.generator.JobTile;
 
 /**
  * 
@@ -40,7 +40,7 @@ public class MapDatabase implements IMapDatabase {
 	private Tag[] mTags = { new Tag("natural", "water") };
 	private Tag[] mTagsWay = { new Tag("highway", "primary"), new Tag("name", "Highway Rd") };
 
-	private Tag[] mNameTags;
+	// private Tag[] mNameTags;
 
 	private final MapInfo mMapInfo =
 			new MapInfo(new BoundingBox(-180, -90, 180, 90),