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

pbmap: handle layer field

Browse Source
This commit is contained in:
Hannes Janetzek 2012-08-08 12:24:15 +02:00
parent 8d68d46dd4
commit 69fe443b30
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/org/mapsforge/database/pbmap/MapDatabase.java
View File

@ -154,9 +154,11 @@ public class MapDatabase implements IMapDatabase {
} }
private static final int BUFFER_SIZE = 65536; private static final int BUFFER_SIZE = 65536;
private final byte[] buffer = new byte[BUFFER_SIZE]; private final byte[] buffer = new byte[BUFFER_SIZE];
private int bufferPos; private int bufferPos;
private int bufferSize; private int bufferSize;
private int bytesRead;
private InputStream inputStream; private InputStream inputStream;
private static final int TAG_TILE_TAGS = 1; private static final int TAG_TILE_TAGS = 1;
@ -165,23 +167,20 @@ public class MapDatabase implements IMapDatabase {
private static final int TAG_WAY_TAGS = 1; private static final int TAG_WAY_TAGS = 1;
private static final int TAG_WAY_INDEX = 2; private static final int TAG_WAY_INDEX = 2;
private static final int TAG_WAY_COORDS = 3; private static final int TAG_WAY_COORDS = 3;
private static final int TAG_WAY_LAYER = 4;
// private static final int TAG_NODE_TAGS = 1; // private static final int TAG_NODE_TAGS = 1;
// private static final int TAG_NODE_COORDS = 2; // private static final int TAG_NODE_COORDS = 2;
private int bytesRead;
private boolean decode(InputStream is) throws IOException { private boolean decode(InputStream is) throws IOException {
inputStream = is; inputStream = is;
bytesRead = 0; bytesRead = 0;
bufferSize = 0; bufferSize = 0;
bufferPos = 0; bufferPos = 0;
while (true) { int val;
while ((val = decodeVarint32()) > 0) {
// read tag and wire type // read tag and wire type
int val = decodeVarint32();
if (val == 0) {
// Log.d(TAG, "EOF, all good");
return true;
}
int tag = (val >> 3); int tag = (val >> 3);
// int wireType = (val & 7); // int wireType = (val & 7);
// Log.d(TAG, "tile " + tag + " " + wireType); // Log.d(TAG, "tile " + tag + " " + wireType);
@ -204,6 +203,7 @@ public class MapDatabase implements IMapDatabase {
return false; return false;
} }
} }
return true;
} }
private boolean decodeTileTags() throws IOException { private boolean decodeTileTags() throws IOException {
@ -227,6 +227,8 @@ public class MapDatabase implements IMapDatabase {
int indexCnt = 0; int indexCnt = 0;
int tagCnt = 0; int tagCnt = 0;
int coordCnt = 0; int coordCnt = 0;
int layer = 0;
while (bytesRead < end) { while (bytesRead < end) {
// read tag and wire type // read tag and wire type
@ -252,6 +254,10 @@ public class MapDatabase implements IMapDatabase {
coordCnt = decodeWayCoordinates(); coordCnt = decodeWayCoordinates();
break; break;
case TAG_WAY_LAYER:
layer = decodeVarint32();
break;
default: default:
Log.d(TAG, "invalid type for way: " + tag); Log.d(TAG, "invalid type for way: " + tag);
} }
@ -292,7 +298,7 @@ public class MapDatabase implements IMapDatabase {
} }
mMapGenerator.renderWay((byte) 0, tags, coords, index, true); mMapGenerator.renderWay((byte) layer, tags, coords, index, true);
return true; return true;
} }
@ -368,8 +374,8 @@ public class MapDatabase implements IMapDatabase {
while (pos < end) { while (pos < end) {
if (cnt >= MAX_WAY_COORDS) { if (cnt >= MAX_WAY_COORDS) {
// Log.d(TAG, "increase coords array " + MAX_WAY_COORDS);
MAX_WAY_COORDS += 128; MAX_WAY_COORDS += 128;
Log.d(TAG, "increase coords array " + MAX_WAY_COORDS);
float[] tmp = new float[MAX_WAY_COORDS]; float[] tmp = new float[MAX_WAY_COORDS];
System.arraycopy(coords, 0, tmp, 0, cnt); System.arraycopy(coords, 0, tmp, 0, cnt);
tmpCoords = coords = tmp; tmpCoords = coords = tmp;
@ -391,7 +397,6 @@ public class MapDatabase implements IMapDatabase {
if ((tmp = buf[pos++]) >= 0) { if ((tmp = buf[pos++]) >= 0) {
result |= tmp << 21; result |= tmp << 21;
} else { } else {
result |= (tmp & 0x7f) << 21; result |= (tmp & 0x7f) << 21;
result |= (tmp = buf[pos++]) << 28; result |= (tmp = buf[pos++]) << 28;