PropertyName binnen BBOX filter niet langer verplicht

B3Partners · Nov 2, 2016 · fbd647c · fbd647c
1 parent 25fef75
commit fbd647c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/nl/b3p/xml/ogc/v110/BBOXTypeDescriptor.java b/src/main/java/nl/b3p/xml/ogc/v110/BBOXTypeDescriptor.java
@@ -92,13 +92,11 @@ public java.lang.Object newInstance( java.lang.Object parent ) {
         };
         desc.setHandler(handler);
         desc.setNameSpaceURI("http://www.opengis.net/ogc");
-        desc.setRequired(true);
         desc.setMultivalued(false);
         addFieldDescriptor(desc);
 
         //-- validation code for: _propertyName
         fieldValidator = new org.exolab.castor.xml.FieldValidator();
-        fieldValidator.setMinOccurs(1);
         { //-- local scope
         }
         desc.setValidator(fieldValidator);

diff --git a/src/main/xsd/WFS110/v110/filter.xsd b/src/main/xsd/WFS110/v110/filter.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2008 rel. 2 sp2 (http://www.altova.com) by chris van lith (B3partners BV) -->
+<!-- edited with XMLSpy v2008 rel. 2 (http://www.altova.com) by chris van lith (B3partners BV) -->
 <xsd:schema xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.opengis.net/ogc" elementFormDefault="qualified" version="1.1.0">
 	<xsd:include schemaLocation="expr.xsd"/>
 	<xsd:include schemaLocation="sort.xsd"/>
@@ -163,7 +163,7 @@
 		<xsd:complexContent>
 			<xsd:extension base="ogc:SpatialOpsType">
 				<xsd:sequence>
-					<xsd:element ref="ogc:PropertyName"/>
+					<xsd:element ref="ogc:PropertyName" minOccurs="0"/>
 					<xsd:element ref="gml:Envelope"/>
 				</xsd:sequence>
 			</xsd:extension>