Revision 47606 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.sqlite/org.gvsig.sqlite.provider/src/main/java/org/gvsig/sqlite/dal/expressionbuilderformatter/ST_CoveredBy.java

View differences:

ST_CoveredBy.java
9 9
import org.gvsig.expressionevaluator.Formatter;
10 10
import static org.gvsig.expressionevaluator.GeometryExpressionBuilderHelper.FUNCTION_ST_COVEREDBY;
11 11
import org.gvsig.fmap.dal.SQLBuilder;
12
import static org.gvsig.sqlite.dal.expressionbuilderformatter.ST_Intersects.getBBoxIntersectsFilter;
12 13

  
13 14
/**
14 15
 *
......
34 35
    @Override
35 36
    public String format(Value function) {
36 37
        List<Value> parameters = ((Function) function).parameters();
37
        String p1 = parameters.get(0).toString(formatter);
38
        String p2 = parameters.get(1).toString(formatter);
39
        String r = MessageFormat.format("( (({0}) && ({1})) AND ST_Covers(({1}),({0}) ))", p1, p2);
38
        Value p1 = parameters.get(0);
39
        Value p2 = parameters.get(1);
40
        String p1s = p1.toString(formatter);
41
        String p2s = p2.toString(formatter);
42

  
43
        String filter = getBBoxIntersectsFilter(formatter, p1, p2);
44
        if (filter == null ) {         
45
            filter = getBBoxIntersectsFilter(formatter, p2, p1);
46
        }
47
        String r;
48
        if( filter == null ) {
49
            r = MessageFormat.format("ST_Covers(({1}),({0}))", p1s, p2s);
50
        } else {
51
            r = MessageFormat.format("( ({2}) AND ST_Covers(({1}),({0}) ))", p1s, p2s, filter);
52
        }
40 53
        return r;
54
        
41 55
    }
42 56
    
43 57
}

Also available in: Unified diff