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

enable building rendering again

Browse Source
This commit is contained in:
Hannes Janetzek 2013-06-30 09:15:31 +02:00
parent d830e49510
commit f9623e9f22
2 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/MapTileLoader.java
View File

@ -177,17 +177,6 @@ public class MapTileLoader extends TileLoader implements IRenderCallback, ITileD
// query database, which calls renderWay and renderPOI // query database, which calls renderWay and renderPOI
// callbacks while processing map tile data. // callbacks while processing map tile data.
if (mTileDataSource.executeQuery(mTile, this) != QueryResult.SUCCESS) { if (mTileDataSource.executeQuery(mTile, this) != QueryResult.SUCCESS) {
//Log.d(TAG, "Failed loading: " + tile);
// mTile.layers.clear();
// mTile.layers = null;
// TextItem.pool.releaseAll(mTile.labels);
// mTile.labels = null;
// // FIXME add STATE_FAILED?
// // in passTile everything but STATE_LOADING is considered failed.
// mTile.state = STATE_NONE;
// mTile.loader.jobCompleted(mTile, false);
// mTile = null;
return false; return false;
} }
@ -205,18 +194,14 @@ public class MapTileLoader extends TileLoader implements IRenderCallback, ITileD
// ri = renderTheme.matchWay(mDebugWay.tags, (byte) 0, false); // ri = renderTheme.matchWay(mDebugWay.tags, (byte) 0, false);
// renderWay(ri); // renderWay(ri);
// } // }
//mTile.loader.jobCompleted(mTile, true);
//mTile = null;
return true; return true;
} }
public void completed(boolean success){ public void completed(boolean success) {
Log.d(TAG, mTile + "completed " + success); if (success) {
mTile.loader.jobCompleted(mTile, true);
if (success){ mTile = null;
mTile.loader.jobCompleted(mTile, true); return;
mTile = null;
return;
} }
mTile.layers.clear(); mTile.layers.clear();
@ -226,6 +211,7 @@ public class MapTileLoader extends TileLoader implements IRenderCallback, ITileD
// FIXME add STATE_FAILED? // FIXME add STATE_FAILED?
// in passTile everything but STATE_LOADING is considered failed. // in passTile everything but STATE_LOADING is considered failed.
mTile.state = STATE_NONE; mTile.state = STATE_NONE;
mTile.loader.jobCompleted(mTile, false); mTile.loader.jobCompleted(mTile, false);
mTile = null; mTile = null;
} }
@ -289,13 +275,11 @@ public class MapTileLoader extends TileLoader implements IRenderCallback, ITileD
mTagHouseNr = tags[i]; mTagHouseNr = tags[i];
tags[i] = mTagEmptyHouseNr; tags[i] = mTagEmptyHouseNr;
} }
} } else if (mTile.zoomLevel > 16) {
/*else if (mTile.zoomLevel > 16) {
// FIXME, allow overlays to intercept // FIXME, allow overlays to intercept
// this, or use a theme option for this // this, or use a theme option for this
if (key == Tag.TAG_KEY_BUILDING) if (key == Tag.TAG_KEY_BUILDING)
mRenderBuildingModel = true; mRenderBuildingModel = true;
else if (key == Tag.KEY_HEIGHT) { else if (key == Tag.KEY_HEIGHT) {
try { try {
mElement.height = Integer.parseInt(tags[i].value); mElement.height = Integer.parseInt(tags[i].value);
@ -308,7 +292,7 @@ public class MapTileLoader extends TileLoader implements IRenderCallback, ITileD
} catch (Exception e) { } catch (Exception e) {
} }
} }
}*/ }
} }
return true; return true;
} }
@ -408,7 +392,7 @@ public class MapTileLoader extends TileLoader implements IRenderCallback, ITileD
if (lineLayer.line == null) { if (lineLayer.line == null) {
lineLayer.line = line; lineLayer.line = line;
float w = line.width; float w = line.width * 0.8f;
if (!line.fixed) { if (!line.fixed) {
w *= mStrokeScale; w *= mStrokeScale;
w *= mLatScaleFactor; w *= mLatScaleFactor;
@ -540,7 +524,7 @@ public class MapTileLoader extends TileLoader implements IRenderCallback, ITileD
@Override @Override
public void renderPointOfInterestSymbol(Symbol symbol) { public void renderPointOfInterestSymbol(Symbol symbol) {
if (symbol.texture == null){ if (symbol.texture == null) {
Log.d(TAG, "missing symbol for " + mElement.tags.asString()); Log.d(TAG, "missing symbol for " + mElement.tags.asString());
return; return;
} }

6
vtm/assets/styles/default.xml
View File

@ -646,7 +646,7 @@
<!-- building --> <!-- building -->
<m k="building"> <m k="building">
<m zoom-min="14"> <!--zoom-max="16">--> <m zoom-min="14" zoom-max="16">
<m closed="yes"> <m closed="yes">
<use-area name="building" fade="14" /> <use-area name="building" fade="14" />
</m> </m>
@ -1140,9 +1140,9 @@
</m> </m>
<!-- HACK!!! render building models last --> <!-- HACK!!! render building models last -->
<!--<m k="building" zoom-min="17"> <m k="building" zoom-min="17">
<use-area name="building" fade="15" /> <use-area name="building" fade="15" />
</m>--> </m>
</m> <!-- end e="way" --> </m> <!-- end e="way" -->
<m e="node"> <m e="node">