Revision 10619

View differences:

trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/wfs/filters/FilterEncoding.java
154 154
		if (getBbox() != null){
155 155
			bboxQuery = enterLabel(getBboxPropertyName(), "PropertyName");
156 156
			bboxQuery = bboxQuery + new GMLObjectsFactory().createBBOX(getBbox());
157
			bboxQuery = enterLabel(bboxQuery, "Within");
157 158
			if (tree.getRoot() == null){
158 159
				return enclosesWithFilterTag(bboxQuery);
159 160
			}
160
		}
161
		//filterQuery = enterLabel(filterQuery, "Within");
162
		return enclosesWithFilterTag(filterQuery);
161
		}		
162
		return enclosesWithFilterTag(filterQuery + bboxQuery);
163 163
	}
164 164
	
165 165
	/**
......
275 275
		filter.append("<Filter%20");
276 276
		filter.append("xmlns:ogc=\"http://www.opengis.net/ogc\"%20");
277 277
		filter.append("xmlns:gml=\"http://www.opengis.net/gml\"%20"); 
278
		filter.append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ");
278
		filter.append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"%20");
279 279
		filter.append("xsi:schemaLocation=\"http://www.opengis.net/ogc%20../filter/1.0.0/filter.xsd%20http://www.opengis.net/gml%20../gml/2.1.2/geometry.xsd\">");
280 280
		filter.append(query);
281 281
		filter.append("</Filter>");

Also available in: Unified diff