From c02287fc9b8d13db17a1dceae4260c8e81600db5 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Fri, 21 Mar 2014 01:54:02 +0100
Subject: [PATCH] cleanup: BuildingLayer
---
.../layers/tile/vector/BuildingLayer.java | 25 +++++++++++--------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/vtm/src/org/oscim/layers/tile/vector/BuildingLayer.java b/vtm/src/org/oscim/layers/tile/vector/BuildingLayer.java
index ecb57917..4abdfdb1 100644
--- a/vtm/src/org/oscim/layers/tile/vector/BuildingLayer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/BuildingLayer.java
@@ -34,19 +34,30 @@ import org.oscim.utils.FastMath;
public class BuildingLayer extends Layer implements TileLoaderThemeHook {
//static final Logger log = LoggerFactory.getLogger(BuildingOverlay.class);
- final ExtrusionRenderer mExtLayer;
+ private final static int MIN_ZOOM = 17;
+ private final int mMinZoom;
public BuildingLayer(Map map, VectorTileLayer tileLayer) {
super(map);
tileLayer.addHook(this);
- mExtLayer = new ExtrusionRenderer(tileLayer.tileRenderer()) {
+ mMinZoom = MIN_ZOOM;
+ mRenderer = new ExtrusionRenderer(tileLayer.tileRenderer(), MIN_ZOOM);
+ }
+
+ public BuildingLayer(Map map, VectorTileLayer tileLayer, int minZoom) {
+ super(map);
+ tileLayer.addHook(this);
+
+ mMinZoom = minZoom;
+ mRenderer = new ExtrusionRenderer(tileLayer.tileRenderer(), mMinZoom) {
+
private long mStartTime;
@Override
public void update(GLViewport v) {
- boolean show = v.pos.scale >= (1 << MIN_ZOOM);
+ boolean show = v.pos.scale >= (1 << mMinZoom);
if (show) {
if (mAlpha < 1) {
@@ -79,17 +90,10 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook {
super.update(v);
}
};
-
- //mExtLayer.setColors(Color.LTGRAY, Color.GRAY, Color.DKGRAY);
- mRenderer = mExtLayer;
}
- //private int multi;
-
private final float mFadeTime = 500;
- private final static int MIN_ZOOM = 17;
-
@Override
public boolean render(MapTile tile, ElementLayers layers, MapElement element,
RenderStyle style, int level) {
@@ -129,6 +133,7 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook {
return true;
}
+ //private int multi;
//@Override
//public boolean onTouchEvent(MotionEvent e) {
// int action = e.getAction() & MotionEvent.ACTION_MASK;