Revision 21778

View differences:

branches/v2_0_0_prep/libraries/libFMap_data/src/org/gvsig/data/vectorial/expressionevaluator/ExpressionEvaluator.java
37 37
import org.gvsig.data.vectorial.FeatureType;
38 38
import org.gvsig.data.vectorial.expressionevaluator.functions.Equals;
39 39
import org.gvsig.data.vectorial.expressionevaluator.functions.GeometryFromText;
40
import org.gvsig.data.vectorial.expressionevaluator.functions.Intersects;
41
import org.gvsig.data.vectorial.expressionevaluator.functions.Overlaps;
40 42
import org.medfoster.sqljep.BaseJEP;
41 43
import org.medfoster.sqljep.function.PostfixCommand;
42 44

  
......
58 60
	protected static void registerBaseFunctions() {
59 61
		registerFunction(Equals.NAME, new Equals());
60 62
		registerFunction(GeometryFromText.NAME, new GeometryFromText());
61

  
63
		registerFunction(Intersects.NAME, new Intersects());
64
		registerFunction(Overlaps.NAME, new Overlaps());
62 65
	}
63 66

  
64 67
	public static void registerFunction(String name, PostfixCommand aFunction) {
branches/v2_0_0_prep/libraries/libFMap_data/src/org/gvsig/data/vectorial/expressionevaluator/functions/Intersects.java
1
/* gvSIG. Geographic Information System of the Valencian Government
2
*
3
* Copyright (C) 2007-2008 Infrastructures and Transports Department
4
* of the Valencian Government (CIT)
5
* 
6
* This program is free software; you can redistribute it and/or
7
* modify it under the terms of the GNU General Public License
8
* as published by the Free Software Foundation; either version 2
9
* of the License, or (at your option) any later version.
10
* 
11
* This program is distributed in the hope that it will be useful,
12
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
* GNU General Public License for more details.
15
* 
16
* You should have received a copy of the GNU General Public License
17
* along with this program; if not, write to the Free Software
18
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
19
* MA  02110-1301, USA.
20
* 
21
*/
22

  
23
/*
24
* AUTHORS (In addition to CIT):
25
* 2008 IVER T.I. S.A.   {{Task}}
26
*/
27
 
28
package org.gvsig.data.vectorial.expressionevaluator.functions;
29

  
30
import org.gvsig.fmap.geom.Geometry;
31
import org.gvsig.fmap.geom.operation.GeometryOperationException;
32
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException;
33
import org.gvsig.fmap.geom.operation.relationship.DefaultRelationshipGeometryOperationContext;
34
import org.medfoster.sqljep.ASTFunNode;
35
import org.medfoster.sqljep.JepRuntime;
36
import org.medfoster.sqljep.ParseException;
37
import org.medfoster.sqljep.function.PostfixCommand;
38

  
39
public class Intersects extends PostfixCommand {
40

  
41
	public static final String NAME = "intersects";
42
	
43
	final public int getNumberOfParameters() {
44
		return 2;
45
	}
46

  
47
	/* (non-Javadoc)
48
	 * @see org.medfoster.sqljep.function.PostfixCommand#evaluate(org.medfoster.sqljep.ASTFunNode, org.medfoster.sqljep.JepRuntime)
49
	 */
50
	public void evaluate(ASTFunNode node, JepRuntime runtime)
51
			throws ParseException {
52
		node.childrenAccept(runtime.ev, null);
53
		Geometry geom1 = (Geometry)runtime.stack.pop();
54
		Geometry geom2 = (Geometry)runtime.stack.pop();
55
		runtime.stack.push(overlaps(geom1, geom2));
56
	}
57

  
58
	private static Boolean overlaps(Geometry geom1, Geometry geom2) throws ParseException {
59
		try {
60
			return (Boolean) geom1.invokeOperation(
61
					org.gvsig.fmap.geom.operation.relationship.Intersects.CODE,
62
					new DefaultRelationshipGeometryOperationContext(geom2));
63
		} catch (GeometryOperationNotSupportedException e) {
64
			throw new ParseException(NAME, e);
65
		} catch (GeometryOperationException e) {
66
			throw new ParseException(NAME, e);
67
		}
68
	}
69

  
70
}
0 71

  
branches/v2_0_0_prep/libraries/libFMap_data/src/org/gvsig/data/vectorial/expressionevaluator/functions/Overlaps.java
1
/* gvSIG. Geographic Information System of the Valencian Government
2
*
3
* Copyright (C) 2007-2008 Infrastructures and Transports Department
4
* of the Valencian Government (CIT)
5
* 
6
* This program is free software; you can redistribute it and/or
7
* modify it under the terms of the GNU General Public License
8
* as published by the Free Software Foundation; either version 2
9
* of the License, or (at your option) any later version.
10
* 
11
* This program is distributed in the hope that it will be useful,
12
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
* GNU General Public License for more details.
15
* 
16
* You should have received a copy of the GNU General Public License
17
* along with this program; if not, write to the Free Software
18
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
19
* MA  02110-1301, USA.
20
* 
21
*/
22

  
23
/*
24
* AUTHORS (In addition to CIT):
25
* 2008 IVER T.I. S.A.   {{Task}}
26
*/
27
 
28
package org.gvsig.data.vectorial.expressionevaluator.functions;
29

  
30
import org.gvsig.fmap.geom.Geometry;
31
import org.gvsig.fmap.geom.operation.GeometryOperationException;
32
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException;
33
import org.gvsig.fmap.geom.operation.relationship.DefaultRelationshipGeometryOperationContext;
34
import org.medfoster.sqljep.ASTFunNode;
35
import org.medfoster.sqljep.JepRuntime;
36
import org.medfoster.sqljep.ParseException;
37
import org.medfoster.sqljep.function.PostfixCommand;
38

  
39
public class Overlaps extends PostfixCommand {
40

  
41
	public static final String NAME = "overlaps";
42
	
43
	final public int getNumberOfParameters() {
44
		return 2;
45
	}
46

  
47
	/* (non-Javadoc)
48
	 * @see org.medfoster.sqljep.function.PostfixCommand#evaluate(org.medfoster.sqljep.ASTFunNode, org.medfoster.sqljep.JepRuntime)
49
	 */
50
	public void evaluate(ASTFunNode node, JepRuntime runtime)
51
			throws ParseException {
52
		node.childrenAccept(runtime.ev, null);
53
		Geometry geom1 = (Geometry)runtime.stack.pop();
54
		Geometry geom2 = (Geometry)runtime.stack.pop();
55
		runtime.stack.push(overlaps(geom1, geom2));
56
	}
57

  
58
	private static Boolean overlaps(Geometry geom1, Geometry geom2) throws ParseException {
59
		try {
60
			return (Boolean) geom1.invokeOperation(
61
					org.gvsig.fmap.geom.operation.relationship.Overlaps.CODE,
62
					new DefaultRelationshipGeometryOperationContext(geom2));
63
		} catch (GeometryOperationNotSupportedException e) {
64
			throw new ParseException(NAME, e);
65
		} catch (GeometryOperationException e) {
66
			throw new ParseException(NAME, e);
67
		}
68
	}
69

  
70
}
0 71

  

Also available in: Unified diff