Revision 294
org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.algorithm/org.gvsig.geoprocess.algorithm.spatialjoin/src/main/java/org/gvsig/geoprocess/algorithm/spatialjoin/SpatialJoinAlgorithm.java | ||
---|---|---|
130 | 130 |
try { |
131 | 131 |
indexName = lyr2.getFeatureStore().getDefaultFeatureType().getDefaultGeometryAttributeName(); |
132 | 132 |
FeatureAttributeDescriptor fat = lyr2.getFeatureStore().getDefaultFeatureType().getAttributeDescriptor(indexName); |
133 |
String defaultIndex = dataManager |
|
134 |
.getDefaultFeatureIndexProviderName(fat.getDataType()
|
|
135 |
.getType());
|
|
136 |
dataManager.setDefaultFeatureIndexProviderName(fat.getDataType()
|
|
137 |
.getType(), "JSIRTree");
|
|
138 |
lyr2.getFeatureStore().createIndex(lyr2.getFeatureStore().getDefaultFeatureType(), indexName, indexName + "_idx");
|
|
139 |
dataManager.setDefaultFeatureIndexProviderName(fat.getDataType()
|
|
140 |
.getType(), defaultIndex); |
|
133 |
String defaultIndex = dataManager.getDefaultFeatureIndexProviderName(
|
|
134 |
fat.getDataType().getType());
|
|
135 |
dataManager.setDefaultFeatureIndexProviderName(
|
|
136 |
fat.getDataType().getType(), "JSIRTree");
|
|
137 |
lyr2.getFeatureStore().createIndex(
|
|
138 |
lyr2.getFeatureStore().getDefaultFeatureType(), indexName, indexName + "_idx");
|
|
139 |
dataManager.setDefaultFeatureIndexProviderName( |
|
140 |
fat.getDataType().getType(), defaultIndex);
|
|
141 | 141 |
} catch (DataException e) { |
142 | 142 |
Sextante.addErrorToLog(e); |
143 | 143 |
} |
org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/FlyrVectIVectorLayer.java | ||
---|---|---|
23 | 23 |
*/ |
24 | 24 |
package org.gvsig.geoprocess.lib.sextante.dataObjects; |
25 | 25 |
|
26 |
import java.awt.geom.Rectangle2D; |
|
26 | 27 |
import java.io.File; |
27 | 28 |
import java.sql.Types; |
28 | 29 |
import java.util.Iterator; |
29 | 30 |
|
30 |
import com.vividsolutions.jts.geom.Geometry; |
|
31 |
|
|
32 |
import es.unex.sextante.core.Sextante; |
|
33 |
import es.unex.sextante.dataObjects.AbstractVectorLayer; |
|
34 |
import es.unex.sextante.dataObjects.IFeatureIterator; |
|
35 |
import es.unex.sextante.dataObjects.IVectorLayer; |
|
36 |
import es.unex.sextante.outputs.FileOutputChannel; |
|
37 |
import es.unex.sextante.outputs.IOutputChannel; |
|
38 |
|
|
39 | 31 |
import org.cresques.cts.IProjection; |
40 |
|
|
41 | 32 |
import org.gvsig.fmap.dal.DALLocator; |
42 | 33 |
import org.gvsig.fmap.dal.DataManager; |
43 | 34 |
import org.gvsig.fmap.dal.DataServerExplorer; |
... | ... | |
68 | 59 |
import org.gvsig.tools.ToolsLocator; |
69 | 60 |
import org.gvsig.tools.dataTypes.DataTypesManager; |
70 | 61 |
|
62 |
import com.vividsolutions.jts.geom.Geometry; |
|
63 |
|
|
64 |
import es.unex.sextante.core.Sextante; |
|
65 |
import es.unex.sextante.dataObjects.AbstractVectorLayer; |
|
66 |
import es.unex.sextante.dataObjects.IFeatureIterator; |
|
67 |
import es.unex.sextante.dataObjects.IVectorLayer; |
|
68 |
import es.unex.sextante.outputs.FileOutputChannel; |
|
69 |
import es.unex.sextante.outputs.IOutputChannel; |
|
70 |
|
|
71 | 71 |
public class FlyrVectIVectorLayer extends AbstractVectorLayer { |
72 | 72 |
|
73 | 73 |
private static final DataManager DATA_MANAGER = DALLocator.getDataManager(); |
... | ... | |
555 | 555 |
return featureStore; |
556 | 556 |
} |
557 | 557 |
|
558 |
|
|
559 |
public Rectangle2D getFullExtent() { |
|
560 |
org.gvsig.fmap.geom.primitive.Envelope envelope; |
|
561 |
try { |
|
562 |
envelope = featureStore.getEnvelope(); |
|
563 |
return new Rectangle2D.Double(envelope.getMinimum(0), envelope.getMinimum(1), envelope.getLength(0), envelope.getLength(1)); |
|
564 |
} catch (DataException e) { |
|
565 |
return null; |
|
566 |
} |
|
567 |
} |
|
558 | 568 |
} |
org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/AbstractSextanteGeoProcess.java | ||
---|---|---|
228 | 228 |
protected String checkAttrName(String name, int size) { |
229 | 229 |
String newName = name; |
230 | 230 |
for (int i = 0; i < size; i++) |
231 |
if (attrNames[i].compareTo(newName) == 0)
|
|
231 |
if (attrNames[i].toLowerCase().compareTo(newName.toLowerCase()) == 0)
|
|
232 | 232 |
newName = newName + "I"; |
233 | 233 |
return newName; |
234 | 234 |
} |
Also available in: Unified diff