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

TagSet: numTags and tag array as private (#439)

Browse Source
This commit is contained in:
Gustl22
2017-11-13 11:24:54 +01:00
committed by Emux
parent 9c3488e107
commit fe2c067272
10 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java
View File

@@ -135,7 +135,7 @@ public class GeoJsonTileDecoder implements ITileDecoder {
//add tag information
mTileSource.decodeTags(mMapElement, mTagMap);
if (mMapElement.tags.numTags == 0)
if (mMapElement.tags.size() == 0)
return;
mTileSource.postGeomHook(mMapElement);

8
vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
View File

@@ -143,7 +143,7 @@ public class OSciMap2TileSource extends UrlTileSource {
private boolean decodeTileTags() throws IOException {
String tagString = decodeString();
int curTag = mTileTags.numTags;
int curTag = mTileTags.size();
String key = Tags.keys[mSArray[curTag]];
Tag tag;
@@ -261,7 +261,7 @@ public class OSciMap2TileSource extends UrlTileSource {
if (fail || indexCnt == 0) {
log.debug(mTile + " failed reading way: bytes:" + bytes + " index:"
+ (Arrays.toString(index)) + " tag:"
+ (mElem.tags.numTags > 0 ? Arrays.deepToString(mElem.tags.tags) : "null")
+ (mElem.tags.size() > 0 ? Arrays.deepToString(mElem.tags.getTags()) : "null")
+ " " + indexCnt + " " + coordCnt);
return false;
}
@@ -290,7 +290,7 @@ public class OSciMap2TileSource extends UrlTileSource {
int cnt = 0;
int end = position() + bytes;
int max = mTileTags.numTags - 1;
int max = mTileTags.size() - 1;
for (; position() < end; cnt++) {
int tagNum = decodeVarint32();
@@ -315,7 +315,7 @@ public class OSciMap2TileSource extends UrlTileSource {
return false;
}
mElem.tags.add(mTileTags.tags[tagNum]);
mElem.tags.add(mTileTags.get(tagNum));
}
if (cnt == 0) {