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

Marker interface: more generics definitions #172

Browse Source
This commit is contained in:
Erik Duisters 2016-09-17 21:21:22 +02:00 committed by Emux
parent 0c898bf682
commit bc0bbcb4b5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtm/src/org/oscim/layers/marker/ItemizedLayer.java
View File

@ -43,8 +43,8 @@ public class ItemizedLayer<Item extends MarkerInterface> extends MarkerLayer<Ite
protected OnItemGestureListener<Item> mOnItemGestureListener; protected OnItemGestureListener<Item> mOnItemGestureListener;
protected int mDrawnItemsLimit = Integer.MAX_VALUE; protected int mDrawnItemsLimit = Integer.MAX_VALUE;
public ItemizedLayer(Map map, MarkerSymbol defaulMarker) { public ItemizedLayer(Map map, MarkerSymbol defaultMarker) {
this(map, new ArrayList<Item>(), defaulMarker, null); this(map, new ArrayList<Item>(), defaultMarker, null);
} }
public ItemizedLayer(Map map, List<Item> list, public ItemizedLayer(Map map, List<Item> list,

4
vtm/src/org/oscim/layers/marker/MarkerLayer.java
View File

@ -28,7 +28,7 @@ import org.oscim.layers.Layer;
import org.oscim.map.Map; import org.oscim.map.Map;
/** /**
* Draws a list of {@link MarkerItem} as markers to a map. The item with the * Draws a list of {@link MarkerInterface} as markers to a map. The item with the
* lowest index is drawn as last and therefore the 'topmost' marker. It also * lowest index is drawn as last and therefore the 'topmost' marker. It also
* gets checked for onTap first. This class is generic, because you then you get * gets checked for onTap first. This class is generic, because you then you get
* your custom item-class passed back in onTap(). << TODO * your custom item-class passed back in onTap(). << TODO
@ -53,7 +53,7 @@ public abstract class MarkerLayer<Item extends MarkerInterface> extends Layer {
public MarkerLayer(Map map, MarkerSymbol defaultSymbol) { public MarkerLayer(Map map, MarkerSymbol defaultSymbol) {
super(map); super(map);
mMarkerRenderer = new MarkerRenderer((MarkerLayer<MarkerItem>) this, defaultSymbol); mMarkerRenderer = new MarkerRenderer((MarkerLayer<MarkerInterface>) this, defaultSymbol);
mRenderer = mMarkerRenderer; mRenderer = mMarkerRenderer;
} }

6
vtm/src/org/oscim/layers/marker/MarkerRenderer.java
View File

@ -35,7 +35,7 @@ public class MarkerRenderer extends BucketRenderer {
private final SymbolBucket mSymbolLayer; private final SymbolBucket mSymbolLayer;
private final float[] mBox = new float[8]; private final float[] mBox = new float[8];
private final MarkerLayer<MarkerItem> mMarkerLayer; private final MarkerLayer<MarkerInterface> mMarkerLayer;
private final Point mMapPoint = new Point(); private final Point mMapPoint = new Point();
/** /**
@ -51,7 +51,7 @@ public class MarkerRenderer extends BucketRenderer {
private InternalItem[] mItems; private InternalItem[] mItems;
static class InternalItem { static class InternalItem {
MarkerItem item; MarkerInterface item;
boolean visible; boolean visible;
boolean changes; boolean changes;
float x, y; float x, y;
@ -64,7 +64,7 @@ public class MarkerRenderer extends BucketRenderer {
} }
} }
public MarkerRenderer(MarkerLayer<MarkerItem> markerLayer, MarkerSymbol defaultSymbol) { public MarkerRenderer(MarkerLayer<MarkerInterface> markerLayer, MarkerSymbol defaultSymbol) {
mSymbolLayer = new SymbolBucket(); mSymbolLayer = new SymbolBucket();
mMarkerLayer = markerLayer; mMarkerLayer = markerLayer;
mDefaultMarker = defaultSymbol; mDefaultMarker = defaultSymbol;