Skip to content

Commit dac5c41

Browse files
authored
Merge pull request #34 from pvlib/fix/issue-33-optional-fields-and-remove-fields
Fix issue 33: Make some fields optional and remove unnecessary field
2 parents bfe79e3 + c2f2db1 commit dac5c41

6 files changed

+13
-19
lines changed

Examples/01 - VerySimpleFixedPVC2_without_electrical_layout.pv2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<extra>
112112
<technique profile="PVCollada-2.0">
113113
<!-- terrain tag -->
114-
<pv:terrain sid="Terrain">
114+
<pv:terrain>
115115
<pv:vertex_count>4</pv:vertex_count>
116116
<pv:triangle_count>2</pv:triangle_count>
117117
<pv:bounding_box_min>-10.0 -20.0 -30.0</pv:bounding_box_min>

Examples/02 - TrackersPVC2_without_electrical_layout.pv2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<extra>
114114
<technique profile="PVCollada-2.0">
115115
<!-- terrain tag -->
116-
<pv:terrain sid="Terrain">
116+
<pv:terrain>
117117
<pv:vertex_count>4</pv:vertex_count>
118118
<pv:triangle_count>2</pv:triangle_count>
119119
<pv:bounding_box_min>-10.0 -20.0 -30.0</pv:bounding_box_min>

Examples/03 - VerySimpleFixedPVC2_with_basic_electrical_layout.pv2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
<extra>
241241
<technique profile="PVCollada-2.0">
242242
<!-- terrain tag -->
243-
<pv:terrain sid="Terrain">
243+
<pv:terrain>
244244
<pv:vertex_count>4</pv:vertex_count>
245245
<pv:triangle_count>2</pv:triangle_count>
246246
<pv:bounding_box_min>-10.0 -20.0 -30.0</pv:bounding_box_min>

Examples/04 - TrackersPVC2_with_basic_electrical_layout.pv2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@
929929
<extra>
930930
<technique profile="PVCollada-2.0">
931931
<!-- terrain tag -->
932-
<pv:terrain sid="Terrain">
932+
<pv:terrain>
933933
<pv:vertex_count>4</pv:vertex_count>
934934
<pv:triangle_count>2</pv:triangle_count>
935935
<pv:bounding_box_min>-10.0 -20.0 -30.0</pv:bounding_box_min>

Examples/05 - VerySimpleFixedPVC2_with_electrical_layout.pv2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
<extra>
356356
<technique profile="PVCollada-2.0">
357357
<!-- terrain tag -->
358-
<pv:terrain sid="Terrain">
358+
<pv:terrain>
359359
<pv:vertex_count>4</pv:vertex_count>
360360
<pv:triangle_count>2</pv:triangle_count>
361361
<pv:bounding_box_min>-10.0 -20.0 -30.0</pv:bounding_box_min>

schema/pvcollada_schema_0.1.xsd

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -761,23 +761,17 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema">
761761
<xs:documentation>Number of triangular faces in the terrain surface.</xs:documentation>
762762
</xs:annotation>
763763
</xs:element>
764-
<xs:element name="bounding_box_min" type="collada:float3_type">
764+
<xs:element name="bounding_box_min" type="collada:float3_type" minOccurs="0">
765765
<xs:annotation>
766766
<xs:documentation>Corner of bounding box. Opposite corner in bounding_box_max.</xs:documentation>
767767
</xs:annotation>
768768
</xs:element>
769-
<xs:element name="bounding_box_max" type="collada:float3_type">
769+
<xs:element name="bounding_box_max" type="collada:float3_type" minOccurs="0">
770770
<xs:annotation>
771771
<xs:documentation>Corner of bounding box. Opposite corner in bounding_box_min.</xs:documentation>
772772
</xs:annotation>
773773
</xs:element>
774774
</xs:sequence>
775-
<xs:attribute name="sid" type="collada:sid_type" use="required">
776-
<xs:annotation>
777-
<xs:documentation>The sid attribute is a text string value containing the sub-identifier of this element. This value must
778-
be unique within the scope of the parent element.</xs:documentation>
779-
</xs:annotation>
780-
</xs:attribute>
781775
</xs:complexType>
782776
</xs:element>
783777
<xs:element name="components">
@@ -974,27 +968,27 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema">
974968
<xs:documentation>The type of post (rack, tracker, fence).</xs:documentation>
975969
</xs:annotation>
976970
</xs:element>
977-
<xs:element name="depth" type="collada:float_type">
971+
<xs:element name="depth" type="collada:float_type" minOccurs="0">
978972
<xs:annotation>
979973
<xs:documentation>The nominal underground depth of the post.</xs:documentation>
980974
</xs:annotation>
981975
</xs:element>
982-
<xs:element name="length" type="collada:float_type">
976+
<xs:element name="length" type="collada:float_type" minOccurs="0">
983977
<xs:annotation>
984978
<xs:documentation>The total length of the post including the portion underground.</xs:documentation>
985979
</xs:annotation>
986980
</xs:element>
987-
<xs:element name="diameter" type="collada:float_type">
981+
<xs:element name="diameter" type="collada:float_type" minOccurs="0">
988982
<xs:annotation>
989983
<xs:documentation>The diameter of the post cross-section.</xs:documentation>
990984
</xs:annotation>
991985
</xs:element>
992-
<xs:element name="inclination" type="post_inclin_enum">
986+
<xs:element name="inclination" type="post_inclin_enum" minOccurs="0">
993987
<xs:annotation>
994988
<xs:documentation>The nominal inclination of the post (vertical, perpendicular).</xs:documentation>
995989
</xs:annotation>
996990
</xs:element>
997-
<xs:element name="shape" type="post_shape_enum">
991+
<xs:element name="shape" type="post_shape_enum" minOccurs="0">
998992
<xs:annotation>
999993
<xs:documentation>The shape of the post cross-section (rectangle, circle, h-shape).</xs:documentation>
1000994
</xs:annotation>
@@ -1020,7 +1014,7 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema">
10201014
<xs:documentation>True of a gap is rigid, false if the gap allows the tracker torque tube to flex.</xs:documentation>
10211015
</xs:annotation>
10221016
</xs:element>
1023-
<xs:element name="width" type="collada:float_type">
1017+
<xs:element name="width" type="collada:float_type" minOccurs="0">
10241018
<xs:annotation>
10251019
<xs:documentation>The nominal width of the gap, i.e., the distance between the two racks.</xs:documentation>
10261020
</xs:annotation>

0 commit comments

Comments
 (0)