new com.infomatiq.jsi.rtree.RTree();
private int lowid = 0;
- private HashMap<Integer, V> idToV = new HashMap<Integer, V>();
- private HashMap<V, Integer> vToId = new HashMap<V, Integer>();
+ private HashMap<Integer, V> idToV = new HashMap<Integer, V>();
+ private HashMap<V, Integer> vToId = new HashMap<V, Integer>();
+ private HashMap<V, Rectangle> vToRect = new HashMap<V, Rectangle>();
public Iterator<V> iterator() { return vToId.keySet().iterator(); }
private final MyIntProcedure myIntProcedure = new MyIntProcedure();
- private final com.infomatiq.jsi.Rectangle rect = new com.infomatiq.jsi.Rectangle(0,0,0,0,0,0);
+ private final Rectangle rect = new Rectangle(0,0,0,0,0,0);
private final com.infomatiq.jsi.Point point = new com.infomatiq.jsi.Point(0,0,0);
private V found = null;
private Visitor<V> visitor = null;
public void clear() {
idToV.clear();
vToId.clear();
+ vToRect.clear();
rtree.init(props);
}
int id = lowid++;
idToV.put(id, v);
vToId.put(v, id);
- rect.set(v.getMinX(), v.getMinY(), v.getMinZ(), v.getMaxX(), v.getMaxY(), v.getMaxZ());
+ Rectangle rect = new Rectangle(v.getMinX(), v.getMinY(), v.getMinZ(), v.getMaxX(), v.getMaxY(), v.getMaxZ());
rtree.add(rect, id);
+ vToRect.put(v, rect);
}
public void remove(V v) {
int id = idi;
idToV.remove(id);
vToId.remove(v);
- rect.set(v.getMinX(), v.getMinY(), v.getMinZ(), v.getMaxX(), v.getMaxY(), v.getMaxZ());
- rtree.delete(rect, id);
+ rtree.delete(vToRect.get(v), id);
+ vToRect.remove(v);
}
- public V nearest(Point p) {
+ public V nearest(Point p) { return nearest(p, null); }
+ public V nearest(Point p, Visitor<V> ip) {
point.set(p.x, p.y, p.z);
+ this.visitor = ip;
rtree.nearest(point, myIntProcedure, Float.POSITIVE_INFINITY);
+ this.visitor = null;
V ret = found;
found = null;
return ret;
}
- public void range(HasBoundingBox v, Visitor vis) {
+ public void range(HasBoundingBox v, Visitor<V> vis) {
+ visitor = vis;
+ rect.set(v.getMinX(), v.getMinY(), v.getMinZ(), v.getMaxX(), v.getMaxY(), v.getMaxZ());
+ rtree.intersects(rect, myIntProcedure);
+ visitor = null;
+ }
+
+ public void range(Point p1, Point p2, Visitor<V> vis) {
visitor = vis;
+ rect.set(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z);
rtree.intersects(rect, myIntProcedure);
visitor = null;
}
private class MyIntProcedure implements IntProcedure {
public boolean execute(int id) {
+ found = idToV.get(id);
if (visitor != null) {
- V v = idToV.get(id);
- visitor.visit(v);
- return true;
+ return visitor.visit(found);
} else {
- found = idToV.get(id);
return false;
}
}