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

cleanup VectorTileLoader

Browse Source
This commit is contained in:
Hannes Janetzek 2013-09-19 23:50:57 +02:00
parent eada09d060
commit 0dc0ec9394
2 changed files with 36 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,8 +63,8 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
private static final double STROKE_INCREASE = Math.sqrt(2.5); private static final double STROKE_INCREASE = Math.sqrt(2.5);
private static final byte LAYERS = 11; private static final byte LAYERS = 11;
public static final byte STROKE_MIN_ZOOM_LEVEL = 12; public static final byte STROKE_MIN_ZOOM = 12;
public static final byte STROKE_MAX_ZOOM_LEVEL = 17; public static final byte STROKE_MAX_ZOOM = 17;
// replacement for variable value tags that should not be matched by RenderTheme // replacement for variable value tags that should not be matched by RenderTheme
// FIXME make this general, maybe subclass tags // FIXME make this general, maybe subclass tags
@ -179,7 +179,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
* set. * set.
*/ */
private void setScaleStrokeWidth(byte zoomLevel) { private void setScaleStrokeWidth(byte zoomLevel) {
mStrokeScale = (float) Math.pow(STROKE_INCREASE, zoomLevel - STROKE_MIN_ZOOM_LEVEL); mStrokeScale = (float) Math.pow(STROKE_INCREASE, zoomLevel - STROKE_MIN_ZOOM);
if (mStrokeScale < 1) if (mStrokeScale < 1)
mStrokeScale = 1; mStrokeScale = 1;
} }

85
vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
View File

