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_Overlaps.java

View differences:

ST_Overlaps.java
8 8 
import org.gvsig.expressionevaluator.ExpressionBuilder.Value;
9 9 
import org.gvsig.expressionevaluator.Formatter;
10 10 
import org.gvsig.fmap.dal.SQLBuilder;
11 
import static org.gvsig.sqlite.dal.expressionbuilderformatter.ST_Intersects.getBBoxIntersectsFilter;
11 12 

  		




  12
  13
  
    
/**


  		




  13
  14
  
    
 *


  		




  ......




  33
  34
  
    
    @Override


  		




  34
  35
  
    
    public String format(Value function) {


  		




  35
  36
  
    
        List<Value> parameters = ((Function) function).parameters();


  		




  36
  
  
    
        String p1 = parameters.get(0).toString(formatter);


  		




  37
  
  
    
        String p2 = parameters.get(1).toString(formatter);


  		




  38
  
  
    
        String r = MessageFormat.format("( (({0}) && ({1})) AND ST_Overlaps(({0}),({1}) ))", p1, p2);


  		




  
  37
  
    
        Value p1 = parameters.get(0);


  		




  
  38
  
    
        Value p2 = parameters.get(1);


  		




  
  39
  
    
        String p1s = p1.toString(formatter);


  		




  
  40
  
    
        String p2s = p2.toString(formatter);


  		




  
  41
  
    

  		




  
  42
  
    
        String filter = getBBoxIntersectsFilter(formatter, p1, p2);


  		




  
  43
  
    
        if (filter == null ) {         


  		




  
  44
  
    
            filter = getBBoxIntersectsFilter(formatter, p2, p1);


  		




  
  45
  
    
        }


  		




  
  46
  
    
        String r;


  		




  
  47
  
    
        if( filter == null ) {


  		




  
  48
  
    
            r = MessageFormat.format("ST_Overlaps(({0}),({1}))", p1s, p2s);


  		




  
  49
  
    
        } else {


  		




  
  50
  
    
            r = MessageFormat.format("( ({2}) AND ST_Overlaps(({0}),({1}) ))", p1s, p2s, filter);


  		




  
  51
  
    
        }


  		




  39
  52
  
    
        return r;


  		




  40
  53
  
    
    }


  		




  41
  54
  
    
    


  		












Also available in:  Unified diff