Revision 44644
| 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/SpatialEvaluatorsFactory.java | ||
|---|---|---|
| 1 | 1 |
package org.gvsig.fmap.mapcontext.layers.vectorial; |
| 2 | 2 |
|
| 3 | 3 |
import org.cresques.cts.IProjection; |
| 4 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 4 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 5 |
import org.gvsig.expressionevaluator.GeometryExpressionUtils; |
|
| 5 | 6 |
import org.gvsig.fmap.dal.exception.DataException; |
| 6 | 7 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 7 | 8 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 32 | 33 |
IProjection projection, |
| 33 | 34 |
FeatureType featureType, |
| 34 | 35 |
String geomName, |
| 35 |
ExpressionBuilder builder |
|
| 36 |
GeometryExpressionBuilder builder
|
|
| 36 | 37 |
) {
|
| 37 | 38 |
return new IntersectsGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
| 38 | 39 |
} |
| ... | ... | |
| 42 | 43 |
IProjection projection, |
| 43 | 44 |
FeatureType featureType, |
| 44 | 45 |
String geomName, |
| 45 |
ExpressionBuilder builder |
|
| 46 |
GeometryExpressionBuilder builder
|
|
| 46 | 47 |
) {
|
| 47 | 48 |
return new IntersectsEnvelopeEvaluator(envelope, projection, featureType, geomName, builder); |
| 48 | 49 |
} |
| ... | ... | |
| 55 | 56 |
try {
|
| 56 | 57 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 57 | 58 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 58 |
ExpressionBuilder builder = (ExpressionBuilder) store.createExpressionBuilder();
|
|
| 59 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 59 | 60 |
return intersects(geometry, projection, featureType, geomName,builder); |
| 60 | 61 |
} catch (DataException ex) {
|
| 61 | 62 |
throw new RuntimeException("Can't create intersects evaluator.",ex);
|
| ... | ... | |
| 70 | 71 |
) {
|
| 71 | 72 |
try {
|
| 72 | 73 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 73 |
ExpressionBuilder builder = (ExpressionBuilder) store.createExpressionBuilder();
|
|
| 74 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 74 | 75 |
return intersects(geometry, projection, featureType, geomfield, builder); |
| 75 | 76 |
} catch (DataException ex) {
|
| 76 | 77 |
throw new RuntimeException("Can't create intersects evaluator.",ex);
|
| ... | ... | |
| 85 | 86 |
try {
|
| 86 | 87 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 87 | 88 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 88 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 89 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 89 | 90 |
return intersects(envelope, projection, featureType, geomName,builder); |
| 90 | 91 |
} catch (DataException ex) {
|
| 91 | 92 |
throw new RuntimeException("Can't create intersects evaluator.",ex);
|
| ... | ... | |
| 97 | 98 |
IProjection projection, |
| 98 | 99 |
FeatureType featureType, |
| 99 | 100 |
String geomName, |
| 100 |
ExpressionBuilder builder |
|
| 101 |
GeometryExpressionBuilder builder
|
|
| 101 | 102 |
){
|
| 102 | 103 |
return new ContainsEnvelopeEvaluator(envelope, projection, featureType, geomName, builder); |
| 103 | 104 |
} |
| ... | ... | |
| 107 | 108 |
IProjection projection, |
| 108 | 109 |
FeatureType featureType, |
| 109 | 110 |
String geomName, |
| 110 |
ExpressionBuilder builder |
|
| 111 |
GeometryExpressionBuilder builder
|
|
| 111 | 112 |
){
|
| 112 | 113 |
return new ContainsGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
| 113 | 114 |
} |
| ... | ... | |
| 120 | 121 |
try {
|
| 121 | 122 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 122 | 123 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 123 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 124 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 124 | 125 |
return this.contains(geometry, projection, featureType, geomName,builder); |
| 125 | 126 |
} catch (DataException ex) {
|
| 126 | 127 |
throw new RuntimeException("Can't create contains evaluator.",ex);
|
| ... | ... | |
| 135 | 136 |
try {
|
| 136 | 137 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 137 | 138 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 138 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 139 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 139 | 140 |
return this.contains(envelope, projection, featureType, geomName,builder); |
| 140 | 141 |
} catch (DataException ex) {
|
| 141 | 142 |
throw new RuntimeException("Can't create contains evaluator.",ex);
|
| ... | ... | |
| 147 | 148 |
IProjection projection, |
| 148 | 149 |
FeatureType featureType, |
| 149 | 150 |
String geomName, |
| 150 |
ExpressionBuilder builder |
|
| 151 |
GeometryExpressionBuilder builder
|
|
| 151 | 152 |
){
|
| 152 | 153 |
return new OutGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
| 153 | 154 |
} |
| ... | ... | |
| 160 | 161 |
try {
|
| 161 | 162 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 162 | 163 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 163 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 164 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 164 | 165 |
return this.not_contains(geometry, projection, featureType, geomName,builder); |
| 165 | 166 |
} catch (DataException ex) {
|
| 166 | 167 |
throw new RuntimeException("Can't create not_contains evaluator.",ex);
|
| ... | ... | |
| 172 | 173 |
IProjection projection, |
| 173 | 174 |
FeatureType featureType, |
| 174 | 175 |
String geomName, |
| 175 |
ExpressionBuilder builder |
|
| 176 |
GeometryExpressionBuilder builder
|
|
| 176 | 177 |
) {
|
| 177 | 178 |
return new CrossesGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
| 178 | 179 |
} |
| ... | ... | |
| 182 | 183 |
IProjection projection, |
| 183 | 184 |
FeatureType featureType, |
| 184 | 185 |
String geomName, |
| 185 |
ExpressionBuilder builder |
|
| 186 |
GeometryExpressionBuilder builder
|
|
| 186 | 187 |
) {
|
| 187 | 188 |
return new CrossEnvelopeEvaluator(envelope, projection, featureType, geomName, builder); |
| 188 | 189 |
} |
| ... | ... | |
| 195 | 196 |
try {
|
| 196 | 197 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 197 | 198 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 198 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 199 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 199 | 200 |
return this.crosses(geometry, projection, featureType, geomName,builder); |
| 200 | 201 |
} catch (DataException ex) {
|
| 201 | 202 |
throw new RuntimeException("Can't create crosses evaluator.",ex);
|
| ... | ... | |
| 210 | 211 |
try {
|
| 211 | 212 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 212 | 213 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 213 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 214 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 214 | 215 |
return this.crosses(envelope, projection, featureType, geomName,builder); |
| 215 | 216 |
} catch (DataException ex) {
|
| 216 | 217 |
throw new RuntimeException("Can't create crosses evaluator.",ex);
|
| ... | ... | |
| 222 | 223 |
IProjection projection, |
| 223 | 224 |
FeatureType featureType, |
| 224 | 225 |
String geomName, |
| 225 |
ExpressionBuilder builder |
|
| 226 |
GeometryExpressionBuilder builder
|
|
| 226 | 227 |
) {
|
| 227 | 228 |
return new DisjointGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
| 228 | 229 |
} |
| ... | ... | |
| 235 | 236 |
try {
|
| 236 | 237 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 237 | 238 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 238 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 239 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 239 | 240 |
return this.disjoint(geometry, projection, featureType, geomName,builder); |
| 240 | 241 |
} catch (DataException ex) {
|
| 241 | 242 |
throw new RuntimeException("Can't create disjoint evaluator.",ex);
|
| ... | ... | |
| 247 | 248 |
IProjection projection, |
| 248 | 249 |
FeatureType featureType, |
| 249 | 250 |
String geomName, |
| 250 |
ExpressionBuilder builder |
|
| 251 |
GeometryExpressionBuilder builder
|
|
| 251 | 252 |
) {
|
| 252 | 253 |
return new OverlapsGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
| 253 | 254 |
} |
| ... | ... | |
| 260 | 261 |
try {
|
| 261 | 262 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 262 | 263 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 263 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 264 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 264 | 265 |
return this.overlaps(geometry, projection, featureType, geomName,builder); |
| 265 | 266 |
} catch (DataException ex) {
|
| 266 | 267 |
throw new RuntimeException("Can't create overlaps evaluator.",ex);
|
| ... | ... | |
| 272 | 273 |
IProjection projection, |
| 273 | 274 |
FeatureType featureType, |
| 274 | 275 |
String geomName, |
| 275 |
ExpressionBuilder builder |
|
| 276 |
GeometryExpressionBuilder builder
|
|
| 276 | 277 |
) {
|
| 277 | 278 |
return new TouchesGeometryEvaluator(geometry, projection, featureType, geomName,builder); |
| 278 | 279 |
} |
| ... | ... | |
| 285 | 286 |
try {
|
| 286 | 287 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 287 | 288 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 288 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 289 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 289 | 290 |
return this.touches(geometry, projection, featureType, geomName,builder); |
| 290 | 291 |
} catch (DataException ex) {
|
| 291 | 292 |
throw new RuntimeException("Can't create touches evaluator.",ex);
|
| ... | ... | |
| 297 | 298 |
IProjection projection, |
| 298 | 299 |
FeatureType featureType, |
| 299 | 300 |
String geomName, |
| 300 |
ExpressionBuilder builder |
|
| 301 |
GeometryExpressionBuilder builder
|
|
| 301 | 302 |
) {
|
| 302 | 303 |
return new WithinGeometryEvaluator(geometry, projection, featureType, geomName,builder); |
| 303 | 304 |
} |
| ... | ... | |
| 310 | 311 |
try {
|
| 311 | 312 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 312 | 313 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 313 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 314 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 314 | 315 |
return this.within(geometry, projection, featureType, geomName,builder); |
| 315 | 316 |
} catch (DataException ex) {
|
| 316 | 317 |
throw new RuntimeException("Can't create within evaluator.",ex);
|
| ... | ... | |
| 322 | 323 |
IProjection projection, |
| 323 | 324 |
FeatureType featureType, |
| 324 | 325 |
String geomName, |
| 325 |
ExpressionBuilder builder |
|
| 326 |
GeometryExpressionBuilder builder
|
|
| 326 | 327 |
) {
|
| 327 | 328 |
return new EqualsGeometryEvaluator(geometry, projection, featureType, geomName,builder); |
| 328 | 329 |
} |
| ... | ... | |
| 335 | 336 |
try {
|
| 336 | 337 |
FeatureType featureType = store.getDefaultFeatureType(); |
| 337 | 338 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
| 338 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
| 339 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
| 339 | 340 |
return this.equals(geometry, projection, featureType, geomName,builder); |
| 340 | 341 |
} catch (DataException ex) {
|
| 341 | 342 |
throw new RuntimeException("Can't create equals evaluator.",ex);
|
| 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/ContainsEnvelopeEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.IProjection; |
| 26 | 26 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 27 | 28 |
|
| 28 | 29 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 30 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| ... | ... | |
| 40 | 41 |
private final String geomName; |
| 41 | 42 |
private final Envelope envelopeTrans; |
| 42 | 43 |
private final boolean isDefault; |
| 43 |
private final ExpressionBuilder builder; |
|
| 44 |
private final GeometryExpressionBuilder builder;
|
|
| 44 | 45 |
private final IProjection projection; |
| 45 | 46 |
private final FeatureAttributeDescriptor fad; |
| 46 | 47 |
|
| ... | ... | |
| 49 | 50 |
IProjection envelopeProjection, |
| 50 | 51 |
FeatureType featureType, |
| 51 | 52 |
String geomName, |
| 52 |
ExpressionBuilder builder |
|
| 53 |
GeometryExpressionBuilder builder
|
|
| 53 | 54 |
) {
|
| 54 | 55 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 55 | 56 |
this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName); |
| 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/WithinGeometryEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.ICoordTrans; |
| 26 | 26 |
import org.cresques.cts.IProjection; |
| 27 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 28 | 28 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 39 | 39 |
private final Geometry geometry; |
| 40 | 40 |
private final Geometry geometryTrans; |
| 41 | 41 |
private final boolean isDefault; |
| 42 |
private final ExpressionBuilder builder; |
|
| 42 |
private final GeometryExpressionBuilder builder;
|
|
| 43 | 43 |
private final IProjection projection; |
| 44 | 44 |
private final FeatureAttributeDescriptor fad; |
| 45 | 45 |
|
| ... | ... | |
| 48 | 48 |
IProjection projection, |
| 49 | 49 |
FeatureType featureType, |
| 50 | 50 |
String geomName, |
| 51 |
ExpressionBuilder builder |
|
| 51 |
GeometryExpressionBuilder builder
|
|
| 52 | 52 |
) {
|
| 53 | 53 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 54 | 54 |
this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName); |
| 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/IntersectsEnvelopeEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.IProjection; |
| 26 | 26 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 27 | 28 |
|
| 28 | 29 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 30 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| ... | ... | |
| 41 | 42 |
private final boolean isDefault; |
| 42 | 43 |
private final String defaultGeometryAttributeName; |
| 43 | 44 |
private final IProjection projection; |
| 44 |
private final ExpressionBuilder builder; |
|
| 45 |
private final GeometryExpressionBuilder builder;
|
|
| 45 | 46 |
FeatureAttributeDescriptor fad; |
| 46 | 47 |
|
| 47 | 48 |
IntersectsEnvelopeEvaluator( |
| ... | ... | |
| 49 | 50 |
IProjection envelopeProjection, |
| 50 | 51 |
FeatureType featureType, |
| 51 | 52 |
String geomName, |
| 52 |
ExpressionBuilder builder |
|
| 53 |
GeometryExpressionBuilder builder
|
|
| 53 | 54 |
) {
|
| 54 | 55 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 55 | 56 |
defaultGeometryAttributeName = featureType.getDefaultGeometryAttributeName(); |
| 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/OutGeometryEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.ICoordTrans; |
| 26 | 26 |
import org.cresques.cts.IProjection; |
| 27 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 28 | 28 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 39 | 39 |
private final Geometry geometry; |
| 40 | 40 |
private final Geometry geometryTrans; |
| 41 | 41 |
private final boolean isDefault; |
| 42 |
private final ExpressionBuilder builder; |
|
| 42 |
private final GeometryExpressionBuilder builder;
|
|
| 43 | 43 |
private final IProjection projection; |
| 44 | 44 |
private final FeatureAttributeDescriptor fad; |
| 45 | 45 |
|
| ... | ... | |
| 48 | 48 |
IProjection envelopeProjection, |
| 49 | 49 |
FeatureType featureType, |
| 50 | 50 |
String geomName, |
| 51 |
ExpressionBuilder builder |
|
| 51 |
GeometryExpressionBuilder builder
|
|
| 52 | 52 |
) {
|
| 53 | 53 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 54 | 54 |
this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName); |
| 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/TouchesGeometryEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.ICoordTrans; |
| 26 | 26 |
import org.cresques.cts.IProjection; |
| 27 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 28 | 28 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 39 | 39 |
private final Geometry geometry; |
| 40 | 40 |
private final Geometry geometryTrans; |
| 41 | 41 |
private final boolean isDefault; |
| 42 |
private final ExpressionBuilder builder; |
|
| 42 |
private final GeometryExpressionBuilder builder;
|
|
| 43 | 43 |
private final IProjection projection; |
| 44 | 44 |
private final FeatureAttributeDescriptor fad; |
| 45 | 45 |
|
| ... | ... | |
| 47 | 47 |
IProjection projection, |
| 48 | 48 |
FeatureType featureType, |
| 49 | 49 |
String geomName, |
| 50 |
ExpressionBuilder builder |
|
| 50 |
GeometryExpressionBuilder builder
|
|
| 51 | 51 |
) {
|
| 52 | 52 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 53 | 53 |
this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName); |
| 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/CrossEnvelopeEvaluator.java | ||
|---|---|---|
| 23 | 23 |
package org.gvsig.fmap.mapcontext.layers.vectorial; |
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.IProjection; |
| 26 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 26 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 27 | 27 |
|
| 28 | 28 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| ... | ... | |
| 40 | 40 |
private final String geomName; |
| 41 | 41 |
private final Envelope envelopeTrans; |
| 42 | 42 |
private final boolean isDefault; |
| 43 |
private final ExpressionBuilder builder; |
|
| 43 |
private final GeometryExpressionBuilder builder;
|
|
| 44 | 44 |
private final IProjection projection; |
| 45 | 45 |
private final FeatureAttributeDescriptor fad; |
| 46 | 46 |
|
| ... | ... | |
| 49 | 49 |
IProjection envelopeProjection, |
| 50 | 50 |
FeatureType featureType, |
| 51 | 51 |
String geomName, |
| 52 |
ExpressionBuilder builder |
|
| 52 |
GeometryExpressionBuilder builder
|
|
| 53 | 53 |
) {
|
| 54 | 54 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 55 | 55 |
|
| 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/ContainsGeometryEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.ICoordTrans; |
| 26 | 26 |
import org.cresques.cts.IProjection; |
| 27 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 28 | 28 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 40 | 40 |
private final Geometry geometry; |
| 41 | 41 |
private final Geometry geometryTrans; |
| 42 | 42 |
private final boolean isDefault; |
| 43 |
private final ExpressionBuilder builder; |
|
| 43 |
private final GeometryExpressionBuilder builder;
|
|
| 44 | 44 |
private final IProjection projection; |
| 45 | 45 |
private final FeatureAttributeDescriptor fad; |
| 46 | 46 |
|
| ... | ... | |
| 49 | 49 |
IProjection projection, |
| 50 | 50 |
FeatureType featureType, |
| 51 | 51 |
String geomName, |
| 52 |
ExpressionBuilder builder |
|
| 52 |
GeometryExpressionBuilder builder
|
|
| 53 | 53 |
) {
|
| 54 | 54 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 55 | 55 |
this.projection = projection; |
| 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/CrossesGeometryEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.ICoordTrans; |
| 26 | 26 |
import org.cresques.cts.IProjection; |
| 27 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 28 | 28 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 39 | 39 |
private final Geometry geometry; |
| 40 | 40 |
private final Geometry geometryTrans; |
| 41 | 41 |
private final boolean isDefault; |
| 42 |
private final ExpressionBuilder builder; |
|
| 42 |
private final GeometryExpressionBuilder builder;
|
|
| 43 | 43 |
private final IProjection projection; |
| 44 | 44 |
private final FeatureAttributeDescriptor fad; |
| 45 | 45 |
|
| ... | ... | |
| 48 | 48 |
IProjection projection, |
| 49 | 49 |
FeatureType featureType, |
| 50 | 50 |
String geomName, |
| 51 |
ExpressionBuilder builder |
|
| 51 |
GeometryExpressionBuilder builder
|
|
| 52 | 52 |
) {
|
| 53 | 53 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 54 | 54 |
this.projection = projection; |
| 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/DisjointGeometryEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.ICoordTrans; |
| 26 | 26 |
import org.cresques.cts.IProjection; |
| 27 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 28 | 28 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 40 | 40 |
private final Geometry geometry; |
| 41 | 41 |
private final Geometry geometryTrans; |
| 42 | 42 |
private final boolean isDefault; |
| 43 |
private final ExpressionBuilder builder; |
|
| 43 |
private final GeometryExpressionBuilder builder;
|
|
| 44 | 44 |
private final IProjection projection; |
| 45 | 45 |
private final FeatureAttributeDescriptor fad; |
| 46 | 46 |
|
| ... | ... | |
| 49 | 49 |
IProjection projection, |
| 50 | 50 |
FeatureType featureType, |
| 51 | 51 |
String geomName, |
| 52 |
ExpressionBuilder builder |
|
| 52 |
GeometryExpressionBuilder builder
|
|
| 53 | 53 |
) {
|
| 54 | 54 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 55 | 55 |
this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName); |
| 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/IntersectsGeometryEvaluator.java | ||
|---|---|---|
| 25 | 25 |
import org.cresques.cts.ICoordTrans; |
| 26 | 26 |
import org.cresques.cts.IProjection; |
| 27 | 27 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 28 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 28 | 29 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 30 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 30 | 31 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 39 | 40 |
private final Geometry geometry; |
| 40 | 41 |
private final Geometry geometryTrans; |
| 41 | 42 |
private final boolean isDefault; |
| 42 |
private final ExpressionBuilder builder; |
|
| 43 |
private final GeometryExpressionBuilder builder;
|
|
| 43 | 44 |
private final IProjection projection; |
| 44 | 45 |
private final FeatureAttributeDescriptor fad; |
| 45 | 46 |
|
| ... | ... | |
| 48 | 49 |
IProjection projection, |
| 49 | 50 |
FeatureType featureType, |
| 50 | 51 |
String geomName, |
| 51 |
ExpressionBuilder builder |
|
| 52 |
GeometryExpressionBuilder builder
|
|
| 52 | 53 |
) {
|
| 53 | 54 |
fad = (FeatureAttributeDescriptor) featureType |
| 54 | 55 |
.get(geomName); |
| 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/EqualsGeometryEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.ICoordTrans; |
| 26 | 26 |
import org.cresques.cts.IProjection; |
| 27 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 28 | 28 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 39 | 39 |
private final Geometry geometry; |
| 40 | 40 |
private final Geometry geometryTrans; |
| 41 | 41 |
private final boolean isDefault; |
| 42 |
private final ExpressionBuilder builder; |
|
| 42 |
private final GeometryExpressionBuilder builder;
|
|
| 43 | 43 |
private final IProjection projection; |
| 44 | 44 |
private final FeatureAttributeDescriptor fad; |
| 45 | 45 |
|
| ... | ... | |
| 48 | 48 |
IProjection projection, |
| 49 | 49 |
FeatureType featureType, |
| 50 | 50 |
String geomName, |
| 51 |
ExpressionBuilder builder |
|
| 51 |
GeometryExpressionBuilder builder
|
|
| 52 | 52 |
) {
|
| 53 | 53 |
this.builder = builder; |
| 54 | 54 |
this.projection = projection; |
| 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/OverlapsGeometryEvaluator.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.cresques.cts.ICoordTrans; |
| 26 | 26 |
import org.cresques.cts.IProjection; |
| 27 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 27 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 28 | 28 |
import org.gvsig.fmap.dal.feature.Feature; |
| 29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| ... | ... | |
| 44 | 44 |
private final Geometry geometry; |
| 45 | 45 |
private final Geometry geometryTrans; |
| 46 | 46 |
private final boolean isDefault; |
| 47 |
private final ExpressionBuilder builder; |
|
| 47 |
private final GeometryExpressionBuilder builder;
|
|
| 48 | 48 |
private final IProjection projection; |
| 49 | 49 |
private final FeatureAttributeDescriptor fad; |
| 50 | 50 |
|
| ... | ... | |
| 53 | 53 |
IProjection projection, |
| 54 | 54 |
FeatureType featureType, |
| 55 | 55 |
String geomName, |
| 56 |
ExpressionBuilder builder |
|
| 56 |
GeometryExpressionBuilder builder
|
|
| 57 | 57 |
) {
|
| 58 | 58 |
fad = (FeatureAttributeDescriptor) featureType.get(geomName); |
| 59 | 59 |
this.isDefault = featureType.getDefaultGeometryAttributeName().equals(geomName); |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/pom.xml | ||
|---|---|---|
| 66 | 66 |
</dependency> |
| 67 | 67 |
<dependency> |
| 68 | 68 |
<groupId>org.gvsig</groupId> |
| 69 |
<artifactId>org.gvsig.expressionevaluator.geometry.lib.impl</artifactId> |
|
| 70 |
<scope>test</scope> |
|
| 71 |
</dependency> |
|
| 72 |
<dependency> |
|
| 73 |
<groupId>org.gvsig</groupId> |
|
| 69 | 74 |
<artifactId>${org.gvsig.proj.lib.impl}</artifactId>
|
| 70 | 75 |
<scope>test</scope> |
| 71 | 76 |
</dependency> |
| 72 |
<dependency> |
|
| 73 |
<artifactId>junit</artifactId> |
|
| 74 |
<groupId>junit</groupId> |
|
| 75 |
<version>4.11</version> |
|
| 76 |
</dependency> |
|
| 77 | 77 |
</dependencies> |
| 78 | 78 |
|
| 79 | 79 |
|
| 80 | 80 |
<build> |
| 81 | 81 |
<plugins> |
| 82 |
<!-- <plugin> |
|
| 82 |
|
|
| 83 |
<!-- Skip test execution ? --> |
|
| 84 |
<plugin> |
|
| 83 | 85 |
<groupId>org.apache.maven.plugins</groupId> |
| 84 | 86 |
<artifactId>maven-surefire-plugin</artifactId> |
| 85 | 87 |
<configuration> |
| 86 |
<skipTests>true</skipTests>
|
|
| 88 |
<skipTests>false</skipTests>
|
|
| 87 | 89 |
</configuration> |
| 88 |
</plugin>--> |
|
| 89 |
<!-- |
|
| 90 |
</plugin> |
|
| 91 |
|
|
| 92 |
<!-- Skip test compilation ? --> |
|
| 90 | 93 |
<plugin> |
| 91 | 94 |
<groupId>org.apache.maven.plugins</groupId> |
| 92 | 95 |
<artifactId>maven-compiler-plugin</artifactId> |
| ... | ... | |
| 98 | 101 |
<goal>testCompile</goal> |
| 99 | 102 |
</goals> |
| 100 | 103 |
<configuration> |
| 101 |
<skip>true</skip>
|
|
| 104 |
<skip>false</skip>
|
|
| 102 | 105 |
</configuration> |
| 103 | 106 |
</execution> |
| 104 | 107 |
</executions> |
| 105 | 108 |
</plugin> |
| 106 |
--> |
|
| 109 |
|
|
| 110 |
<!-- Ignore test execution failure ? --> |
|
| 107 | 111 |
<plugin> |
| 108 | 112 |
<groupId>org.apache.maven.plugins</groupId> |
| 109 | 113 |
<artifactId>maven-surefire-plugin</artifactId> |
| 110 |
<version>2.15</version> |
|
| 114 |
<configuration> |
|
| 115 |
<testFailureIgnore>false</testFailureIgnore> |
|
| 116 |
</configuration> |
|
| 111 | 117 |
</plugin> |
| 118 |
|
|
| 112 | 119 |
</plugins> |
| 113 | 120 |
</build> |
| 114 | 121 |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/test/java/org/gvsig/fmap/dal/store/jdbc2/SQLBuilderTest.java | ||
|---|---|---|
| 1 | 1 |
package org.gvsig.fmap.dal.store.jdbc2; |
| 2 | 2 |
|
| 3 |
import java.util.List; |
|
| 4 | 3 |
import junit.framework.TestCase; |
| 5 | 4 |
import org.apache.commons.lang3.ArrayUtils; |
| 6 | 5 |
import org.cresques.cts.IProjection; |
| 7 | 6 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 7 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 8 | 8 |
import org.gvsig.fmap.crs.CRSFactory; |
| 9 | 9 |
import org.gvsig.fmap.dal.DALLocator; |
| 10 | 10 |
import org.gvsig.fmap.dal.DataManager; |
| ... | ... | |
| 56 | 56 |
limit.addVertex(0, 0); |
| 57 | 57 |
|
| 58 | 58 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 59 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 59 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 60 | 60 |
|
| 61 | 61 |
sqlbuilder.select().column().value( |
| 62 | 62 |
expbuilder.as_geometry( |
| ... | ... | |
| 328 | 328 |
IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
| 329 | 329 |
|
| 330 | 330 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 331 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 331 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 332 | 332 |
|
| 333 | 333 |
sqlbuilder.insert().table().database("master").schema("dbo").name("test1");
|
| 334 | 334 |
sqlbuilder.insert().column().name("id").with_value(expbuilder.parameter("id"));
|
| 335 | 335 |
sqlbuilder.insert().column().name("name").with_value(expbuilder.parameter("name"));
|
| 336 |
sqlbuilder.insert().column().name("geom").with_value(expbuilder.parameter("geom").as_geometry_variable().srs(proj));
|
|
| 336 |
sqlbuilder.insert().column().name("geom").with_value(expbuilder.parameter("geom").as_variable().srs(proj));
|
|
| 337 | 337 |
|
| 338 | 338 |
System.out.println("# Test:: testPerformInserts1");
|
| 339 | 339 |
System.out.println("# SQL:: " + sqlbuilder.toString());
|
| ... | ... | |
| 357 | 357 |
IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
| 358 | 358 |
|
| 359 | 359 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 360 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 360 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 361 | 361 |
|
| 362 | 362 |
sqlbuilder.insert().table().database("master").schema("dbo").name("test1");
|
| 363 | 363 |
sqlbuilder.insert().column().name("id").with_value(expbuilder.parameter("id"));
|
| 364 | 364 |
sqlbuilder.insert().column().name("name").with_value(expbuilder.parameter("name"));
|
| 365 |
sqlbuilder.insert().column().name("geom").with_value(expbuilder.parameter("geom").as_geometry_variable().srs(proj));
|
|
| 365 |
sqlbuilder.insert().column().name("geom").with_value(expbuilder.parameter("geom").as_variable().srs(proj));
|
|
| 366 | 366 |
|
| 367 | 367 |
System.out.println("# Test:: testPerformInserts2");
|
| 368 | 368 |
System.out.println("# SQL:: " + sqlbuilder.toString());
|
| ... | ... | |
| 386 | 386 |
IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
| 387 | 387 |
|
| 388 | 388 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 389 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 389 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 390 | 390 |
|
| 391 | 391 |
sqlbuilder.update().table().database("master").schema("dbo").name("test1");
|
| 392 | 392 |
sqlbuilder.update().where().and( |
| ... | ... | |
| 397 | 397 |
); |
| 398 | 398 |
sqlbuilder.update().column().name("name").with_value(expbuilder.parameter("name"));
|
| 399 | 399 |
sqlbuilder.update().column().name("geom").with_value(
|
| 400 |
expbuilder.parameter("geom").as_geometry_variable().srs(proj)
|
|
| 400 |
expbuilder.parameter("geom").as_variable().srs(proj)
|
|
| 401 | 401 |
); |
| 402 | 402 |
|
| 403 | 403 |
System.out.println("# Test:: testPerformUpdates");
|
| ... | ... | |
| 422 | 422 |
IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
| 423 | 423 |
|
| 424 | 424 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 425 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 425 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 426 | 426 |
|
| 427 | 427 |
sqlbuilder.update().table().database("master").schema("dbo").name("test1");
|
| 428 | 428 |
sqlbuilder.update().where().and( |
| ... | ... | |
| 433 | 433 |
); |
| 434 | 434 |
sqlbuilder.update().column().name("name").with_value(expbuilder.parameter("name"));
|
| 435 | 435 |
sqlbuilder.update().column().name("geom").with_value(
|
| 436 |
expbuilder.parameter("geom").as_geometry_variable()
|
|
| 436 |
expbuilder.parameter("geom").as_variable()
|
|
| 437 | 437 |
.srs(expbuilder.parameter().value(proj)) |
| 438 | 438 |
); |
| 439 | 439 |
|
| ... | ... | |
| 574 | 574 |
|
| 575 | 575 |
//# Test:: testForeingValue |
| 576 | 576 |
//# SQL1:: SELECT "ID", "NAME", "DESCRIPTION", "TYPE" FROM "dbo"."test1" WHERE (( (FOREING_VALUE('TYPE.DESCRIPTION')) LIKE ('A%') ) AND ( (FOREING_VALUE('PHONE_TYPE.DESCRIPTION')) = ('mobile') ))
|
| 577 |
//# SQL2:: SELECT "ID", "NAME", "dbo"."test1"."DESCRIPTION", "TYPE", "dbo"."TYPES"."DESCRIPTION", "dbo"."PHONE_TYPES"."DESCRIPTION" FROM "dbo"."test1" LEFT JOIN "dbo"."TYPES" ON ( ("dbo"."test1"."TYPE") = ("dbo"."TYPES"."ID") ) LEFT JOIN "dbo"."PHONE_TYPES" ON ( ("dbo"."test1"."PHONE_TYPE") = ("dbo"."PHONE_TYPES"."ID") ) WHERE (( ("dbo"."TYPES"."DESCRIPTION") LIKE ('A%') ) AND ( ("dbo"."PHONE_TYPES"."DESCRIPTION") = ('mobile') ))
|
|
| 577 |
//# SQL2:: SELECT "ID", "NAME", "dbo"."test1"."DESCRIPTION", "dbo"."test1"."TYPE", "dbo"."TYPES"."DESCRIPTION", "dbo"."PHONE_TYPES"."DESCRIPTION" FROM "dbo"."test1" LEFT JOIN "dbo"."TYPES" ON ( ("dbo"."test1"."TYPE") = ("dbo"."TYPES"."ID") ) LEFT JOIN "dbo"."PHONE_TYPES" ON ( ("dbo"."test1"."PHONE_TYPE") = ("dbo"."PHONE_TYPES"."ID") ) WHERE (( ("dbo"."TYPES"."DESCRIPTION") LIKE ('A%') ) AND ( ("dbo"."PHONE_TYPES"."DESCRIPTION") = ('mobile') ))
|
|
| 578 | 578 |
//# Variables:: [DESCRIPTION, DESCRIPTION, DESCRIPTION, ID, NAME, TYPE] |
| 579 | 579 |
//# Parametros:: [] |
| 580 | 580 |
//# attrNames:: [TYPE.DESCRIPTION, PHONE_TYPE.DESCRIPTION] |
| 581 | 581 |
|
| 582 | 582 |
assertEquals( |
| 583 |
"SELECT \"ID\", \"NAME\", \"dbo\".\"test1\".\"DESCRIPTION\", \"TYPE\", \"dbo\".\"TYPES\".\"DESCRIPTION\", \"dbo\".\"PHONE_TYPES\".\"DESCRIPTION\" FROM \"dbo\".\"test1\" LEFT JOIN \"dbo\".\"TYPES\" ON ( (\"dbo\".\"test1\".\"TYPE\") = (\"dbo\".\"TYPES\".\"ID\") ) LEFT JOIN \"dbo\".\"PHONE_TYPES\" ON ( (\"dbo\".\"test1\".\"PHONE_TYPE\") = (\"dbo\".\"PHONE_TYPES\".\"ID\") ) WHERE (( (\"dbo\".\"TYPES\".\"DESCRIPTION\") LIKE ('A%') ) AND ( (\"dbo\".\"PHONE_TYPES\".\"DESCRIPTION\") = ('mobile') ))",
|
|
| 583 |
"SELECT \"ID\", \"NAME\", \"dbo\".\"test1\".\"DESCRIPTION\", \"dbo\".\"test1\".\"TYPE\", \"dbo\".\"TYPES\".\"DESCRIPTION\", \"dbo\".\"PHONE_TYPES\".\"DESCRIPTION\" FROM \"dbo\".\"test1\" LEFT JOIN \"dbo\".\"TYPES\" ON ( (\"dbo\".\"test1\".\"TYPE\") = (\"dbo\".\"TYPES\".\"ID\") ) LEFT JOIN \"dbo\".\"PHONE_TYPES\" ON ( (\"dbo\".\"test1\".\"PHONE_TYPE\") = (\"dbo\".\"PHONE_TYPES\".\"ID\") ) WHERE (( (\"dbo\".\"TYPES\".\"DESCRIPTION\") LIKE ('A%') ) AND ( (\"dbo\".\"PHONE_TYPES\".\"DESCRIPTION\") = ('mobile') ))",
|
|
| 584 | 584 |
sqlbuilder.toString() |
| 585 | 585 |
); |
| 586 | 586 |
assertEquals( |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/operations/CalculateEnvelopeOfColumnOperation.java | ||
|---|---|---|
| 6 | 6 |
import java.sql.Statement; |
| 7 | 7 |
import org.apache.commons.lang3.StringUtils; |
| 8 | 8 |
import org.cresques.cts.IProjection; |
| 9 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 10 | 9 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Variable; |
| 10 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 11 | 11 |
import org.gvsig.fmap.dal.exception.DataException; |
| 12 | 12 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| 13 | 13 |
import org.gvsig.fmap.dal.store.jdbc.exception.JDBCSQLException; |
| ... | ... | |
| 79 | 79 |
// https://alastaira.wordpress.com/2011/07/26/determining-the-geographic-extent-of-spatial-features-in-a-sql-server-table/ |
| 80 | 80 |
// |
| 81 | 81 |
JDBCSQLBuilderBase sqlbuilder = this.createSQLBuilder(); |
| 82 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 82 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 83 | 83 |
|
| 84 | 84 |
sqlbuilder.select().column().value( |
| 85 | 85 |
// expbuilder.ifnull( |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/operations/PerformChangesOperation.java | ||
|---|---|---|
| 11 | 11 |
import org.apache.commons.lang3.StringUtils; |
| 12 | 12 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 13 | 13 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Variable; |
| 14 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 14 | 15 |
import org.gvsig.fmap.dal.DataTypes; |
| 15 | 16 |
import org.gvsig.fmap.dal.exception.DataException; |
| 16 | 17 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| ... | ... | |
| 159 | 160 |
FeatureType type |
| 160 | 161 |
) {
|
| 161 | 162 |
JDBCSQLBuilderBase sqlbuilder = createSQLBuilder(); |
| 162 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 163 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 163 | 164 |
|
| 164 | 165 |
sqlbuilder.insert().table() |
| 165 | 166 |
.database(this.table.getDatabase()) |
| ... | ... | |
| 171 | 172 |
} |
| 172 | 173 |
if (attr.getType() == DataTypes.GEOMETRY) {
|
| 173 | 174 |
sqlbuilder.insert().column().name(attr.getName()).with_value( |
| 174 |
expbuilder.parameter(attr.getName()).as_geometry_variable()
|
|
| 175 |
expbuilder.parameter(attr.getName()).as_variable() |
|
| 175 | 176 |
.srs( |
| 176 | 177 |
expbuilder.parameter().value( |
| 177 | 178 |
attr.getSRS()).as_constant() |
| ... | ... | |
| 228 | 229 |
FeatureType type |
| 229 | 230 |
) {
|
| 230 | 231 |
JDBCSQLBuilderBase sqlbuilder = createSQLBuilder(); |
| 231 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 232 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 232 | 233 |
|
| 233 | 234 |
sqlbuilder.update().table() |
| 234 | 235 |
.database(this.table.getDatabase()) |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/operations/AppendOperation.java | ||
|---|---|---|
| 4 | 4 |
import java.sql.Connection; |
| 5 | 5 |
import java.sql.PreparedStatement; |
| 6 | 6 |
import java.sql.SQLException; |
| 7 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 7 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
|
|
| 8 | 8 |
import org.gvsig.fmap.dal.DataTypes; |
| 9 | 9 |
import org.gvsig.fmap.dal.exception.DataException; |
| 10 | 10 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| ... | ... | |
| 28 | 28 |
protected final FeatureType type; |
| 29 | 29 |
|
| 30 | 30 |
protected JDBCSQLBuilderBase sqlbuilder = null; |
| 31 |
protected ExpressionBuilder expbuilder; |
|
| 31 |
protected GeometryExpressionBuilder expbuilder;
|
|
| 32 | 32 |
|
| 33 | 33 |
protected PreparedStatement preparedStatement; |
| 34 | 34 |
protected String sql; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/JDBCSQLBuilderBase.java | ||
|---|---|---|
| 7 | 7 |
import java.util.Date; |
| 8 | 8 |
import java.util.List; |
| 9 | 9 |
import org.cresques.cts.IProjection; |
| 10 |
import org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType; |
|
| 11 | 10 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Parameter; |
| 11 |
import static org.gvsig.expressionevaluator.GeometryExpressionBuilderHelper.GeometrySupportType; |
|
| 12 | 12 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| 13 | 13 |
import org.gvsig.fmap.dal.feature.FeatureReference; |
| 14 | 14 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/JDBCHelperBase.java | ||
|---|---|---|
| 12 | 12 |
import org.apache.commons.lang3.mutable.MutableBoolean; |
| 13 | 13 |
import org.gvsig.expressionevaluator.Code; |
| 14 | 14 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 15 |
import org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType; |
|
| 16 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType.EWKB; |
|
| 17 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType.NATIVE; |
|
| 18 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType.WKB; |
|
| 19 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType.WKT; |
|
| 20 | 15 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator; |
| 21 | 16 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager; |
| 22 | 17 |
import org.gvsig.expressionevaluator.Function; |
| 18 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilderHelper.GeometrySupportType; |
|
| 23 | 19 |
import org.gvsig.expressionevaluator.SymbolTable; |
| 24 | 20 |
import org.gvsig.fmap.dal.DataTypes; |
| 25 | 21 |
import org.gvsig.fmap.dal.SQLBuilder; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/JDBCHelper.java | ||
|---|---|---|
| 3 | 3 |
import org.gvsig.fmap.dal.store.jdbc2.spi.JDBCSQLBuilderBase; |
| 4 | 4 |
import java.sql.Connection; |
| 5 | 5 |
import java.sql.ResultSet; |
| 6 |
import java.util.List; |
|
| 7 |
import org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType; |
|
| 6 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilderHelper.GeometrySupportType; |
|
| 8 | 7 |
import org.gvsig.fmap.dal.SQLBuilder; |
| 9 | 8 |
import org.gvsig.fmap.dal.exception.DataException; |
| 10 | 9 |
import org.gvsig.fmap.dal.exception.InitializeException; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/operations/H2SpatialAppendOperation.java | ||
|---|---|---|
| 3 | 3 |
|
| 4 | 4 |
import java.sql.PreparedStatement; |
| 5 | 5 |
import java.sql.SQLException; |
| 6 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
| 7 | 6 |
import org.gvsig.fmap.dal.DataTypes; |
| 8 | 7 |
import org.gvsig.fmap.dal.exception.DataException; |
| 9 | 8 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialHelper.java | ||
|---|---|---|
| 27 | 27 |
import org.apache.commons.dbcp.BasicDataSource; |
| 28 | 28 |
import org.apache.commons.io.FilenameUtils; |
| 29 | 29 |
import org.apache.commons.lang3.StringUtils; |
| 30 |
import org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType;
|
|
| 30 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilderHelper.GeometrySupportType;
|
|
| 31 | 31 |
import org.gvsig.fmap.dal.exception.InitializeException; |
| 32 | 32 |
import org.gvsig.fmap.dal.resource.exception.AccessResourceException; |
| 33 | 33 |
import org.gvsig.fmap.dal.spi.DataServerExplorerProviderServices; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/expressionbuilderformatter/Constant.java | ||
|---|---|---|
| 4 | 4 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 5 | 5 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Value; |
| 6 | 6 |
import org.gvsig.expressionevaluator.Formatter; |
| 7 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 8 |
import static org.gvsig.expressionevaluator.GeometryExpressionBuilderHelper.GeometrySupportType.EWKB; |
|
| 9 |
import static org.gvsig.expressionevaluator.GeometryExpressionBuilderHelper.GeometrySupportType.WKB; |
|
| 10 |
import static org.gvsig.expressionevaluator.GeometryExpressionBuilderHelper.GeometrySupportType.WKT; |
|
| 7 | 11 |
import org.gvsig.fmap.dal.SQLBuilder; |
| 8 | 12 |
import org.gvsig.fmap.geom.Geometry; |
| 9 | 13 |
import org.gvsig.fmap.geom.GeometryUtils; |
| ... | ... | |
| 42 | 46 |
@Override |
| 43 | 47 |
public String format(Value constant) {
|
| 44 | 48 |
Object x = ((ExpressionBuilder.Constant)constant).value(); |
| 45 |
ExpressionBuilder builder = this.sqlbuilder.expression(); |
|
| 49 |
GeometryExpressionBuilder builder = this.sqlbuilder.expression();
|
|
| 46 | 50 |
if( x instanceof byte[] ) {
|
| 47 | 51 |
return builder.bytearray_x((byte[]) x); |
| 48 | 52 |
} |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/expressionbuilderformatter/ST_Intersects.java | ||
|---|---|---|
| 4 | 4 |
import java.util.List; |
| 5 | 5 |
import org.apache.commons.lang3.StringUtils; |
| 6 | 6 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 7 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_ST_INTERSECTS; |
|
| 7 |
import static org.gvsig.expressionevaluator.GeometryExpressionBuilder.FUNCTION_ST_INTERSECTS;
|
|
| 8 | 8 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Function; |
| 9 | 9 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Value; |
| 10 | 10 |
import org.gvsig.expressionevaluator.Formatter; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/expressionbuilderformatter/ST_GeomFromEWKB.java | ||
|---|---|---|
| 3 | 3 |
import java.text.MessageFormat; |
| 4 | 4 |
import java.util.List; |
| 5 | 5 |
import org.apache.commons.lang3.StringUtils; |
| 6 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_ST_GEOMFROMEWKB; |
|
| 6 |
import static org.gvsig.expressionevaluator.GeometryExpressionBuilder.FUNCTION_ST_GEOMFROMEWKB;
|
|
| 7 | 7 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Function; |
| 8 | 8 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Value; |
| 9 | 9 |
import org.gvsig.expressionevaluator.Formatter; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/expressionbuilderformatter/ST_AsBinary.java | ||
|---|---|---|
| 3 | 3 |
import java.text.MessageFormat; |
| 4 | 4 |
import java.util.List; |
| 5 | 5 |
import org.apache.commons.lang3.StringUtils; |
| 6 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_ST_ASBINARY; |
|
| 6 |
import static org.gvsig.expressionevaluator.GeometryExpressionBuilder.FUNCTION_ST_ASBINARY;
|
|
| 7 | 7 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Function; |
| 8 | 8 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Value; |
| 9 | 9 |
import org.gvsig.expressionevaluator.Formatter; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/expressionbuilderformatter/ST_AsEWKB.java | ||
|---|---|---|
| 3 | 3 |
import java.text.MessageFormat; |
| 4 | 4 |
import java.util.List; |
| 5 | 5 |
import org.apache.commons.lang3.StringUtils; |
| 6 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_ST_ASEWKB; |
|
| 6 |
import static org.gvsig.expressionevaluator.GeometryExpressionBuilder.FUNCTION_ST_ASEWKB;
|
|
| 7 | 7 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Function; |
| 8 | 8 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Value; |
| 9 | 9 |
import org.gvsig.expressionevaluator.Formatter; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/expressionbuilderformatter/ST_ExtentAggregate.java | ||
|---|---|---|
| 4 | 4 |
import java.util.List; |
| 5 | 5 |
import org.apache.commons.lang3.StringUtils; |
| 6 | 6 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 7 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_ST_EXTENTAGGREGATE; |
|
| 7 |
import static org.gvsig.expressionevaluator.GeometryExpressionBuilder.FUNCTION_ST_EXTENTAGGREGATE;
|
|
| 8 | 8 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Function; |
| 9 | 9 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Value; |
| 10 | 10 |
import org.gvsig.expressionevaluator.Formatter; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/H2SpatialSQLBuilderTest.java | ||
|---|---|---|
| 2 | 2 |
|
| 3 | 3 |
import junit.framework.TestCase; |
| 4 | 4 |
import org.apache.commons.lang3.ArrayUtils; |
| 5 |
import org.apache.commons.lang3.StringUtils; |
|
| 6 | 5 |
import org.cresques.cts.IProjection; |
| 7 | 6 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
| 7 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
| 8 | 8 |
import org.gvsig.fmap.crs.CRSFactory; |
| 9 | 9 |
import org.gvsig.fmap.dal.SQLBuilder; |
| 10 | 10 |
import org.gvsig.fmap.dal.SQLBuilder.Privilege; |
| 11 | 11 |
import org.gvsig.fmap.dal.feature.spi.SQLBuilderBase; |
| 12 | 12 |
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory.TableReference; |
| 13 |
import static org.gvsig.fmap.dal.store.jdbc2.spi.JDBCSQLBuilderBase.PROP_TABLE; |
|
| 14 | 13 |
import org.gvsig.fmap.dal.store.jdbc2.spi.operations.OperationsFactoryBase; |
| 15 | 14 |
import org.gvsig.fmap.geom.DataTypes; |
| 16 | 15 |
import org.gvsig.fmap.geom.Geometry; |
| ... | ... | |
| 46 | 45 |
String columnName = "the_geom"; |
| 47 | 46 |
|
| 48 | 47 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 49 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 48 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 50 | 49 |
|
| 51 | 50 |
sqlbuilder.select().column().value( |
| 52 | 51 |
expbuilder.as_geometry( |
| ... | ... | |
| 96 | 95 |
limit.addVertex(0, 0); |
| 97 | 96 |
|
| 98 | 97 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 99 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 98 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 100 | 99 |
|
| 101 | 100 |
sqlbuilder.select().column().value( |
| 102 | 101 |
expbuilder.as_geometry( |
| ... | ... | |
| 365 | 364 |
IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
| 366 | 365 |
|
| 367 | 366 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 368 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 367 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 369 | 368 |
|
| 370 | 369 |
sqlbuilder.insert().table().database("master").schema("dbo").name("test1");
|
| 371 | 370 |
sqlbuilder.insert().column().name("id").with_value(expbuilder.parameter("id"));
|
| ... | ... | |
| 394 | 393 |
IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
| 395 | 394 |
|
| 396 | 395 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 397 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 396 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 398 | 397 |
|
| 399 | 398 |
sqlbuilder.insert().table().database("master").schema("dbo").name("test1");
|
| 400 | 399 |
sqlbuilder.insert().column().name("id").with_value(expbuilder.parameter("id"));
|
| ... | ... | |
| 423 | 422 |
IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
| 424 | 423 |
|
| 425 | 424 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 426 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 425 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 427 | 426 |
|
| 428 | 427 |
sqlbuilder.update().table().database("master").schema("dbo").name("test1");
|
| 429 | 428 |
sqlbuilder.update().where().and( |
| ... | ... | |
| 459 | 458 |
IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
| 460 | 459 |
|
| 461 | 460 |
SQLBuilder sqlbuilder = createSQLBuilder(); |
| 462 |
ExpressionBuilder expbuilder = sqlbuilder.expression(); |
|
| 461 |
GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
|
|
| 463 | 462 |
|
| 464 | 463 |
sqlbuilder.update().table().database("master").schema("dbo").name("test1");
|
| 465 | 464 |
sqlbuilder.update().where().and( |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/pom.xml | ||
|---|---|---|
| 101 | 101 |
</dependency> |
| 102 | 102 |
<dependency> |
| 103 | 103 |
<groupId>org.gvsig</groupId> |
| 104 |
<artifactId>org.gvsig.expressionevaluator.geometry.lib.impl</artifactId> |
|
| 105 |
<scope>test</scope> |
|
| 106 |
</dependency> |
|
| 107 |
<dependency> |
|
| 108 |
<groupId>org.gvsig</groupId> |
|
| 104 | 109 |
<artifactId>${org.gvsig.proj.lib.impl}</artifactId>
|
| 105 | 110 |
<scope>test</scope> |
| 106 | 111 |
</dependency> |
| ... | ... | |
| 131 | 136 |
</dependency> |
| 132 | 137 |
|
| 133 | 138 |
</dependencies> |
| 139 |
<build> |
|
| 140 |
<plugins> |
|
| 134 | 141 |
|
| 142 |
<!-- Skip test execution ? --> |
|
| 143 |
<plugin> |
|
| 144 |
<groupId>org.apache.maven.plugins</groupId> |
|
| 145 |
<artifactId>maven-surefire-plugin</artifactId> |
|
| 146 |
<configuration> |
|
| 147 |
<skipTests>false</skipTests> |
|
| 148 |
</configuration> |
|
| 149 |
</plugin> |
|
| 150 |
|
|
| 151 |
<!-- Skip test compilation ? --> |
|
| 152 |
<plugin> |
|
| 153 |
<groupId>org.apache.maven.plugins</groupId> |
|
| 154 |
<artifactId>maven-compiler-plugin</artifactId> |
|
| 155 |
<executions> |
|
| 156 |
<execution> |
|
| 157 |
<id>default-testCompile</id> |
|
| 158 |
<phase>process-test-sources</phase> |
|
| 159 |
<goals> |
|
| 160 |
<goal>testCompile</goal> |
|
| 161 |
</goals> |
|
| 162 |
<configuration> |
|
| 163 |
<skip>false</skip> |
|
| 164 |
</configuration> |
|
| 165 |
</execution> |
|
| 166 |
</executions> |
|
| 167 |
</plugin> |
|
| 168 |
|
|
| 169 |
<!-- Ignore test execution failure ? --> |
|
| 170 |
<plugin> |
|
| 171 |
<groupId>org.apache.maven.plugins</groupId> |
|
| 172 |
<artifactId>maven-surefire-plugin</artifactId> |
|
| 173 |
<configuration> |
|
| 174 |
<testFailureIgnore>false</testFailureIgnore> |
|
| 175 |
</configuration> |
|
| 176 |
</plugin> |
|
| 177 |
|
|
| 178 |
</plugins> |
|
| 179 |
</build> |
|
| 180 |
|
|
| 135 | 181 |
</project> |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/featureform/swing/impl/dynformfield/ImageFile/AbstractJDynFormFieldImage.java | ||
|---|---|---|
| 141 | 141 |
this.problemIndicator().set("Can't load image");
|
| 142 | 142 |
} |
| 143 | 143 |
} |
| 144 |
|
|
| 145 |
protected Object getPreparedValue(Object value) {
|
|
| 146 |
return value; |
|
| 147 |
} |
|
| 144 | 148 |
|
| 145 |
|
|
| 146 | 149 |
@Override |
| 147 | 150 |
public double getResizeWeight() {
|
| 148 | 151 |
Tags tags = this.getDefinition().getTags(); |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/featureform/swing/impl/dynformfield/ImageFile/AbstractJDynFormFieldImageFile.java | ||
|---|---|---|
| 23 | 23 |
package org.gvsig.featureform.swing.impl.dynformfield.ImageFile; |
| 24 | 24 |
|
| 25 | 25 |
import java.awt.BorderLayout; |
| 26 |
import java.awt.Dimension; |
|
| 26 | 27 |
import java.awt.event.ActionEvent; |
| 27 | 28 |
import java.awt.event.ActionListener; |
| 28 | 29 |
import java.awt.event.FocusListener; |
| 29 | 30 |
import java.io.File; |
| 30 | 31 |
import javax.swing.JButton; |
| 32 |
import javax.swing.JComponent; |
|
| 31 | 33 |
import javax.swing.JFileChooser; |
| 32 | 34 |
import javax.swing.JPanel; |
| 33 | 35 |
import javax.swing.JTextField; |
| 34 | 36 |
import javax.swing.filechooser.FileFilter; |
| 35 | 37 |
import javax.swing.filechooser.FileNameExtensionFilter; |
| 38 |
import org.gvsig.imageviewer.ImageViewer; |
|
| 39 |
import org.gvsig.tools.ToolsLocator; |
|
| 36 | 40 |
import org.gvsig.tools.dynform.DynFormFieldDefinition; |
| 37 | 41 |
import org.gvsig.tools.dynform.JDynFormField; |
| 38 | 42 |
import org.gvsig.tools.dynform.spi.DynFormSPIManager; |
| 39 | 43 |
import org.gvsig.tools.dynform.spi.dynformfield.JCustomTextField; |
| 40 | 44 |
import org.gvsig.tools.dynform.spi.dynformfield.JDynFormFieldFactory; |
| 41 | 45 |
import org.gvsig.tools.dynobject.Tags; |
| 46 |
import org.gvsig.tools.i18n.I18nManager; |
|
| 47 |
import org.gvsig.tools.swing.api.SimpleImage; |
|
| 48 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
|
| 49 |
import org.gvsig.tools.swing.api.windowmanager.WindowManager; |
|
| 50 |
import org.gvsig.tools.swing.icontheme.IconTheme; |
|
| 51 |
import org.gvsig.tools.util.ToolsUtilLocator; |
|
| 42 | 52 |
|
| 43 | 53 |
public abstract class AbstractJDynFormFieldImageFile<T> extends AbstractJDynFormFieldImage<T> implements JDynFormField, FocusListener {
|
| 44 | 54 |
|
| 45 | 55 |
protected JTextField jtext = null; |
| 46 | 56 |
protected JButton jbutton = null; |
| 57 |
protected JButton buttonOpenImage; |
|
| 47 | 58 |
|
| 48 | 59 |
public AbstractJDynFormFieldImageFile( |
| 49 | 60 |
DynFormSPIManager serviceManager, |
| ... | ... | |
| 82 | 93 |
onClickBrowse(); |
| 83 | 94 |
} |
| 84 | 95 |
}); |
| 96 |
IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent(); |
|
| 97 |
if( theme.exists("form-open-image") ) {
|
|
| 98 |
this.buttonOpenImage = new JButton(theme.get("form-open-image"));
|
|
| 99 |
} else {
|
|
| 100 |
this.buttonOpenImage = new JButton(" ");
|
|
| 101 |
} |
|
| 102 |
this.buttonOpenImage.addActionListener(new ActionListener() {
|
|
| 103 |
@Override |
|
| 104 |
public void actionPerformed(ActionEvent e) {
|
|
| 105 |
onClickViewer(); |
|
| 106 |
} |
|
| 107 |
}); |
|
| 85 | 108 |
JPanel buttonsPanel = new JPanel(); |
| 86 | 109 |
buttonsPanel.setLayout(new BorderLayout(0, 2)); |
| 87 | 110 |
buttonsPanel.add(jtext, BorderLayout.CENTER); |
| ... | ... | |
| 92 | 115 |
this.jbutton.setEnabled(!this.isReadOnly()); |
| 93 | 116 |
this.jtext.setEditable(!this.isReadOnly()); |
| 94 | 117 |
} |
| 95 |
|
|
| 118 |
|
|
| 119 |
protected void onClickViewer() {
|
|
| 120 |
I18nManager i18n = ToolsLocator.getI18nManager(); |
|
| 121 |
WindowManager wmanager = ToolsSwingLocator.getWindowManager(); |
|
| 122 |
Object value = this.getValue(); |
|
| 123 |
value = this.getPreparedValue(value); |
|
| 124 |
if (value == null) {
|
|
| 125 |
return; |
|
| 126 |
} |
|
| 127 |
try {
|
|
| 128 |
ImageViewer viewer = ToolsUtilLocator.getImageViewerManager() |
|
| 129 |
.createImageViewer(); |
|
| 130 |
SimpleImage image = ToolsSwingLocator.getToolsSwingManager() |
|
| 131 |
.createSimpleImage(value); |
|
| 132 |
viewer.setImage(image.getBufferedImage()); |
|
| 133 |
JComponent jimageViewer = viewer.asJComponent(); |
|
| 134 |
jimageViewer.setPreferredSize(new Dimension(650, 600)); |
|
| 135 |
wmanager.showWindow( |
|
| 136 |
jimageViewer, |
|
| 137 |
i18n.getTranslation("_Image_viewer"),
|
|
| 138 |
WindowManager.MODE.WINDOW |
|
| 139 |
); |
|
| 140 |
} catch (Exception ex) {
|
|
| 141 |
|
|
| 142 |
} |
|
| 143 |
} |
|
| 144 |
|
|
| 96 | 145 |
protected void onClickBrowse() {
|
| 97 | 146 |
fireFieldEnterEvent(); |
| 98 | 147 |
T previous = this.currentValue; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/featureform/swing/impl/dynformfield/ImageFile/JDynFormFieldImageFileFactory.java | ||
|---|---|---|
| 23 | 23 |
*/ |
| 24 | 24 |
package org.gvsig.featureform.swing.impl.dynformfield.ImageFile; |
| 25 | 25 |
|
| 26 |
import java.net.URL; |
|
| 27 |
import org.gvsig.featureform.swing.impl.DefaultJFeaturesForm; |
|
| 26 | 28 |
import org.gvsig.tools.dataTypes.DataTypes; |
| 27 | 29 |
import org.gvsig.tools.dynform.DynFormFieldDefinition; |
| 28 | 30 |
import org.gvsig.tools.dynform.JDynFormField; |
| 29 | 31 |
import org.gvsig.tools.dynform.spi.DynFormSPILocator; |
| 30 | 32 |
import org.gvsig.tools.dynform.spi.DynFormSPIManager; |
| 31 | 33 |
import org.gvsig.tools.dynform.spi.dynformfield.AbstractJDynFormFieldFactory; |
| 34 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
|
| 35 |
import org.gvsig.tools.swing.icontheme.IconTheme; |
|
| 32 | 36 |
|
| 33 | 37 |
public class JDynFormFieldImageFileFactory extends AbstractJDynFormFieldFactory {
|
| 34 | 38 |
|
| ... | ... | |
| 49 | 53 |
public static void selfRegister() {
|
| 50 | 54 |
DynFormSPIManager manager = DynFormSPILocator.getDynFormSPIManager(); |
| 51 | 55 |
manager.registerDynFieldFactory(new JDynFormFieldImageFileFactory()); |
| 56 |
String[][] iconNames = new String[][]{
|
|
| 57 |
new String[]{"dalswing", "form-open-image"}
|
|
| 58 |
}; |
|
| 59 |
IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent(); |
|
| 60 |
for (String[] icon : iconNames) {
|
|
| 61 |
URL url = DefaultJFeaturesForm.class.getResource(icon[1] + ".png"); |
|
| 62 |
theme.registerDefault("DALSwing", icon[0], icon[1], null, url);
|
|
| 63 |
} |
|
| 52 | 64 |
} |
| 53 | 65 |
} |
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/DefaultFeatureAttributeListCellRenderer.java | ||
|---|---|---|
| 1 |
package org.gvsig.fmap.dal.swing.impl.featuretype; |
|
| 2 |
|
|
| 3 |
import java.awt.Component; |
|
| 4 |
import javax.swing.DefaultListCellRenderer; |
|
| 5 |
import javax.swing.JLabel; |
|
| 6 |
import javax.swing.JList; |
|
| 7 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
|
| 8 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
|
| 9 |
import org.gvsig.tools.swing.icontheme.IconTheme; |
|
| 10 |
|
|
| 11 |
/** |
|
| 12 |
* |
|
| 13 |
* @author jjdelcerro |
|
| 14 |
*/ |
|
| 15 |
public class DefaultFeatureAttributeListCellRenderer |
|
| 16 |
extends DefaultListCellRenderer |
|
| 17 |
{
|
|
| 18 |
|
|
| 19 |
private final IconTheme iconTheme; |
|
| 20 |
|
|
| 21 |
public DefaultFeatureAttributeListCellRenderer() {
|
|
| 22 |
this.iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent(); |
|
| 23 |
} |
|
| 24 |
|
|
| 25 |
@Override |
|
| 26 |
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
|
|
| 27 |
JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); |
|
| 28 |
FeatureAttributeDescriptor attrdesc = (FeatureAttributeDescriptor) value; |
|
| 29 |
String theLabel; |
|
| 30 |
if( attrdesc.hasLabel() ) {
|
|
| 31 |
theLabel = String.format("%s [%s]", attrdesc.getLocalizedLabel(), attrdesc.getName());
|
|
| 32 |
} else {
|
|
| 33 |
theLabel = attrdesc.getName(); |
|
| 34 |
} |
|
| 35 |
label.setText(theLabel); |
|
| 36 |
String iconName = attrdesc.getDataType().getIconName(); |
|
| 37 |
if( iconTheme.exists(iconName) ) {
|
|
| 38 |
label.setIcon(iconTheme.get(iconName)); |
|
| 39 |
} else {
|
|
| 40 |
label.setIcon(null); |
|
| 41 |
} |
|
| 42 |
return label; |
|
| 43 |
} |
|
| 44 |
|
|
| 45 |
} |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/DefaultDataSwingManager.java | ||
|---|---|---|
| 22 | 22 |
*/ |
| 23 | 23 |
package org.gvsig.fmap.dal.swing.impl; |
| 24 | 24 |
|
| 25 |
import java.awt.Component; |
|
| 26 | 25 |
import java.util.Collection; |
| 27 | 26 |
import java.util.Collections; |
| 28 | 27 |
import java.util.LinkedHashMap; |
| ... | ... | |
| 35 | 34 |
import javax.swing.JComboBox; |
| 36 | 35 |
import javax.swing.JList; |
| 37 | 36 |
import javax.swing.JTextField; |
| 37 |
import javax.swing.ListCellRenderer; |
|
| 38 | 38 |
import javax.swing.table.TableModel; |
| 39 | 39 |
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator; |
| 40 | 40 |
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager; |
| ... | ... | |
| 87 | 87 |
import org.gvsig.fmap.dal.swing.DALActionFactory; |
| 88 | 88 |
import org.gvsig.fmap.dal.swing.DALActionFactory.DALActionContext; |
| 89 | 89 |
import org.gvsig.fmap.dal.swing.impl.featuretable.SimpleFeaturesTableModel; |
| 90 |
import org.gvsig.fmap.dal.swing.impl.featuretype.DefaultFeatureAttributeListCellRenderer; |
|
| 90 | 91 |
import org.gvsig.fmap.dal.swing.impl.jdbc.DefaultJDBCConnectionDialog; |
| 91 | 92 |
import org.gvsig.fmap.dal.swing.impl.jdbc.JDBCConnectionPickerController; |
| 93 |
import org.gvsig.fmap.dal.swing.impl.orderpanel.DefaultFeatureStoreOrderPanel; |
|
| 92 | 94 |
import org.gvsig.fmap.dal.swing.jdbc.JDBCConnectionDialog; |
| 95 |
import org.gvsig.fmap.dal.swing.orderpanel.FeatureStoreOrderPanel; |
|
| 93 | 96 |
import org.gvsig.tools.swing.api.pickercontroller.PickerController; |
| 94 | 97 |
|
| 95 | 98 |
|
| ... | ... | |
| 341 | 344 |
SimpleFeaturesTableModel m = new SimpleFeaturesTableModel(featureType, columnNames, features); |
| 342 | 345 |
return m; |
| 343 | 346 |
} |
| 347 |
|
|
| 348 |
@Override |
|
| 349 |
public ListCellRenderer createDefaultFeatureAttributeListCellRenderer() {
|
|
| 350 |
ListCellRenderer r = new DefaultFeatureAttributeListCellRenderer(); |
|
| 351 |
return r; |
|
| 352 |
} |
|
| 353 |
|
|
| 354 |
@Override |
|
| 355 |
public FeatureStoreOrderPanel createFeatureStoreOrderPanel() {
|
|
| 356 |
DefaultFeatureStoreOrderPanel p = new DefaultFeatureStoreOrderPanel(); |
|
| 357 |
return p; |
|
| 358 |
} |
|
| 344 | 359 |
|
| 345 | 360 |
} |
Also available in: Unified diff