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

cleanups: dont keep track of current theme in Map

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-19 17:34:19 +01:00
parent b587990602
commit e4eeae2821
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vtm/src/org/oscim/map/Map.java
View File

@ -68,7 +68,6 @@ public abstract class Map {
private final MapPosition mMapPosition;
private final AsyncExecutor mAsyncExecutor;
protected boolean mClearMap;
protected final MapEventLayer mEventLayer;
protected GestureDetector mGestureDetector;
@ -80,6 +79,8 @@ public abstract class Map {
private Set<UpdateListener> mUpdateListenerSet = new LinkedHashSet<UpdateListener>();
private UpdateListener[] mUpdateListeners;
protected boolean mClearMap;
public Map() {
mViewport = new Viewport(this);
mAnimator = new MapAnimator(this, mViewport);
@ -114,8 +115,6 @@ public abstract class Map {
return null;
}
private InternalRenderTheme mCurrentTheme;
/**
* Utility function to set theme of base vector-layer and
* use map background color from theme.
@ -126,18 +125,12 @@ public abstract class Map {
throw new IllegalStateException();
}
if (mCurrentTheme == theme) {
log.debug("same theme: " + theme);
return;
}
IRenderTheme t = ThemeLoader.load(theme);
if (t == null) {
log.error("Invalid theme");
return;
}
mCurrentTheme = theme;
mBaseLayer.setRenderTheme(t);
MapRenderer.setBackgroundColor(t.getMapBackground());
@ -154,9 +147,9 @@ public abstract class Map {
* be called from any thread. Request will be handled on main
* thread.
*
* @param forceRedraw pass true to render next frame
* @param redraw pass true to render next frame
*/
public abstract void updateMap(boolean forceRedraw);
public abstract void updateMap(boolean redraw);
/**
* Request to render a frame. Request will be handled on main
@ -198,6 +191,7 @@ public abstract class Map {
*/
public void clearMap() {
mClearMap = true;
updateMap(true);
}
/**
@ -268,9 +262,10 @@ public abstract class Map {
*/
protected void updateLayers() {
boolean changed = false;
MapPosition pos = mMapPosition;
// get the current MapPosition
changed |= mViewport.getMapPosition(mMapPosition);
changed |= mViewport.getMapPosition(pos);
if (mUpdateListeners == null) {
mUpdateListeners = new UpdateListener[mUpdateListenerSet.size()];
@ -278,7 +273,7 @@ public abstract class Map {
}
for (UpdateListener l : mUpdateListeners)
l.onMapUpdate(mMapPosition, changed, mClearMap);
l.onMapUpdate(pos, changed, mClearMap);
mClearMap = false;
}