Merge branch 'editor-model-updates'

opengeospatial · Jun 5, 2019 · d6d8cf4 · d6d8cf4
2 parents deac570 + 6571b03
commit d6d8cf4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CityGML/Schema/cityGMLBase.xsd b/CityGML/Schema/cityGMLBase.xsd
@@ -177,8 +177,6 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
     <complexContent>
       <extension base="core:AbstractCityObjectType">
         <sequence>
-          <element minOccurs="0" name="occupancyDaytime" type="integer"/>
-          <element minOccurs="0" name="occupancyNighttime" type="integer"/>
           <element minOccurs="0" name="spaceType" type="core:SpaceTypeType">
             <annotation>
               <documentation>Degree of openness of an abstract space.</documentation>
@@ -446,6 +444,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
               </complexContent>
             </complexType>
           </element>
+          <element maxOccurs="unbounded" minOccurs="0" name="featureMember" type="gml:FeaturePropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfCityModel"/>
         </sequence>
       </extension>

diff --git a/CityGML/Schema/vegetation.xsd b/CityGML/Schema/vegetation.xsd
@@ -54,6 +54,8 @@
               <documentation>SIG3D: Average value of the heights of the grown-up plants</documentation>
             </annotation>
           </element>
+          <element minOccurs="0" name="minHeight" type="gml:LengthType"/>
+          <element minOccurs="0" name="maxHeight" type="gml:LengthType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="veg:AbstractGenericApplicationPropertyOfPlantCover"/>
         </sequence>
       </extension>
@@ -111,6 +113,8 @@
               <documentation>SIG3D: Maximal diameter of the crown.</documentation>
             </annotation>
           </element>
+          <element minOccurs="0" name="rootBallDiameter" type="gml:LengthType"/>
+          <element minOccurs="0" name="maxRootBallDepth" type="gml:LengthType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="veg:AbstractGenericApplicationPropertyOfSolitaryVegetationObject"/>
         </sequence>
       </extension>

diff --git a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml
@@ -65,7 +65,7 @@
       </xmlNamespaces>
       <xi:include href="http://shapechange.net/resources/config/StandardMapEntries.xml"/>
       <xsdMapEntries>
-        <XsdMapEntry type="AbstractFeature" xsdEncodingRules="iso19136_2007 gml33" xmlType="gml:AbstractFeatureType" xmlElement="gml:AbstractFeature" xmlPropertyType="gml:FeaturePropertyType"/>
+        <XsdMapEntry type="AnyFeature" xsdEncodingRules="iso19136_2007 gml33" xmlType="gml:AbstractFeatureType" xmlElement="gml:AbstractFeature" xmlPropertyType="gml:FeaturePropertyType"/>
         <XsdMapEntry type="XALAddressDetails" xsdEncodingRules="citygml" xmlType="xAL:AddressDetails" xmlElement="xAL:AddressDetails" xmlPropertyType="_P_"/>
         <XsdMapEntry type="URI" xsdEncodingRules="iso19136_2007 gml33" xmlPropertyType="anyURI" xmlType="anyURI" xmlTypeType="simple" xmlTypeContent="simple"/>
         <XsdMapEntry type="Code" xsdEncodingRules="iso19136_2007 gml33" xmlPropertyType="gml:CodeType" xmlType="gml:CodeType" xmlTypeType="complex" xmlTypeContent="simple"/>