@ -53,8 +53,8 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
private static final double STROKE_INCREASE = Math.sqrt(2.5); private static final double STROKE_INCREASE = Math.sqrt(2.5);
private static final byte LAYERS = 11; private static final byte LAYERS = 11;
public static final byte STROKE_MIN_ZOOM_LEVEL = 12; public static final byte STROKE_MIN_ZOOM = 12;
public static final byte STROKE_MAX_ZOOM_LEVEL = 17; public static final byte STROKE_MAX_ZOOM = 17;
//private static final Tag[] debugTagWay = { new Tag("debug", "way") }; //private static final Tag[] debugTagWay = { new Tag("debug", "way") };
//private static final Tag[] debugTagArea = { new Tag("debug", "area") }; //private static final Tag[] debugTagArea = { new Tag("debug", "area") };
@ -83,8 +83,8 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
private int mDrawingLayer; private int mDrawingLayer;
private float mStrokeScale = 1.0f; private float mLineScale = 1.0f;
private float mGroundResolution; private float mGroundScale;
private Tag mTagName; private Tag mTagName;
private Tag mTagHouseNr; private Tag mTagHouseNr;
@ -108,30 +108,34 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
} }
@Override @Override
public boolean executeJob(MapTile mapTile) { public boolean executeJob(MapTile tile) {
if (mTileDataSource == null) if (mTileDataSource == null)
return false; return false;
mTile = mapTile;
// account for area changes with latitude // account for area changes with latitude
double lat = MercatorProjection.toLatitude(mTile.y); double lat = MercatorProjection.toLatitude(tile.y);
setScaleStrokeWidth(mTile.zoomLevel, lat); mLineScale = (float) Math.pow(STROKE_INCREASE, tile.zoomLevel - STROKE_MIN_ZOOM);
if (mLineScale < 1)
mLineScale = 1;
mGroundResolution = (float) (Math.cos(lat * (Math.PI / 180)) // scale line width relative to latitude + PI * thumb
* MercatorProjection.EARTH_CIRCUMFERENCE mLineScale *= 0.4f + 0.6f * ((float) Math.sin(Math.abs(lat) * (Math.PI / 180)));
/ ((long) Tile.SIZE << mTile.zoomLevel));
mGroundScale = (float) (Math.cos(lat * (Math.PI / 180))
* MercatorProjection.EARTH_CIRCUMFERENCE
/ ((long) Tile.SIZE << tile.zoomLevel));
mTile = tile;
mTile.layers = new ElementLayers(); mTile.layers = new ElementLayers();
// query database, which calls renderWay and renderPOI // query database, which calls 'process' callback
// callbacks while processing map tile data. QueryResult result = mTileDataSource.executeQuery(mTile, this);
if (mTileDataSource.executeQuery(mTile, this) != QueryResult.SUCCESS) {
mTile = null; mTile = null;
return false;
} clearState();
// if (debug.drawTileFrames) { // if (debug.drawTileFrames) {
// // draw tile coordinate // // draw tile coordinate
@ -148,8 +152,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
// renderWay(ri); // renderWay(ri);
// } // }
mTile = null; return (result == QueryResult.SUCCESS);
return true;
} }
Tag[] mFilterTags = new Tag[1]; Tag[] mFilterTags = new Tag[1];
@ -164,23 +167,6 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
} }
} }
/**
* Sets the scale stroke factor for the given zoom level.
*
* @param zoomLevel
* the zoom level for which the scale stroke factor should be
* set.
*/
private void setScaleStrokeWidth(byte zoomLevel, double latitude) {
mStrokeScale = (float) Math.pow(STROKE_INCREASE, zoomLevel - STROKE_MIN_ZOOM_LEVEL);
if (mStrokeScale < 1)
mStrokeScale = 1;
// scale line width relative to latitude
mStrokeScale *= 0.4f + 0.6f * ((float) Math.sin(Math.abs(latitude) * (Math.PI / 180)));
}
public void setTileDataSource(ITileDataSource mapDatabase) { public void setTileDataSource(ITileDataSource mapDatabase) {
if (mTileDataSource != null) if (mTileDataSource != null)
mTileDataSource.destroy(); mTileDataSource.destroy();
@ -188,10 +174,6 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
mTileDataSource = mapDatabase; mTileDataSource = mapDatabase;
} }
public ITileDataSource getMapDatabase() {
return mTileDataSource;
}
private boolean mRenderBuildingModel; private boolean mRenderBuildingModel;
// Replace tags that should only be matched by key in RenderTheme // Replace tags that should only be matched by key in RenderTheme
@ -305,7 +287,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
mCurLineLayer = null; mCurLineLayer = null;
} }
// ----------------- RenderThemeCallback ----------------- /*** RenderThemeCallback ***/
@Override @Override
public void renderWay(Line line, int level) { public void renderWay(Line line, int level) {
int numLayer = mDrawingLayer + level; int numLayer = mDrawingLayer + level;
@ -325,9 +307,9 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
lineLayer.line = line; lineLayer.line = line;
float w = line.width; float w = line.width;
if (!line.fixed) { if (!line.fixed)
w *= mStrokeScale; w *= mLineScale;
}
lineLayer.width = w; lineLayer.width = w;
} }
@ -336,8 +318,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
return; return;
} }
lineLayer.addLine(mElement.points, mElement.index, lineLayer.addLine(mElement);
mElement.type == GeometryType.POLY);
// keep reference for outline layer // keep reference for outline layer
mCurLineLayer = lineLayer; mCurLineLayer = lineLayer;
@ -352,13 +333,13 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
lineLayer.line = line; lineLayer.line = line;
float w = line.width; float w = line.width;
if (!line.fixed) { if (!line.fixed)
w *= mStrokeScale; w *= mLineScale;
}
lineLayer.width = w; lineLayer.width = w;
} }
lineLayer.addLine(mElement.points, mElement.index); lineLayer.addLine(mElement);
} }
} }
@ -369,7 +350,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
if (mRenderBuildingModel) { if (mRenderBuildingModel) {
//Log.d(TAG, "add buildings: " + mTile + " " + mPriority); //Log.d(TAG, "add buildings: " + mTile + " " + mPriority);
if (mTile.layers.extrusionLayers == null) if (mTile.layers.extrusionLayers == null)
mTile.layers.extrusionLayers = new ExtrusionLayer(0, mGroundResolution); mTile.layers.extrusionLayers = new ExtrusionLayer(0, mGroundScale);
((ExtrusionLayer) mTile.layers.extrusionLayers).addBuildings(mElement); ((ExtrusionLayer) mTile.layers.extrusionLayers).addBuildings(mElement);