Improved encoding of hooks and simple types

opengeospatial · Sep 7, 2018 · f35ae59 · f35ae59
1 parent 4b5a44f
commit f35ae59
Show file tree

Hide file tree

Showing 16 changed files with 496 additions and 211 deletions.
diff --git a/CityGML/Schema/appearance.xsd b/CityGML/Schema/appearance.xsd
@@ -2,6 +2,7 @@
   <import namespace="http://www.opengis.net/citygml/3.0" schemaLocation="./cityGMLBase.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractSurfaceData" type="anyType"/>
   <element abstract="true" name="AbstractSurfaceData" substitutionGroup="gml:AbstractFeature" type="app:AbstractSurfaceDataType">
     <annotation>
       <documentation>SIG3D: Abstract superclass of X3DMaterial and AbstractTexture</documentation>
@@ -16,6 +17,7 @@
               <documentation>SIG3D: Indicates whether the X3DMaterial, GeoreferencedTexture or, ParametrizedTexture is assigned to the front side or back side of the surface</documentation>
             </annotation>
           </element>
+          <element maxOccurs="unbounded" minOccurs="0" ref="app:AbstractGenericApplicationPropertyOfAbstractSurfaceData"/>
         </sequence>
       </extension>
     </complexContent>
@@ -27,6 +29,7 @@
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
     <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractTexture" type="anyType"/>
   <element abstract="true" name="AbstractTexture" substitutionGroup="app:AbstractSurfaceData" type="app:AbstractTextureType">
     <annotation>
       <documentation>SIG3D: Abstract super class of ParameterizedTexture and GeoreferencedTexture</documentation>
@@ -61,6 +64,7 @@
               <documentation>SIG3D: Color definition for texture borders.</documentation>
             </annotation>
           </element>
+          <element maxOccurs="unbounded" minOccurs="0" ref="app:AbstractGenericApplicationPropertyOfAbstractTexture"/>
         </sequence>
       </extension>
     </complexContent>
@@ -85,6 +89,7 @@
       <element ref="app:AbstractTextureParameterization"/>
     </sequence>
   </complexType>
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfAppearance" type="anyType"/>
   <element name="Appearance" substitutionGroup="core:AbstractFeatureWithLifespan" type="app:AppearanceType">
     <annotation>
       <documentation>SIG3D: Named container for all AbstractSurfaceData</documentation>
@@ -114,6 +119,7 @@
               </complexContent>
             </complexType>
           </element>
+          <element maxOccurs="unbounded" minOccurs="0" ref="app:AbstractGenericApplicationPropertyOfAppearance"/>
         </sequence>
       </extension>
     </complexContent>
@@ -126,11 +132,17 @@
     <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
   <simpleType name="ColorType">
-    <restriction base="core:DoubleBetween0and1ListType"/>
+    <restriction base="core:DoubleBetween0and1ListType">
+      <length value="3"/>
+    </restriction>
   </simpleType>
   <simpleType name="ColorPlusOpacityType">
-    <restriction base="core:DoubleBetween0and1ListType"/>
+    <restriction base="core:DoubleBetween0and1ListType">
+      <minLength value="3"/>
+      <maxLength value="4"/>
+    </restriction>
   </simpleType>
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfGeoreferencedTexture" type="anyType"/>
   <element name="GeoreferencedTexture" substitutionGroup="app:AbstractTexture" type="app:GeoreferencedTextureType">
     <annotation>
       <documentation>SIG3D: Specialized class for georeferenced textures containing an implicit parametrization that is either stored within the image file, an acompanying world file</documentation>
@@ -160,6 +172,7 @@
               <documentation>SIG3D: Geometry object which is associated with the texture.</documentation>
             </annotation>
           </element>
+          <element maxOccurs="unbounded" minOccurs="0" ref="app:AbstractGenericApplicationPropertyOfGeoreferencedTexture"/>
         </sequence>
       </extension>
     </complexContent>
@@ -171,6 +184,7 @@
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
     <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfParameterizedTexture" type="anyType"/>
   <element name="ParameterizedTexture" substitutionGroup="app:AbstractTexture" type="app:ParameterizedTextureType">
     <annotation>
       <documentation>SIG3D: Specialization of AbstractTexture to describe  textures with specified transformation or texture coordinates.</documentation>
@@ -180,18 +194,8 @@
     <complexContent>
       <extension base="app:AbstractTextureType">
         <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="target">
-            <complexType>
-              <complexContent>
-                <extension base="gml:AbstractMemberType">
-                  <sequence minOccurs="0">
-                    <element ref="app:TextureAssociation"/>
-                  </sequence>
-                  <attributeGroup ref="gml:AssociationAttributeGroup"/>
-                </extension>
-              </complexContent>
-            </complexType>
-          </element>
+          <element maxOccurs="unbounded" minOccurs="0" name="target" type="app:TextureAssociationPropertyType"/>
+          <element maxOccurs="unbounded" minOccurs="0" ref="app:AbstractGenericApplicationPropertyOfParameterizedTexture"/>
         </sequence>
       </extension>
     </complexContent>
@@ -335,6 +339,7 @@
       </enumeration>
     </restriction>
   </simpleType>
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfX3DMaterial" type="anyType"/>
   <element name="X3DMaterial" substitutionGroup="app:AbstractSurfaceData" type="app:X3DMaterialType">
     <annotation>
       <documentation>SIG3D: Definition of material properties based on X3D standard.</documentation>
@@ -384,6 +389,7 @@
               <documentation>X3D: URI identifying the target surface geometry to apply the material properties</documentation>
             </annotation>
           </element>
+          <element maxOccurs="unbounded" minOccurs="0" ref="app:AbstractGenericApplicationPropertyOfX3DMaterial"/>
         </sequence>
       </extension>
     </complexContent>