Revision 44431 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/function/spatial/STPointFunction.java

View differences:

STPointFunction.java
4 4
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_ST_POINT;
5 5
import org.gvsig.expressionevaluator.Interpreter;
6 6
import org.gvsig.expressionevaluator.spi.AbstractFunction;
7
import org.gvsig.fmap.geom.Geometry;
8 7
import org.gvsig.fmap.geom.GeometryUtils;
8
import org.gvsig.fmap.geom.primitive.Point;
9 9

  
10 10
public class STPointFunction extends AbstractFunction {
11 11

  
12 12
    public STPointFunction() {
13
        super("OGC", FUNCTION_ST_POINT, Range.between(2,4));
13
        super("OGC", FUNCTION_ST_POINT, Range.is(2));
14 14
    }
15 15
    
16 16
    @Override
......
22 22
    public Object call(Interpreter interpreter, Object[] args) throws Exception {
23 23
        double x = this.getDouble(args, 0);
24 24
        double y = this.getDouble(args, 1);
25
        Geometry geom;
26
        switch(args.length) {
27
            default:
28
            case 2:
29
                geom = GeometryUtils.createPoint(x, y);
30
                break;
31
            case 3:
32
                double z = this.getDouble(args, 2);
33
                geom = GeometryUtils.createPoint(x, y, z);
34
                break;
35
            case 4:
36
                z = this.getDouble(args, 2);
37
                double m = this.getDouble(args, 3);
38
                geom = GeometryUtils.createPoint(x, y, z, m);
39
                break;
40
        }
25
        Point geom = GeometryUtils.createPoint(x, y);
41 26
        return geom;
42 27
    }
43 28
    

Also available in: Unified diff