Revision 23842 branches/v2_0_0_prep/libraries/libFMap_spatialindex/src/org/gvsig/fmap/data/index/spatial/gt2/QuadtreeGt2.java
QuadtreeGt2.java | ||
---|---|---|
71 | 71 |
import org.geotools.index.quadtree.fs.IndexHeader; |
72 | 72 |
import org.gvsig.fmap.data.ReadException; |
73 | 73 |
import org.gvsig.fmap.data.feature.Feature; |
74 |
import org.gvsig.fmap.data.feature.FeatureID;
|
|
74 |
import org.gvsig.fmap.data.feature.FeatureReference;
|
|
75 | 75 |
import org.gvsig.fmap.data.index.IndexException; |
76 | 76 |
import org.gvsig.fmap.data.index.IndexParameters; |
77 | 77 |
import org.gvsig.fmap.data.index.spatial.AbstractIntBasedSpatialIndex; |
... | ... | |
176 | 176 |
// from old constructor |
177 | 177 |
this.byteOrder = "NM"; |
178 | 178 |
org.gvsig.fmap.geom.primitive.Envelope env = (org.gvsig.fmap.geom.primitive.Envelope) getFeatureStore().getMetadata().get("extent"); |
179 |
int numRecs = getFeatureStore().getDataCollection().size();
|
|
179 |
int numRecs = getFeatureStore().getDataSet().size();
|
|
180 | 180 |
File file = null; |
181 | 181 |
if (params.getName() == null) { |
182 | 182 |
file = File.createTempFile(getFeatureStore().getName() + "-" |
... | ... | |
351 | 351 |
public void rebuild() throws IndexException { |
352 | 352 |
try { |
353 | 353 |
getFeatureStore().refresh(); |
354 |
int numRecs = getFeatureStore().getDataCollection().size();
|
|
354 |
int numRecs = getFeatureStore().getDataSet().size();
|
|
355 | 355 |
Envelope bounds = toJtsEnvelope((org.gvsig.fmap.geom.primitive.Envelope) getFeatureStore().getMetadata().get("extent")); |
356 | 356 |
this.quadtree = new QuadTree(numRecs, bounds); |
357 |
Iterator it = getFeatureStore().getDataCollection().iterator();
|
|
357 |
Iterator it = getFeatureStore().getDataSet().iterator();
|
|
358 | 358 |
while (it.hasNext()) { |
359 | 359 |
Feature feat = (Feature) it.next(); |
360 | 360 |
Geometry geom = (Geometry) feat.get(getFeatureAttributeDescriptor().getName()); |
361 |
insert(geom.getEnvelope(), feat.getID());
|
|
361 |
insert(geom.getEnvelope(), feat.getReference());
|
|
362 | 362 |
} |
363 | 363 |
} catch (ReadException e) { |
364 | 364 |
throw new IndexException(e); |
Also available in: Unified diff