From e961eba9c0cbf2a7491ff1fdbd68222ca55122f7 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sat, 24 May 2014 15:08:30 +0200 Subject: [PATCH] rename old QuadTree -> TileIndex --- vtm/src/org/oscim/layers/tile/MapTile.java | 4 ++-- vtm/src/org/oscim/layers/tile/TileManager.java | 4 ++-- .../oscim/utils/quadtree/{QuadTree.java => TileIndex.java} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename vtm/src/org/oscim/utils/quadtree/{QuadTree.java => TileIndex.java} (97%) diff --git a/vtm/src/org/oscim/layers/tile/MapTile.java b/vtm/src/org/oscim/layers/tile/MapTile.java index 59e763fb..999b9ebd 100644 --- a/vtm/src/org/oscim/layers/tile/MapTile.java +++ b/vtm/src/org/oscim/layers/tile/MapTile.java @@ -22,7 +22,7 @@ import org.oscim.layers.tile.vector.labeling.LabelTileLoaderHook; import org.oscim.renderer.elements.ElementLayers; import org.oscim.utils.pool.Inlist; import org.oscim.utils.quadtree.TreeNode; -import org.oscim.utils.quadtree.QuadTree; +import org.oscim.utils.quadtree.TileIndex; /** * Extends Tile class to hold state and data. @@ -122,7 +122,7 @@ public class MapTile extends Tile { int lastDraw = 0; /** - * Pointer to access relatives in {@link QuadTree} + * Pointer to access relatives in {@link TileIndex} */ public final TileNode node; diff --git a/vtm/src/org/oscim/layers/tile/TileManager.java b/vtm/src/org/oscim/layers/tile/TileManager.java index b7434096..fad74388 100644 --- a/vtm/src/org/oscim/layers/tile/TileManager.java +++ b/vtm/src/org/oscim/layers/tile/TileManager.java @@ -37,7 +37,7 @@ import org.oscim.map.Viewport; import org.oscim.renderer.BufferObject; import org.oscim.utils.FastMath; import org.oscim.utils.ScanBox; -import org.oscim.utils.quadtree.QuadTree; +import org.oscim.utils.quadtree.TileIndex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -98,7 +98,7 @@ public class TileManager { private final float[] mMapPlane = new float[8]; - private final QuadTree mIndex = new QuadTree() { + private final TileIndex mIndex = new TileIndex() { @Override public void removeItem(MapTile t) { diff --git a/vtm/src/org/oscim/utils/quadtree/QuadTree.java b/vtm/src/org/oscim/utils/quadtree/TileIndex.java similarity index 97% rename from vtm/src/org/oscim/utils/quadtree/QuadTree.java rename to vtm/src/org/oscim/utils/quadtree/TileIndex.java index 33cc0c77..be302993 100644 --- a/vtm/src/org/oscim/utils/quadtree/QuadTree.java +++ b/vtm/src/org/oscim/utils/quadtree/TileIndex.java @@ -19,7 +19,7 @@ package org.oscim.utils.quadtree; /** * A quad tree for the standard map tiling schema. */ -public abstract class QuadTree, E> { +public abstract class TileIndex, E> { protected final T root; @@ -27,7 +27,7 @@ public abstract class QuadTree, E> { protected T pool; - public QuadTree() { + public TileIndex() { root = create(); root.id = -1; root.parent = root;