Revision 43020 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/FLyrVect.java
FLyrVect.java | ||
---|---|---|
899 | 899 |
*/ |
900 | 900 |
public FeatureSet queryByGeometry(Geometry geom, FeatureType featureType) throws DataException { |
901 | 901 |
FeatureQuery featureQuery = createFeatureQuery(); |
902 |
String geomName |
|
903 |
= featureStore.getDefaultFeatureType() |
|
904 |
.getDefaultGeometryAttributeName(); |
|
905 | 902 |
featureQuery.setFeatureType(featureType); |
906 | 903 |
|
907 | 904 |
Geometry query_geo = this.transformToSourceCRS(geom, true); |
... | ... | |
909 | 906 |
if (this.getCoordTrans() != null) { |
910 | 907 |
query_proj = this.getCoordTrans().getPOrig(); |
911 | 908 |
} |
912 |
|
|
913 |
IntersectsGeometryEvaluator iee |
|
914 |
= new IntersectsGeometryEvaluator( |
|
915 |
query_geo, |
|
916 |
query_proj, |
|
917 |
featureStore.getDefaultFeatureType(), |
|
918 |
geomName); |
|
909 |
Evaluator iee = SpatialEvaluatorsFactory.getInstance().intersects( |
|
910 |
query_geo, |
|
911 |
query_proj, |
|
912 |
featureStore |
|
913 |
); |
|
919 | 914 |
featureQuery.setFilter(iee); |
920 | 915 |
featureQuery.setAttributeNames(null); |
921 | 916 |
return getFeatureStore().getFeatureSet(featureQuery); |
... | ... | |
956 | 951 |
featureQuery.setAttributeNames(names); |
957 | 952 |
featureQuery.setFeatureTypeId(featureType.getId()); |
958 | 953 |
} |
959 |
String geomName = featureStore.getDefaultFeatureType() |
|
960 |
.getDefaultGeometryAttributeName(); |
|
961 | 954 |
|
962 | 955 |
Envelope query_env = fromViewPortCRSToSourceCRS(this, envelope); |
963 | 956 |
IProjection query_proj = getMapContext().getProjection(); |
... | ... | |
965 | 958 |
query_proj = this.getCoordTrans().getPOrig(); |
966 | 959 |
} |
967 | 960 |
|
968 |
IntersectsGeometryEvaluator iee
|
|
969 |
= new IntersectsGeometryEvaluator(
|
|
970 |
query_env.getGeometry(), query_proj,
|
|
971 |
featureStore.getDefaultFeatureType(),
|
|
972 |
geomName);
|
|
961 |
Evaluator iee = SpatialEvaluatorsFactory.getInstance().intersects(
|
|
962 |
query_env.getGeometry(),
|
|
963 |
query_proj,
|
|
964 |
featureStore
|
|
965 |
); |
|
973 | 966 |
featureQuery.setFilter(iee); |
974 | 967 |
return getFeatureStore().getFeatureSet(featureQuery); |
975 | 968 |
|
Also available in: Unified diff