diff --git a/public/FWEArea/v2.1/UML/EARoot/EA1.htm b/public/FWEArea/v2.1/UML/EARoot/EA1.htm
index ea6e7aa54f840a4d5364356349467e773b983ec1..6a259dac5b7e932c1139d53b173c7cb54947b790 100644
--- a/public/FWEArea/v2.1/UML/EARoot/EA1.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA1.htm
@@ -36,22 +36,22 @@ function nameClassifier(name, separator)
<img src="EA2.png" usemap="#EA2" border="0" />
<MAP NAME="EA2">
-<area shape="rect" coords="711,685,1034,930" href="EA5.htm" target="_self">
-<area shape="rect" coords="361,685,683,930" href="EA9.htm" target="_self">
-<area shape="rect" coords="10,685,333,930" href="EA7.htm" target="_self">
-<area shape="rect" coords="394,395,650,585" href="EA4.htm" target="_self">
-<area shape="rect" coords="394,180,650,295" href="EA8.htm" target="_self">
+<area shape="rect" coords="711,676,1034,921" href="EA5.htm" target="_self">
+<area shape="rect" coords="361,676,683,921" href="EA9.htm" target="_self">
+<area shape="rect" coords="10,676,333,921" href="EA7.htm" target="_self">
+<area shape="rect" coords="394,371,650,577" href="EA4.htm" target="_self">
+<area shape="rect" coords="394,178,650,273" href="EA8.htm" target="_self">
</MAP>
<div class="ObjectTitle">FWEArea : Class diagram</div>
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:19:57</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:19:57 PM</td>
</tr>
<tr>
<td width="15%" class="ObjectDetailsTopic">Modified:</td>
- <td width="85%" class="ObjectDetailsValue">06/01/2021 12:42:13</td>
+ <td width="85%" class="ObjectDetailsValue">1/9/2021 5:31:53 PM</td>
</tr>
<tr style="padding-top: 10px;">
<td width="15%" class="ObjectDetailsTopic"><img src="../images/plus03.gif" align="absmiddle" id="proj" onclick="parent.toggleData(this.id)" />Project:</td>
diff --git a/public/FWEArea/v2.1/UML/EARoot/EA2.png b/public/FWEArea/v2.1/UML/EARoot/EA2.png
index 380b9d61ca30da9ebfc0a8e50f53a00c3179517e..ef64c496dab36ed4cc0ba7b437f63bd3895669ac 100644
Binary files a/public/FWEArea/v2.1/UML/EARoot/EA2.png and b/public/FWEArea/v2.1/UML/EARoot/EA2.png differ
diff --git a/public/FWEArea/v2.1/UML/EARoot/EA3.htm b/public/FWEArea/v2.1/UML/EARoot/EA3.htm
index 36a1b753226bc27a63f00be922b58c1e1f77f194..2acca8e5b268ea46e39d7230f2ae50cc80ae446d 100644
--- a/public/FWEArea/v2.1/UML/EARoot/EA3.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA3.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:19:54</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:19:54 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">04/01/2021 17:46:04</td>
+ <td class="ObjectDetailsValue">1/4/2021 5:46:04 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
diff --git a/public/FWEArea/v2.1/UML/EARoot/EA4.htm b/public/FWEArea/v2.1/UML/EARoot/EA4.htm
index f77a38b8a70039c044485766aca5cdd9a336a3fc..47c80173b5024a37be0254fffaa1ac32fa1ef311 100644
--- a/public/FWEArea/v2.1/UML/EARoot/EA4.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA4.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 23:36:30</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 11:36:30 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 23:36:38</td>
+ <td class="ObjectDetailsValue">5/12/2020 11:36:38 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -98,6 +98,7 @@ function nameClassifier(name, separator)
<div class="TableGroup" id="TableGroup">
<ul class="ItemTitle">
<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
+ <li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
<li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
<li onClick="parent.toggleItem('TaggedVal');" id="TaggedValTitle">Tagged Values</li>
<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
@@ -109,7 +110,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Integer</i><br /><strong> surveyYear</strong>
+ <i>Public Area</i><br /><strong> buildingFootrpintArea</strong>
</td>
</tr>
<tr>
@@ -157,7 +158,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> surveyYearVersion</strong>
+ <i>Public Area</i><br /><strong> openPlotArea</strong>
</td>
</tr>
<tr>
@@ -183,7 +184,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes7_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to *</td>
+ <td>Range:0 to 1</td>
</tr>
<tr id="DetailsImageAttributes7_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -205,7 +206,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> surveyDescription</strong>
+ <i>Public Integer</i><br /><strong> population</strong>
</td>
</tr>
<tr>
@@ -231,7 +232,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes8_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to *</td>
+ <td>Range:0 to 1</td>
</tr>
<tr id="DetailsImageAttributes8_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -253,7 +254,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Integer</i><br /><strong> population</strong>
+ <i>Public Area</i><br /><strong> settlementArea</strong>
</td>
</tr>
<tr>
@@ -301,7 +302,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> buildingFootrpintArea</strong>
+ <i>Public Area</i><br /><strong> surfaceArea</strong>
</td>
</tr>
<tr>
@@ -349,7 +350,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> settlementArea</strong>
+ <i>Public CharacterString</i><br /><strong> surveyDescription</strong>
</td>
</tr>
<tr>
@@ -375,7 +376,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes11_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes11_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -397,7 +398,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> openPlotArea</strong>
+ <i>Public Integer</i><br /><strong> surveyYear</strong>
</td>
</tr>
<tr>
@@ -423,7 +424,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes12_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes12_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -445,7 +446,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> trafficArea</strong>
+ <i>Public Decimal</i><br /><strong> surveyYearVersion</strong>
</td>
</tr>
<tr>
@@ -471,7 +472,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes13_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes13_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -493,7 +494,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> vegetationArea</strong>
+ <i>Public Area</i><br /><strong> trafficArea</strong>
</td>
</tr>
<tr>
@@ -541,7 +542,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> waterBodyArea</strong>
+ <i>Public Area</i><br /><strong> vegetationArea</strong>
</td>
</tr>
<tr>
@@ -586,11 +587,59 @@ function nameClassifier(name, separator)
inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ </td>
+ </tr> <tr>
+ <td width="100%" class="TableRow">
+ <i>Public Area</i><br /><strong> waterBodyArea</strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="1">
+ <a href="#" onclick="parent.toggleData('DetailsImageAttributes16')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes16" border="0" />Details:</a>
+ <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+
+ <tr id="DetailsImageAttributes16_00" style="display: none;">
+ <td width="75"><i>Alias:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes16_01" style="display: none;">
+ <td width="75"><i>Initial:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes16_02" style="display: none;">
+ <td width="75"><i>Stereotype: </i></td>
+ <td><<Property>></td>
+ </tr>
+ <tr id="DetailsImageAttributes16_03" style="display: none;">
+ <td width="75"><i>Ordered: </i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes16_04" style="display: none;">
+ <td width="75"><i>Range: </i></td>
+ <td>Range:0 to 1</td>
+ </tr>
+ <tr id="DetailsImageAttributes16_05" style="display: none;">
+ <td width="75"><i>Transient: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes16_06" style="display: none;">
+ <td width="75"><i>Derived: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes16_07" style="display: none;">
+ <td width="75"><i>IsID: </i></td>
+ <td>False</td>
+ </tr>
+ </table>
+
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+
+
</td>
</tr>
</table>
</div>
- <div class="ItemBody" id="AssociationsFromTable">
+ <div class="ItemBody" id="AssociationsToTable">
<table border="0" cellspacing="0" cellpadding="0" class="Table">
<tr>
<td width="40%" class="TableHeading">Element</td>
@@ -599,11 +648,11 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA5.htm">«FeatureType» EnergySurvey</a><br />
+ <a href="EA8.htm">«FeatureType» FWEArea</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> energySurveyProperty<br />
+ <strong>Name:</strong> consistsOfFWEsurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -613,31 +662,41 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink16" onclick="parent.toggleDiv('detailsDIVLink16','DetailsImageLink16')" />Details:
- <div id="detailsDIVLink16" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink17" onclick="parent.toggleDiv('detailsDIVLink17','DetailsImageLink17')" />Details:
+ <div id="detailsDIVLink17" class="DetailsDiv" >
</div>
</div>
</td>
</tr>
+
+ </table>
+ </div>
+ <div class="ItemBody" id="AssociationsFromTable">
+ <table border="0" cellspacing="0" cellpadding="0" class="Table">
+ <tr>
+ <td width="40%" class="TableHeading">Element</td>
+ <td width="30%" class="TableHeading">Source Role</td>
+ <td width="30%" class="TableHeading">Target Role</td>
+ </tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA8.htm">«FeatureType» FWEArea</a><br />
+ <a href="EA7.htm">«FeatureType» FoodSurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> <br />
+ <strong>Name:</strong> foodSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> areaSurveyProperties<br />
+ <strong>Name:</strong> <br />
</td>
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink17" onclick="parent.toggleDiv('detailsDIVLink17','DetailsImageLink17')" />Details:
- <div id="detailsDIVLink17" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink18" onclick="parent.toggleDiv('detailsDIVLink18','DetailsImageLink18')" />Details:
+ <div id="detailsDIVLink18" class="DetailsDiv" >
</div>
</div>
@@ -649,7 +708,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> waterSurveyProperty<br />
+ <strong>Name:</strong> waterSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -659,8 +718,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink18" onclick="parent.toggleDiv('detailsDIVLink18','DetailsImageLink18')" />Details:
- <div id="detailsDIVLink18" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink19" onclick="parent.toggleDiv('detailsDIVLink19','DetailsImageLink19')" />Details:
+ <div id="detailsDIVLink19" class="DetailsDiv" >
</div>
</div>
@@ -668,11 +727,11 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA7.htm">«FeatureType» FoodSurvey</a><br />
+ <a href="EA5.htm">«FeatureType» EnergySurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> foodSurveyProperties<br />
+ <strong>Name:</strong> energySurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -682,8 +741,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink19" onclick="parent.toggleDiv('detailsDIVLink19','DetailsImageLink19')" />Details:
- <div id="detailsDIVLink19" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink20" onclick="parent.toggleDiv('detailsDIVLink20','DetailsImageLink20')" />Details:
+ <div id="detailsDIVLink20" class="DetailsDiv" >
</div>
</div>
@@ -704,8 +763,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario20" onclick="parent.toggleDiv('detailsDIVScenario20','DetailsImageScenario20')" />Details:
- <div id="detailsDIVScenario20" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario21" onclick="parent.toggleDiv('detailsDIVScenario21','DetailsImageScenario21')" />Details:
+ <div id="detailsDIVScenario21" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>
</div>
@@ -717,8 +776,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario21" onclick="parent.toggleDiv('detailsDIVScenario21','DetailsImageScenario21')" />Details:
- <div id="detailsDIVScenario21" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario22" onclick="parent.toggleDiv('detailsDIVScenario22','DetailsImageScenario22')" />Details:
+ <div id="detailsDIVScenario22" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>
</div>
@@ -730,8 +789,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario22" onclick="parent.toggleDiv('detailsDIVScenario22','DetailsImageScenario22')" />Details:
- <div id="detailsDIVScenario22" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario23" onclick="parent.toggleDiv('detailsDIVScenario23','DetailsImageScenario23')" />Details:
+ <div id="detailsDIVScenario23" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>
</div>
@@ -749,14 +808,14 @@ function nameClassifier(name, separator)
<td width="40%" class="TableHeading">Notes</td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» EnergySurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA7.htm">«FeatureType» FoodSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA7.htm">«FeatureType» FoodSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">From</td>
@@ -770,7 +829,14 @@ function nameClassifier(name, separator)
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» FWEArea</a></td>
+ <td width="10%" class="TableRow" valign="top">Class</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">To</td>
+ <td width="40%" class="TableRow" valign="top"> </td>
+ </tr>
+ <tr>
+ <td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» EnergySurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">From</td>
@@ -779,14 +845,14 @@ function nameClassifier(name, separator)
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA7.htm">«FeatureType» FoodSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» EnergySurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
diff --git a/public/FWEArea/v2.1/UML/EARoot/EA5.htm b/public/FWEArea/v2.1/UML/EARoot/EA5.htm
index 753770969e71c424485644d3531ef4d501510cff..8ae86599359eb3be70ecccb721d23abb70258a52 100644
--- a/public/FWEArea/v2.1/UML/EARoot/EA5.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA5.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">13/05/2020 12:59:49</td>
+ <td width="85%" class="ObjectDetailsValue">5/13/2020 12:59:49 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">13/05/2020 12:59:56</td>
+ <td class="ObjectDetailsValue">5/13/2020 12:59:56 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -109,55 +109,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> spaceHeatingDemand</strong>
- </td>
- </tr>
- <tr>
- <td class="TableRowBottomDashed" colspan="1">
- <a href="#" onclick="parent.toggleData('DetailsImageAttributes23')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes23" border="0" />Details:</a>
- <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-
- <tr id="DetailsImageAttributes23_00" style="display: none;">
- <td width="75"><i>Alias:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes23_01" style="display: none;">
- <td width="75"><i>Initial:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes23_02" style="display: none;">
- <td width="75"><i>Stereotype: </i></td>
- <td><<Property>></td>
- </tr>
- <tr id="DetailsImageAttributes23_03" style="display: none;">
- <td width="75"><i>Ordered: </i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes23_04" style="display: none;">
- <td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
- </tr>
- <tr id="DetailsImageAttributes23_05" style="display: none;">
- <td width="75"><i>Transient: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes23_06" style="display: none;">
- <td width="75"><i>Derived: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes23_07" style="display: none;">
- <td width="75"><i>IsID: </i></td>
- <td>False</td>
- </tr>
- </table>
-
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-
-
- </td>
- </tr> <tr>
- <td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> spaceHeatingDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> biomassElectricityPotential</strong>
</td>
</tr>
<tr>
@@ -205,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> spaceCoolingDemand</strong>
+ <i>Public CharacterString</i><br /><strong> biomassElectricityPotentialUnit</strong>
</td>
</tr>
<tr>
@@ -253,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> spaceCoolingDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> biomassPrimaryEnergyPotential</strong>
</td>
</tr>
<tr>
@@ -301,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> residentialElectricityDemand</strong>
+ <i>Public CharacterString</i><br /><strong> biomassPrimaryEnergyPotentialUnit</strong>
</td>
</tr>
<tr>
@@ -349,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> residentialElectricityDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> biomassThermalPotential</strong>
</td>
</tr>
<tr>
@@ -397,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> electricityPotentialFromPVBuildings</strong>
+ <i>Public CharacterString</i><br /><strong> biomassThermalPotentialUnit</strong>
</td>
</tr>
<tr>
@@ -445,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> electricityPotentialFromPVBuildingsUnit</strong>
+ <i>Public Decimal</i><br /><strong> electricityPotentialFromPVBuildings</strong>
</td>
</tr>
<tr>
@@ -493,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassPrimaryEnergyPotential</strong>
+ <i>Public CharacterString</i><br /><strong> electricityPotentialFromPVBuildingsUnit</strong>
</td>
</tr>
<tr>
@@ -541,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassPrimaryEnergyPotentialUnit</strong>
+ <i>Public Decimal</i><br /><strong> residentialElectricityDemand</strong>
</td>
</tr>
<tr>
@@ -589,7 +541,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassElectricityPotential</strong>
+ <i>Public CharacterString</i><br /><strong> residentialElectricityDemandUnit</strong>
</td>
</tr>
<tr>
@@ -637,7 +589,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassElectricityPotentialUnit</strong>
+ <i>Public Decimal</i><br /><strong> spaceCoolingDemand</strong>
</td>
</tr>
<tr>
@@ -685,7 +637,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassThermalPotential</strong>
+ <i>Public CharacterString</i><br /><strong> spaceCoolingDemandUnit</strong>
</td>
</tr>
<tr>
@@ -733,7 +685,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassThermalPotentialUnit</strong>
+ <i>Public Decimal</i><br /><strong> spaceHeatingDemand</strong>
</td>
</tr>
<tr>
@@ -778,6 +730,54 @@ function nameClassifier(name, separator)
inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ </td>
+ </tr> <tr>
+ <td width="100%" class="TableRow">
+ <i>Public CharacterString</i><br /><strong> spaceHeatingDemandUnit</strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="1">
+ <a href="#" onclick="parent.toggleData('DetailsImageAttributes37')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes37" border="0" />Details:</a>
+ <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+
+ <tr id="DetailsImageAttributes37_00" style="display: none;">
+ <td width="75"><i>Alias:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes37_01" style="display: none;">
+ <td width="75"><i>Initial:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes37_02" style="display: none;">
+ <td width="75"><i>Stereotype: </i></td>
+ <td><<Property>></td>
+ </tr>
+ <tr id="DetailsImageAttributes37_03" style="display: none;">
+ <td width="75"><i>Ordered: </i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes37_04" style="display: none;">
+ <td width="75"><i>Range: </i></td>
+ <td>Range:0 to 1</td>
+ </tr>
+ <tr id="DetailsImageAttributes37_05" style="display: none;">
+ <td width="75"><i>Transient: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes37_06" style="display: none;">
+ <td width="75"><i>Derived: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes37_07" style="display: none;">
+ <td width="75"><i>IsID: </i></td>
+ <td>False</td>
+ </tr>
+ </table>
+
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+
+
</td>
</tr>
</table>
@@ -795,7 +795,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> energySurveyProperty<br />
+ <strong>Name:</strong> energySurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -805,8 +805,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink37" onclick="parent.toggleDiv('detailsDIVLink37','DetailsImageLink37')" />Details:
- <div id="detailsDIVLink37" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink38" onclick="parent.toggleDiv('detailsDIVLink38','DetailsImageLink38')" />Details:
+ <div id="detailsDIVLink38" class="DetailsDiv" >
</div>
</div>
@@ -827,8 +827,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario38" onclick="parent.toggleDiv('detailsDIVScenario38','DetailsImageScenario38')" />Details:
- <div id="detailsDIVScenario38" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario39" onclick="parent.toggleDiv('detailsDIVScenario39','DetailsImageScenario39')" />Details:
+ <div id="detailsDIVScenario39" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>
</div>
@@ -840,8 +840,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario39" onclick="parent.toggleDiv('detailsDIVScenario39','DetailsImageScenario39')" />Details:
- <div id="detailsDIVScenario39" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario40" onclick="parent.toggleDiv('detailsDIVScenario40','DetailsImageScenario40')" />Details:
+ <div id="detailsDIVScenario40" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>
</div>
@@ -853,8 +853,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario40" onclick="parent.toggleDiv('detailsDIVScenario40','DetailsImageScenario40')" />Details:
- <div id="detailsDIVScenario40" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario41" onclick="parent.toggleDiv('detailsDIVScenario41','DetailsImageScenario41')" />Details:
+ <div id="detailsDIVScenario41" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>
</div>
@@ -874,14 +874,14 @@ function nameClassifier(name, separator)
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
diff --git a/public/FWEArea/v2.1/UML/EARoot/EA6.htm b/public/FWEArea/v2.1/UML/EARoot/EA6.htm
index 4b4ea4f2c6edf10fc43c4c18d44713c156c3d43e..4649fcbed737d6d9fd83cb4f1ee444a5d90fa807 100644
--- a/public/FWEArea/v2.1/UML/EARoot/EA6.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA6.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">05/01/2021 21:37:48</td>
+ <td width="85%" class="ObjectDetailsValue">1/5/2021 9:37:48 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">05/01/2021 21:38:00</td>
+ <td class="ObjectDetailsValue">1/5/2021 9:38:00 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -111,8 +111,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario41" onclick="parent.toggleDiv('detailsDIVScenario41','DetailsImageScenario41')" />Details:
- <div id="detailsDIVScenario41" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario42" onclick="parent.toggleDiv('detailsDIVScenario42','DetailsImageScenario42')" />Details:
+ <div id="detailsDIVScenario42" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true | false<br />Default: true<br />Description: Encode code list as externally managed dictionary.<br /></div>
</div>
diff --git a/public/FWEArea/v2.1/UML/EARoot/EA7.htm b/public/FWEArea/v2.1/UML/EARoot/EA7.htm
index d03b5a7abf9d84b139f4bda5e9e273f4d6b40759..0c479d5062bc768ca59b313602ff50d5b27e1ca1 100644
--- a/public/FWEArea/v2.1/UML/EARoot/EA7.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA7.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">13/05/2020 12:59:26</td>
+ <td width="85%" class="ObjectDetailsValue">5/13/2020 12:59:26 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">13/05/2020 12:59:32</td>
+ <td class="ObjectDetailsValue">5/13/2020 12:59:32 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -112,54 +112,6 @@ function nameClassifier(name, separator)
<i>Public <a href="EA6.htm">foodCategoryValues</a></i><br /><strong> foodCategory</strong>
</td>
</tr>
- <tr>
- <td class="TableRowBottomDashed" colspan="1">
- <a href="#" onclick="parent.toggleData('DetailsImageAttributes42')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes42" border="0" />Details:</a>
- <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-
- <tr id="DetailsImageAttributes42_00" style="display: none;">
- <td width="75"><i>Alias:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes42_01" style="display: none;">
- <td width="75"><i>Initial:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes42_02" style="display: none;">
- <td width="75"><i>Stereotype: </i></td>
- <td><<Property>></td>
- </tr>
- <tr id="DetailsImageAttributes42_03" style="display: none;">
- <td width="75"><i>Ordered: </i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes42_04" style="display: none;">
- <td width="75"><i>Range: </i></td>
- <td>Range:0 to *</td>
- </tr>
- <tr id="DetailsImageAttributes42_05" style="display: none;">
- <td width="75"><i>Transient: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes42_06" style="display: none;">
- <td width="75"><i>Derived: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes42_07" style="display: none;">
- <td width="75"><i>IsID: </i></td>
- <td>False</td>
- </tr>
- </table>
-
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-
-
- </td>
- </tr> <tr>
- <td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodDemand</strong>
- </td>
- </tr>
<tr>
<td class="TableRowBottomDashed" colspan="1">
<a href="#" onclick="parent.toggleData('DetailsImageAttributes43')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes43" border="0" />Details:</a>
@@ -183,7 +135,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes43_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes43_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -205,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> foodConsumption</strong>
</td>
</tr>
<tr>
@@ -253,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProduction</strong>
+ <i>Public CharacterString</i><br /><strong> foodConsumptionUnit</strong>
</td>
</tr>
<tr>
@@ -301,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionUnit</strong>
+ <i>Public Decimal</i><br /><strong> foodDemand</strong>
</td>
</tr>
<tr>
@@ -349,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProductionWaterDemand</strong>
+ <i>Public CharacterString</i><br /><strong> foodDemandUnit</strong>
</td>
</tr>
<tr>
@@ -397,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionWaterDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> foodProduction</strong>
</td>
</tr>
<tr>
@@ -541,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodConsumption</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionUnit</strong>
</td>
</tr>
<tr>
@@ -589,7 +541,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodConsumptionUnit</strong>
+ <i>Public Decimal</i><br /><strong> foodProductionWaterDemand</strong>
</td>
</tr>
<tr>
@@ -634,6 +586,54 @@ function nameClassifier(name, separator)
inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ </td>
+ </tr> <tr>
+ <td width="100%" class="TableRow">
+ <i>Public CharacterString</i><br /><strong> foodProductionWaterDemandUnit</strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="1">
+ <a href="#" onclick="parent.toggleData('DetailsImageAttributes53')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes53" border="0" />Details:</a>
+ <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+
+ <tr id="DetailsImageAttributes53_00" style="display: none;">
+ <td width="75"><i>Alias:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes53_01" style="display: none;">
+ <td width="75"><i>Initial:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes53_02" style="display: none;">
+ <td width="75"><i>Stereotype: </i></td>
+ <td><<Property>></td>
+ </tr>
+ <tr id="DetailsImageAttributes53_03" style="display: none;">
+ <td width="75"><i>Ordered: </i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes53_04" style="display: none;">
+ <td width="75"><i>Range: </i></td>
+ <td>Range:0 to 1</td>
+ </tr>
+ <tr id="DetailsImageAttributes53_05" style="display: none;">
+ <td width="75"><i>Transient: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes53_06" style="display: none;">
+ <td width="75"><i>Derived: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes53_07" style="display: none;">
+ <td width="75"><i>IsID: </i></td>
+ <td>False</td>
+ </tr>
+ </table>
+
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+
+
</td>
</tr>
</table>
@@ -651,7 +651,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> foodSurveyProperties<br />
+ <strong>Name:</strong> foodSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -661,8 +661,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink53" onclick="parent.toggleDiv('detailsDIVLink53','DetailsImageLink53')" />Details:
- <div id="detailsDIVLink53" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink54" onclick="parent.toggleDiv('detailsDIVLink54','DetailsImageLink54')" />Details:
+ <div id="detailsDIVLink54" class="DetailsDiv" >
</div>
</div>
@@ -683,8 +683,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario54" onclick="parent.toggleDiv('detailsDIVScenario54','DetailsImageScenario54')" />Details:
- <div id="detailsDIVScenario54" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario55" onclick="parent.toggleDiv('detailsDIVScenario55','DetailsImageScenario55')" />Details:
+ <div id="detailsDIVScenario55" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>
</div>
@@ -696,8 +696,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario55" onclick="parent.toggleDiv('detailsDIVScenario55','DetailsImageScenario55')" />Details:
- <div id="detailsDIVScenario55" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario56" onclick="parent.toggleDiv('detailsDIVScenario56','DetailsImageScenario56')" />Details:
+ <div id="detailsDIVScenario56" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>
</div>
@@ -709,8 +709,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario56" onclick="parent.toggleDiv('detailsDIVScenario56','DetailsImageScenario56')" />Details:
- <div id="detailsDIVScenario56" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario57" onclick="parent.toggleDiv('detailsDIVScenario57','DetailsImageScenario57')" />Details:
+ <div id="detailsDIVScenario57" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>
</div>
@@ -730,14 +730,14 @@ function nameClassifier(name, separator)
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
diff --git a/public/FWEArea/v2.1/UML/EARoot/EA8.htm b/public/FWEArea/v2.1/UML/EARoot/EA8.htm
index 479885278510eaaea79382e535fc6d15bed305d7..444c02bd604b81bdfbf7b7d05f93ada7749a32ad 100644
--- a/public/FWEArea/v2.1/UML/EARoot/EA8.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA8.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 23:26:40</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 11:26:40 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 23:26:47</td>
+ <td class="ObjectDetailsValue">5/12/2020 11:26:47 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -99,6 +99,7 @@ function nameClassifier(name, separator)
<ul class="ItemTitle">
<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
<li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
+ <li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
<li onClick="parent.toggleItem('TaggedVal');" id="TaggedValTitle">Tagged Values</li>
<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
</ul>
@@ -108,54 +109,6 @@ function nameClassifier(name, separator)
<td width="100%" class="TableHeading">Attribute</td>
</tr>
<tr>
- <td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> surfaceArea</strong>
- </td>
- </tr>
- <tr>
- <td class="TableRowBottomDashed" colspan="1">
- <a href="#" onclick="parent.toggleData('DetailsImageAttributes57')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes57" border="0" />Details:</a>
- <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-
- <tr id="DetailsImageAttributes57_00" style="display: none;">
- <td width="75"><i>Alias:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes57_01" style="display: none;">
- <td width="75"><i>Initial:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes57_02" style="display: none;">
- <td width="75"><i>Stereotype: </i></td>
- <td><<Property>></td>
- </tr>
- <tr id="DetailsImageAttributes57_03" style="display: none;">
- <td width="75"><i>Ordered: </i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes57_04" style="display: none;">
- <td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
- </tr>
- <tr id="DetailsImageAttributes57_05" style="display: none;">
- <td width="75"><i>Transient: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes57_06" style="display: none;">
- <td width="75"><i>Derived: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes57_07" style="display: none;">
- <td width="75"><i>IsID: </i></td>
- <td>False</td>
- </tr>
- </table>
-
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-
-
- </td>
- </tr> <tr>
<td width="100%" class="TableRow">
<i>Public CharacterString</i><br /><strong> fweAreaName</strong>
</td>
@@ -199,7 +152,7 @@ function nameClassifier(name, separator)
</tr>
</table>
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
</td>
@@ -247,7 +200,7 @@ function nameClassifier(name, separator)
</tr>
</table>
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
</td>
@@ -263,7 +216,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA4.htm">«FeatureType» AreaSurvey</a><br />
+ «type» GM_MultiSurface<br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
@@ -271,7 +224,7 @@ function nameClassifier(name, separator)
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> areaSurveyProperties<br />
+ <strong>Name:</strong> lod0MultiSurface<br />
</td>
</tr>
@@ -284,17 +237,27 @@ function nameClassifier(name, separator)
</div>
</td>
</tr>
+
+ </table>
+ </div>
+ <div class="ItemBody" id="AssociationsFromTable">
+ <table border="0" cellspacing="0" cellpadding="0" class="Table">
+ <tr>
+ <td width="40%" class="TableHeading">Element</td>
+ <td width="30%" class="TableHeading">Source Role</td>
+ <td width="30%" class="TableHeading">Target Role</td>
+ </tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- «type» GM_MultiSurface<br />
+ <a href="EA4.htm">«FeatureType» AreaSurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> <br />
+ <strong>Name:</strong> consistsOfFWEsurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> lod0MultiSurface<br />
+ <strong>Name:</strong> <br />
</td>
</tr>
@@ -352,6 +315,18 @@ function nameClassifier(name, separator)
<div id="detailsDIVScenario64" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>
+ </div>
+ </div>
+ </td>
+ </tr> <tr>
+ <td width="50%" class="TableRow" valign="top">topLevel</td>
+ <td width="50%" class="TableRow" valign="top">true</td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="2">
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario65" onclick="parent.toggleDiv('detailsDIVScenario65','DetailsImageScenario65')" />Details:
+ <div id="detailsDIVScenario65" class="DetailsDiv" >
+
</div>
</div>
</td>
@@ -366,6 +341,13 @@ function nameClassifier(name, separator)
<td width="10%" class="TableHeading">Direction</td>
<td width="40%" class="TableHeading">Notes</td>
</tr>
+ <tr>
+ <td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
+ <td width="10%" class="TableRow" valign="top">Class</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">From</td>
+ <td width="40%" class="TableRow" valign="top"> </td>
+ </tr>
<tr>
<td width="30%" class="TableRow" valign="top">_CityObject</td>
<td width="10%" class="TableRow" valign="top">Class</td>
diff --git a/public/FWEArea/v2.1/UML/EARoot/EA9.htm b/public/FWEArea/v2.1/UML/EARoot/EA9.htm
index ce01bb4c859cecde9ae6a132aa2836664e3f80ef..fdd27fd25445b03e4f64c77f32f7c479a28bb20a 100644
--- a/public/FWEArea/v2.1/UML/EARoot/EA9.htm
+++ b/public/FWEArea/v2.1/UML/EARoot/EA9.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">13/05/2020 12:59:34</td>
+ <td width="85%" class="ObjectDetailsValue">5/13/2020 12:59:34 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">13/05/2020 12:59:42</td>
+ <td class="ObjectDetailsValue">5/13/2020 12:59:42 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -109,55 +109,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticWaterDemand</strong>
- </td>
- </tr>
- <tr>
- <td class="TableRowBottomDashed" colspan="1">
- <a href="#" onclick="parent.toggleData('DetailsImageAttributes65')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes65" border="0" />Details:</a>
- <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-
- <tr id="DetailsImageAttributes65_00" style="display: none;">
- <td width="75"><i>Alias:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes65_01" style="display: none;">
- <td width="75"><i>Initial:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes65_02" style="display: none;">
- <td width="75"><i>Stereotype: </i></td>
- <td><<Property>></td>
- </tr>
- <tr id="DetailsImageAttributes65_03" style="display: none;">
- <td width="75"><i>Ordered: </i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes65_04" style="display: none;">
- <td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
- </tr>
- <tr id="DetailsImageAttributes65_05" style="display: none;">
- <td width="75"><i>Transient: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes65_06" style="display: none;">
- <td width="75"><i>Derived: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes65_07" style="display: none;">
- <td width="75"><i>IsID: </i></td>
- <td>False</td>
- </tr>
- </table>
-
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-
-
- </td>
- </tr> <tr>
- <td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticWaterDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> domesticHotWaterDemand</strong>
</td>
</tr>
<tr>
@@ -205,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticHotWaterDemand</strong>
+ <i>Public CharacterString</i><br /><strong> domesticHotWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -253,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticHotWaterDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> domesticSolidWaste</strong>
</td>
</tr>
<tr>
@@ -301,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticWaterWaste</strong>
+ <i>Public CharacterString</i><br /><strong> domesticSolidWasteUnit</strong>
</td>
</tr>
<tr>
@@ -349,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticWaterWasteUnit</strong>
+ <i>Public Decimal</i><br /><strong> domesticWaterDemand</strong>
</td>
</tr>
<tr>
@@ -397,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticSolidWaste</strong>
+ <i>Public CharacterString</i><br /><strong> domesticWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -445,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticSolidWasteUnit</strong>
+ <i>Public Decimal</i><br /><strong> domesticWaterWaste</strong>
</td>
</tr>
<tr>
@@ -493,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> totalDomesticWaste</strong>
+ <i>Public CharacterString</i><br /><strong> domesticWaterWasteUnit</strong>
</td>
</tr>
<tr>
@@ -541,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> totalDomesticWasteUnit</strong>
+ <i>Public Decimal</i><br /><strong> totalDomesticWaste</strong>
</td>
</tr>
<tr>
@@ -682,6 +634,54 @@ function nameClassifier(name, separator)
inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ </td>
+ </tr> <tr>
+ <td width="100%" class="TableRow">
+ <i>Public CharacterString</i><br /><strong> totalDomesticWasteUnit</strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="1">
+ <a href="#" onclick="parent.toggleData('DetailsImageAttributes77')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes77" border="0" />Details:</a>
+ <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+
+ <tr id="DetailsImageAttributes77_00" style="display: none;">
+ <td width="75"><i>Alias:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes77_01" style="display: none;">
+ <td width="75"><i>Initial:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes77_02" style="display: none;">
+ <td width="75"><i>Stereotype: </i></td>
+ <td><<Property>></td>
+ </tr>
+ <tr id="DetailsImageAttributes77_03" style="display: none;">
+ <td width="75"><i>Ordered: </i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes77_04" style="display: none;">
+ <td width="75"><i>Range: </i></td>
+ <td>Range:0 to 1</td>
+ </tr>
+ <tr id="DetailsImageAttributes77_05" style="display: none;">
+ <td width="75"><i>Transient: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes77_06" style="display: none;">
+ <td width="75"><i>Derived: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes77_07" style="display: none;">
+ <td width="75"><i>IsID: </i></td>
+ <td>False</td>
+ </tr>
+ </table>
+
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+
+
</td>
</tr>
</table>
@@ -699,7 +699,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> waterSurveyProperty<br />
+ <strong>Name:</strong> waterSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -709,8 +709,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink77" onclick="parent.toggleDiv('detailsDIVLink77','DetailsImageLink77')" />Details:
- <div id="detailsDIVLink77" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink78" onclick="parent.toggleDiv('detailsDIVLink78','DetailsImageLink78')" />Details:
+ <div id="detailsDIVLink78" class="DetailsDiv" >
</div>
</div>
@@ -731,8 +731,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario78" onclick="parent.toggleDiv('detailsDIVScenario78','DetailsImageScenario78')" />Details:
- <div id="detailsDIVScenario78" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario79" onclick="parent.toggleDiv('detailsDIVScenario79','DetailsImageScenario79')" />Details:
+ <div id="detailsDIVScenario79" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>
</div>
@@ -744,8 +744,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario79" onclick="parent.toggleDiv('detailsDIVScenario79','DetailsImageScenario79')" />Details:
- <div id="detailsDIVScenario79" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario80" onclick="parent.toggleDiv('detailsDIVScenario80','DetailsImageScenario80')" />Details:
+ <div id="detailsDIVScenario80" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>
</div>
@@ -757,8 +757,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario80" onclick="parent.toggleDiv('detailsDIVScenario80','DetailsImageScenario80')" />Details:
- <div id="detailsDIVScenario80" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario81" onclick="parent.toggleDiv('detailsDIVScenario81','DetailsImageScenario81')" />Details:
+ <div id="detailsDIVScenario81" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>
</div>
@@ -778,14 +778,14 @@ function nameClassifier(name, separator)
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» AreaSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
diff --git a/public/FWEBuilding/v2.1/UML/EARoot/EA1.htm b/public/FWEBuilding/v2.1/UML/EARoot/EA1.htm
index 733910c135f9adc6587a81f3db20528122036849..53367befde35a45c0b30dff6bb0b3b6b9ce4a3bf 100644
--- a/public/FWEBuilding/v2.1/UML/EARoot/EA1.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA1.htm
@@ -36,22 +36,22 @@ function nameClassifier(name, separator)
<img src="EA2.png" usemap="#EA2" border="0" />
<MAP NAME="EA2">
-<area shape="rect" coords="380,168,596,309" href="EA4.htm" target="_self">
-<area shape="rect" coords="380,397,596,512" href="EA5.htm" target="_self">
-<area shape="rect" coords="677,602,968,828" href="EA6.htm" target="_self">
-<area shape="rect" coords="331,602,645,828" href="EA9.htm" target="_self">
-<area shape="rect" coords="10,602,301,828" href="EA8.htm" target="_self">
+<area shape="rect" coords="380,175,596,270" href="EA4.htm" target="_self">
+<area shape="rect" coords="380,365,596,506" href="EA5.htm" target="_self">
+<area shape="rect" coords="677,601,968,827" href="EA6.htm" target="_self">
+<area shape="rect" coords="331,601,645,827" href="EA9.htm" target="_self">
+<area shape="rect" coords="10,601,301,827" href="EA8.htm" target="_self">
</MAP>
<div class="ObjectTitle">FWEBuilding : Class diagram</div>
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 00:00:00</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 12:00:00 AM</td>
</tr>
<tr>
<td width="15%" class="ObjectDetailsTopic">Modified:</td>
- <td width="85%" class="ObjectDetailsValue">06/01/2021 12:41:00</td>
+ <td width="85%" class="ObjectDetailsValue">1/9/2021 5:31:40 PM</td>
</tr>
<tr style="padding-top: 10px;">
<td width="15%" class="ObjectDetailsTopic"><img src="../images/plus03.gif" align="absmiddle" id="proj" onclick="parent.toggleData(this.id)" />Project:</td>
diff --git a/public/FWEBuilding/v2.1/UML/EARoot/EA2.png b/public/FWEBuilding/v2.1/UML/EARoot/EA2.png
index 03cc2dd144443098b38e1ebd39781710c4d53203..de353fbbcbb0b6a3407c3d4ae8acf203db994c79 100644
Binary files a/public/FWEBuilding/v2.1/UML/EARoot/EA2.png and b/public/FWEBuilding/v2.1/UML/EARoot/EA2.png differ
diff --git a/public/FWEBuilding/v2.1/UML/EARoot/EA3.htm b/public/FWEBuilding/v2.1/UML/EARoot/EA3.htm
index 218d69040f3e8e1aa990d06327a102af7746f539..2f84e62de3887729c0d251de7d374914ca66aa4d 100644
--- a/public/FWEBuilding/v2.1/UML/EARoot/EA3.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA3.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:16:40</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:16:40 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">04/01/2021 17:46:43</td>
+ <td class="ObjectDetailsValue">1/4/2021 5:46:43 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
diff --git a/public/FWEBuilding/v2.1/UML/EARoot/EA4.htm b/public/FWEBuilding/v2.1/UML/EARoot/EA4.htm
index 49dcaad75beb2e5dcee0abd1a9d4f6902287d80f..201ce6f42fbcccf3d297b7b9854c7ffcd79569a3 100644
--- a/public/FWEBuilding/v2.1/UML/EARoot/EA4.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA4.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">04/01/2021 17:55:30</td>
+ <td width="85%" class="ObjectDetailsValue">1/4/2021 5:55:30 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">04/01/2021 17:58:10</td>
+ <td class="ObjectDetailsValue">1/4/2021 5:58:10 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -98,7 +98,7 @@ function nameClassifier(name, separator)
<div class="TableGroup" id="TableGroup">
<ul class="ItemTitle">
<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
- <li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
+ <li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
</ul>
<div class="ItemBody" id="AttributesTable">
@@ -108,7 +108,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> buildingFootprintArea</strong>
+ <i>Public CharacterString</i><br /><strong> fweAreaName</strong>
</td>
</tr>
<tr>
@@ -150,13 +150,13 @@ function nameClassifier(name, separator)
</tr>
</table>
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> totalFloorArea</strong>
+ <i>Public CharacterString</i><br /><strong> fweSystemName</strong>
</td>
</tr>
<tr>
@@ -198,110 +198,14 @@ function nameClassifier(name, separator)
</tr>
</table>
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-
-
- </td>
- </tr> <tr>
- <td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> fweAreaName</strong>
- </td>
- </tr>
- <tr>
- <td class="TableRowBottomDashed" colspan="1">
- <a href="#" onclick="parent.toggleData('DetailsImageAttributes8')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes8" border="0" />Details:</a>
- <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-
- <tr id="DetailsImageAttributes8_00" style="display: none;">
- <td width="75"><i>Alias:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes8_01" style="display: none;">
- <td width="75"><i>Initial:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes8_02" style="display: none;">
- <td width="75"><i>Stereotype: </i></td>
- <td><<Property>></td>
- </tr>
- <tr id="DetailsImageAttributes8_03" style="display: none;">
- <td width="75"><i>Ordered: </i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes8_04" style="display: none;">
- <td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
- </tr>
- <tr id="DetailsImageAttributes8_05" style="display: none;">
- <td width="75"><i>Transient: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes8_06" style="display: none;">
- <td width="75"><i>Derived: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes8_07" style="display: none;">
- <td width="75"><i>IsID: </i></td>
- <td>False</td>
- </tr>
- </table>
-
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-
-
- </td>
- </tr> <tr>
- <td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> fweSystemName</strong>
- </td>
- </tr>
- <tr>
- <td class="TableRowBottomDashed" colspan="1">
- <a href="#" onclick="parent.toggleData('DetailsImageAttributes9')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes9" border="0" />Details:</a>
- <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-
- <tr id="DetailsImageAttributes9_00" style="display: none;">
- <td width="75"><i>Alias:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes9_01" style="display: none;">
- <td width="75"><i>Initial:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes9_02" style="display: none;">
- <td width="75"><i>Stereotype: </i></td>
- <td><<Property>></td>
- </tr>
- <tr id="DetailsImageAttributes9_03" style="display: none;">
- <td width="75"><i>Ordered: </i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes9_04" style="display: none;">
- <td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
- </tr>
- <tr id="DetailsImageAttributes9_05" style="display: none;">
- <td width="75"><i>Transient: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes9_06" style="display: none;">
- <td width="75"><i>Derived: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes9_07" style="display: none;">
- <td width="75"><i>IsID: </i></td>
- <td>False</td>
- </tr>
- </table>
-
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
</td>
</tr>
</table>
</div>
- <div class="ItemBody" id="AssociationsToTable">
+ <div class="ItemBody" id="AssociationsFromTable">
<table border="0" cellspacing="0" cellpadding="0" class="Table">
<tr>
<td width="40%" class="TableHeading">Element</td>
@@ -314,18 +218,18 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> <br />
+ <strong>Name:</strong> consistsOfFWEsurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> buildingSurveyProperties<br />
+ <strong>Name:</strong> <br />
</td>
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink10" onclick="parent.toggleDiv('detailsDIVLink10','DetailsImageLink10')" />Details:
- <div id="detailsDIVLink10" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink8" onclick="parent.toggleDiv('detailsDIVLink8','DetailsImageLink8')" />Details:
+ <div id="detailsDIVLink8" class="DetailsDiv" >
</div>
</div>
@@ -350,6 +254,13 @@ function nameClassifier(name, separator)
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
+ <tr>
+ <td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» BuildingSurvey</a></td>
+ <td width="10%" class="TableRow" valign="top">Class</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">From</td>
+ <td width="40%" class="TableRow" valign="top"> </td>
+ </tr>
</table>
</div>
diff --git a/public/FWEBuilding/v2.1/UML/EARoot/EA5.htm b/public/FWEBuilding/v2.1/UML/EARoot/EA5.htm
index 679d833ee0da38f3b6c3836bd8a2ae4e8f67c654..2176094b3944198c890eb9022e6c0e36716d98d4 100644
--- a/public/FWEBuilding/v2.1/UML/EARoot/EA5.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA5.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 14:06:12</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 2:06:12 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 14:06:20</td>
+ <td class="ObjectDetailsValue">1/9/2021 11:52:27 AM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -98,6 +98,7 @@ function nameClassifier(name, separator)
<div class="TableGroup" id="TableGroup">
<ul class="ItemTitle">
<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
+ <li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
<li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
<li onClick="parent.toggleItem('TaggedVal');" id="TaggedValTitle">Tagged Values</li>
<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
@@ -109,7 +110,103 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Integer</i><br /><strong> surveyYear</strong>
+ <i>Public Area</i><br /><strong> buildingFootprintArea</strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="1">
+ <a href="#" onclick="parent.toggleData('DetailsImageAttributes9')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes9" border="0" />Details:</a>
+ <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+
+ <tr id="DetailsImageAttributes9_00" style="display: none;">
+ <td width="75"><i>Alias:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes9_01" style="display: none;">
+ <td width="75"><i>Initial:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes9_02" style="display: none;">
+ <td width="75"><i>Stereotype: </i></td>
+ <td><<Property>></td>
+ </tr>
+ <tr id="DetailsImageAttributes9_03" style="display: none;">
+ <td width="75"><i>Ordered: </i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes9_04" style="display: none;">
+ <td width="75"><i>Range: </i></td>
+ <td>Range:0 to 1</td>
+ </tr>
+ <tr id="DetailsImageAttributes9_05" style="display: none;">
+ <td width="75"><i>Transient: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes9_06" style="display: none;">
+ <td width="75"><i>Derived: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes9_07" style="display: none;">
+ <td width="75"><i>IsID: </i></td>
+ <td>False</td>
+ </tr>
+ </table>
+
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+
+
+ </td>
+ </tr> <tr>
+ <td width="100%" class="TableRow">
+ <i>Public Integer</i><br /><strong> occupants</strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="1">
+ <a href="#" onclick="parent.toggleData('DetailsImageAttributes10')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes10" border="0" />Details:</a>
+ <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+
+ <tr id="DetailsImageAttributes10_00" style="display: none;">
+ <td width="75"><i>Alias:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes10_01" style="display: none;">
+ <td width="75"><i>Initial:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes10_02" style="display: none;">
+ <td width="75"><i>Stereotype: </i></td>
+ <td><<Property>></td>
+ </tr>
+ <tr id="DetailsImageAttributes10_03" style="display: none;">
+ <td width="75"><i>Ordered: </i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes10_04" style="display: none;">
+ <td width="75"><i>Range: </i></td>
+ <td>Range:0 to 1</td>
+ </tr>
+ <tr id="DetailsImageAttributes10_05" style="display: none;">
+ <td width="75"><i>Transient: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes10_06" style="display: none;">
+ <td width="75"><i>Derived: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes10_07" style="display: none;">
+ <td width="75"><i>IsID: </i></td>
+ <td>False</td>
+ </tr>
+ </table>
+
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+
+
+ </td>
+ </tr> <tr>
+ <td width="100%" class="TableRow">
+ <i>Public CharacterString</i><br /><strong> surveyDescription</strong>
</td>
</tr>
<tr>
@@ -135,7 +232,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes11_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes11_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -157,7 +254,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> surveyYearVersion</strong>
+ <i>Public Integer</i><br /><strong> surveyYear</strong>
</td>
</tr>
<tr>
@@ -205,7 +302,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> surveyDescription</strong>
+ <i>Public Decimal</i><br /><strong> surveyYearVersion</strong>
</td>
</tr>
<tr>
@@ -253,7 +350,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Integer</i><br /><strong> population</strong>
+ <i>Public Area</i><br /><strong> totalFloorArea</strong>
</td>
</tr>
<tr>
@@ -302,7 +399,7 @@ function nameClassifier(name, separator)
</tr>
</table>
</div>
- <div class="ItemBody" id="AssociationsFromTable">
+ <div class="ItemBody" id="AssociationsToTable">
<table border="0" cellspacing="0" cellpadding="0" class="Table">
<tr>
<td width="40%" class="TableHeading">Element</td>
@@ -315,11 +412,11 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> <br />
+ <strong>Name:</strong> consistsOfFWEsurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> buildingSurveyProperties<br />
+ <strong>Name:</strong> <br />
</td>
</tr>
@@ -332,13 +429,23 @@ function nameClassifier(name, separator)
</div>
</td>
</tr>
+
+ </table>
+ </div>
+ <div class="ItemBody" id="AssociationsFromTable">
+ <table border="0" cellspacing="0" cellpadding="0" class="Table">
+ <tr>
+ <td width="40%" class="TableHeading">Element</td>
+ <td width="30%" class="TableHeading">Source Role</td>
+ <td width="30%" class="TableHeading">Target Role</td>
+ </tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA8.htm">«FeatureType» FoodSurvey</a><br />
+ <a href="EA6.htm">«FeatureType» EnergySurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> foodSurveyProperties<br />
+ <strong>Name:</strong> energySurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -357,11 +464,11 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA6.htm">«FeatureType» EnergySurvey</a><br />
+ <a href="EA8.htm">«FeatureType» FoodSurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> energySurveyProperty<br />
+ <strong>Name:</strong> foodSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -384,7 +491,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> waterSurveyProperty<br />
+ <strong>Name:</strong> waterSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -470,31 +577,38 @@ function nameClassifier(name, separator)
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» FoodSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» FoodSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» EnergySurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» EnergySurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» FoodSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
+ <tr>
+ <td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«ADEElement» _AbstractBuilding</a></td>
+ <td width="10%" class="TableRow" valign="top">Class</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">To</td>
+ <td width="40%" class="TableRow" valign="top"> </td>
+ </tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
diff --git a/public/FWEBuilding/v2.1/UML/EARoot/EA6.htm b/public/FWEBuilding/v2.1/UML/EARoot/EA6.htm
index f649e1514a241fa8059872a396fb747db2b09681..898f1bf990b04b28f76898f9d3cc56685e231b8a 100644
--- a/public/FWEBuilding/v2.1/UML/EARoot/EA6.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA6.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:38:49</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:38:49 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">15/05/2020 19:00:43</td>
+ <td class="ObjectDetailsValue">5/15/2020 7:00:43 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -109,7 +109,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> spaceHeatingDemand</strong>
+ <i>Public Decimal</i><br /><strong> electricityPotentialFromPV</strong>
</td>
</tr>
<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> spaceHeatingDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> electricityPotentialfromPVUnit</strong>
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> spaceCoolingDemand</strong>
+ <i>Public Decimal</i><br /><strong> residentialElectricityDemand</strong>
</td>
</tr>
<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> spaceCoolingDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> residentialElectricityDemandUnit</strong>
</td>
</tr>
<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> residentialElectricityDemand</strong>
+ <i>Public Decimal</i><br /><strong> spaceCoolingDemand</strong>
</td>
</tr>
<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> residentialElectricityDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> spaceCoolingDemandUnit</strong>
</td>
</tr>
<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> electricityPotentialFromPV</strong>
+ <i>Public Decimal</i><br /><strong> spaceHeatingDemand</strong>
</td>
</tr>
<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> electricityPotentialfromPVUnit</strong>
+ <i>Public CharacterString</i><br /><strong> spaceHeatingDemandUnit</strong>
</td>
</tr>
<tr>
@@ -507,7 +507,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> energySurveyProperty<br />
+ <strong>Name:</strong> energySurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
diff --git a/public/FWEBuilding/v2.1/UML/EARoot/EA7.htm b/public/FWEBuilding/v2.1/UML/EARoot/EA7.htm
index 8898852293de72b760e9a9091499e1a8c57d78d8..60b0e73d76ff2bb4a2650856d559601bdf86f483 100644
--- a/public/FWEBuilding/v2.1/UML/EARoot/EA7.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA7.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">04/01/2021 20:30:54</td>
+ <td width="85%" class="ObjectDetailsValue">1/4/2021 8:30:54 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">04/01/2021 20:31:45</td>
+ <td class="ObjectDetailsValue">1/4/2021 8:31:45 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
diff --git a/public/FWEBuilding/v2.1/UML/EARoot/EA8.htm b/public/FWEBuilding/v2.1/UML/EARoot/EA8.htm
index 44184316377eb1be45cb2e1ad7c8da96d49a8400..56c42d5b5bd60a7a9bbe7a59a0a52bd564e2b6f3 100644
--- a/public/FWEBuilding/v2.1/UML/EARoot/EA8.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA8.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:38:24</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:38:24 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 13:38:30</td>
+ <td class="ObjectDetailsValue">5/12/2020 1:38:30 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodDemand</strong>
+ <i>Public Decimal</i><br /><strong> foodConsumption</strong>
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodConsumptionUnit</strong>
</td>
</tr>
<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProduction</strong>
+ <i>Public Decimal</i><br /><strong> foodDemand</strong>
</td>
</tr>
<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodDemandUnit</strong>
</td>
</tr>
<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProductionWaterDemand</strong>
+ <i>Public Decimal</i><br /><strong> foodProduction</strong>
</td>
</tr>
<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionWaterDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> foodProductionEnergyDemand</strong>
</td>
</tr>
<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProductionEnergyDemand</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionEnergyDemandUnit</strong>
</td>
</tr>
<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionEnergyDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionUnit</strong>
</td>
</tr>
<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodConsumption</strong>
+ <i>Public Decimal</i><br /><strong> foodProductionWaterDemand</strong>
</td>
</tr>
<tr>
@@ -589,7 +589,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodConsumptionUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -651,7 +651,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> foodSurveyProperties<br />
+ <strong>Name:</strong> foodSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -730,14 +730,14 @@ function nameClassifier(name, separator)
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» BuildingSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA5.htm">«FeatureType» BuildingSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
diff --git a/public/FWEBuilding/v2.1/UML/EARoot/EA9.htm b/public/FWEBuilding/v2.1/UML/EARoot/EA9.htm
index cd60ab0e33e5ce4f86429b359359280969283deb..67542dabf85a1b3f49013190638a54049ea7e297 100644
--- a/public/FWEBuilding/v2.1/UML/EARoot/EA9.htm
+++ b/public/FWEBuilding/v2.1/UML/EARoot/EA9.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:38:33</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:38:33 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 13:38:41</td>
+ <td class="ObjectDetailsValue">5/12/2020 1:38:41 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -109,7 +109,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticWaterDemand</strong>
+ <i>Public Decimal</i><br /><strong> domesticHotWaterDemand</strong>
</td>
</tr>
<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticWaterDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticHotWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticHotWaterDemand</strong>
+ <i>Public Decimal</i><br /><strong> domesticHotWaterEnergyDemand</strong>
</td>
</tr>
<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticHotWaterDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticHotWaterEnergyDemandUnit</strong>
</td>
</tr>
<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticHotWaterEnergyDemand</strong>
+ <i>Public Decimal</i><br /><strong> domesticSolidWaste</strong>
</td>
</tr>
<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticHotWaterEnergyDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticSolidWasteUnit</strong>
</td>
</tr>
<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticWaterWaste</strong>
+ <i>Public Decimal</i><br /><strong> domesticWaterDemand</strong>
</td>
</tr>
<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticWaterWasteUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticSolidWaste</strong>
+ <i>Public Decimal</i><br /><strong> domesticWaterWaste</strong>
</td>
</tr>
<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticSolidWasteUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticWaterWasteUnit</strong>
</td>
</tr>
<tr>
@@ -699,7 +699,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> waterSurveyProperty<br />
+ <strong>Name:</strong> waterSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA1.htm b/public/FWELanduse/v2.1/UML/EARoot/EA1.htm
index 773e768088bf3fb4f26281090c560201cf66068f..2efa48bd8d2e47fbf3a0937ad42d3f5d9a8694fc 100644
--- a/public/FWELanduse/v2.1/UML/EARoot/EA1.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA1.htm
@@ -39,19 +39,19 @@ function nameClassifier(name, separator)
<area shape="rect" coords="690,599,1020,1014" href="EA4.htm" target="_self">
<area shape="rect" coords="341,599,655,831" href="EA10.htm" target="_self">
<area shape="rect" coords="10,599,306,831" href="EA6.htm" target="_self">
-<area shape="rect" coords="371,370,627,511" href="EA8.htm" target="_self">
-<area shape="rect" coords="371,168,627,282" href="EA7.htm" target="_self">
+<area shape="rect" coords="370,363,626,504" href="EA8.htm" target="_self">
+<area shape="rect" coords="370,174,626,269" href="EA7.htm" target="_self">
</MAP>
<div class="ObjectTitle">FWELanduse : Class diagram</div>
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:19:39</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:19:39 PM</td>
</tr>
<tr>
<td width="15%" class="ObjectDetailsTopic">Modified:</td>
- <td width="85%" class="ObjectDetailsValue">06/01/2021 12:41:01</td>
+ <td width="85%" class="ObjectDetailsValue">1/9/2021 5:31:19 PM</td>
</tr>
<tr style="padding-top: 10px;">
<td width="15%" class="ObjectDetailsTopic"><img src="../images/plus03.gif" align="absmiddle" id="proj" onclick="parent.toggleData(this.id)" />Project:</td>
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA10.htm b/public/FWELanduse/v2.1/UML/EARoot/EA10.htm
index 6ed0a4bb0d9387f68f3637b56a2c0d6232abd4bf..d5cdc370971fae5be4cd82ce2ad33bd16b98f9fc 100644
--- a/public/FWELanduse/v2.1/UML/EARoot/EA10.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA10.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 18:53:23</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 6:53:23 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 18:53:33</td>
+ <td class="ObjectDetailsValue">5/12/2020 6:53:33 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -109,7 +109,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticWaterDemand</strong>
+ <i>Public Decimal</i><br /><strong> domesticHotWaterDemand</strong>
</td>
</tr>
<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticWaterDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticHotWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticHotWaterDemand</strong>
+ <i>Public Decimal</i><br /><strong> domesticHotWaterEnergyDemand</strong>
</td>
</tr>
<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticHotWaterDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticHotWaterEnergyDemandUnit</strong>
</td>
</tr>
<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticHotWaterEnergyDemand</strong>
+ <i>Public Decimal</i><br /><strong> domesticSolidWaste</strong>
</td>
</tr>
<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticHotWaterEnergyDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticSolidWasteUnit</strong>
</td>
</tr>
<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticWaterWaste</strong>
+ <i>Public Decimal</i><br /><strong> domesticWaterDemand</strong>
</td>
</tr>
<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticWaterWasteUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticSolidWaste</strong>
+ <i>Public Decimal</i><br /><strong> domesticWaterWaste</strong>
</td>
</tr>
<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticSolidWasteUnit</strong>
+ <i>Public CharacterString</i><br /><strong> domesticWaterWasteUnit</strong>
</td>
</tr>
<tr>
@@ -699,7 +699,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> waterSurveyProperty<br />
+ <strong>Name:</strong> waterSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -778,14 +778,14 @@ function nameClassifier(name, separator)
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» LandUseSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» LandUseSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA2.png b/public/FWELanduse/v2.1/UML/EARoot/EA2.png
index 06fea3776b2f927ee03eec6896d8c4222e7344fa..a8f342fa6767bbb2b90ee7f79e37883e2746fcae 100644
Binary files a/public/FWELanduse/v2.1/UML/EARoot/EA2.png and b/public/FWELanduse/v2.1/UML/EARoot/EA2.png differ
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA3.htm b/public/FWELanduse/v2.1/UML/EARoot/EA3.htm
index 47f924e70267a4a18b6cc9123722e7d58c157db5..691d5d27ade37ef7bfa360610d44b556787ac46c 100644
--- a/public/FWELanduse/v2.1/UML/EARoot/EA3.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA3.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:19:19</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:19:19 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">04/01/2021 17:46:59</td>
+ <td class="ObjectDetailsValue">1/4/2021 5:46:59 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA4.htm b/public/FWELanduse/v2.1/UML/EARoot/EA4.htm
index e2005f5190168be891400c1aeaa42da56d156aaa..aa950bea3dd8134d90a9167b677657f2b896083c 100644
--- a/public/FWELanduse/v2.1/UML/EARoot/EA4.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA4.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 18:53:37</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 6:53:37 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 18:53:44</td>
+ <td class="ObjectDetailsValue">5/12/2020 6:53:44 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -109,7 +109,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> spaceHeatingDemand</strong>
+ <i>Public Decimal</i><br /><strong> biomassPrimaryEnergyPotential</strong>
</td>
</tr>
<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> spaceHeatingDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> biomassPrimaryEnergyPotentialUnit</strong>
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> spaceCoolingDemand</strong>
+ <i>Public Decimal</i><br /><strong> biomassToBioethanol</strong>
</td>
</tr>
<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> spaceCoolingDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> biomassToBioethanolUnit</strong>
</td>
</tr>
<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> residentialElectricityDemand</strong>
+ <i>Public Decimal</i><br /><strong> biomassToBiogas</strong>
</td>
</tr>
<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> residentialElectricityDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> biomassToBiogasUnit</strong>
</td>
</tr>
<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> electricityPotentialFromPVBuildings</strong>
+ <i>Public Decimal</i><br /><strong> biomassToElectricityPotential</strong>
</td>
</tr>
<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> electricityPotentialFromPVBuildingsUnit</strong>
+ <i>Public CharacterString</i><br /><strong> biomassToElectricityPotentialUnit</strong>
</td>
</tr>
<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public <a href="EA9.htm">vegetationCoverCategoryValues</a></i><br /><strong> vegetationCoverCategory</strong>
+ <i>Public Decimal</i><br /><strong> biomassToEnergyWoods</strong>
</td>
</tr>
<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassPrimaryEnergyPotential</strong>
+ <i>Public CharacterString</i><br /><strong> biomassToEnergyWoodsUnit</strong>
</td>
</tr>
<tr>
@@ -589,7 +589,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassPrimaryEnergyPotentialUnit</strong>
+ <i>Public Decimal</i><br /><strong> biomassToPlantOil</strong>
</td>
</tr>
<tr>
@@ -637,7 +637,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassToEnergyWoods</strong>
+ <i>Public CharacterString</i><br /><strong> biomassToPlantOilUnit</strong>
</td>
</tr>
<tr>
@@ -685,7 +685,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassToEnergyWoodsUnit</strong>
+ <i>Public Decimal</i><br /><strong> biomassToResidualSolidFuel</strong>
</td>
</tr>
<tr>
@@ -733,7 +733,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassToBiogas</strong>
+ <i>Public CharacterString</i><br /><strong> biomassToResidualSolidFuelUnit</strong>
</td>
</tr>
<tr>
@@ -781,7 +781,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassToBiogasUnit</strong>
+ <i>Public Decimal</i><br /><strong> biomassToSolidFuel</strong>
</td>
</tr>
<tr>
@@ -829,7 +829,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassToPlantOil</strong>
+ <i>Public CharacterString</i><br /><strong> biomassToSolidFuelUnit</strong>
</td>
</tr>
<tr>
@@ -877,7 +877,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassToPlantOilUnit</strong>
+ <i>Public Decimal</i><br /><strong> biomassToThermalPotential</strong>
</td>
</tr>
<tr>
@@ -925,7 +925,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassToBioethanol</strong>
+ <i>Public CharacterString</i><br /><strong> biomassToThermalPotentialUnit</strong>
</td>
</tr>
<tr>
@@ -973,7 +973,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassToBioethanolUnit</strong>
+ <i>Public Decimal</i><br /><strong> electricityPotentialFromPVBuildings</strong>
</td>
</tr>
<tr>
@@ -1021,7 +1021,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassToResidualSolidFuel</strong>
+ <i>Public CharacterString</i><br /><strong> electricityPotentialFromPVBuildingsUnit</strong>
</td>
</tr>
<tr>
@@ -1069,7 +1069,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassToResidualSolidFuelUnit</strong>
+ <i>Public Decimal</i><br /><strong> residentialElectricityDemand</strong>
</td>
</tr>
<tr>
@@ -1117,7 +1117,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassToSolidFuel</strong>
+ <i>Public CharacterString</i><br /><strong> residentialElectricityDemandUnit</strong>
</td>
</tr>
<tr>
@@ -1165,7 +1165,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassToSolidFuelUnit</strong>
+ <i>Public Decimal</i><br /><strong> spaceCoolingDemand</strong>
</td>
</tr>
<tr>
@@ -1213,7 +1213,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassToElectricityPotential</strong>
+ <i>Public CharacterString</i><br /><strong> spaceCoolingDemandUnit</strong>
</td>
</tr>
<tr>
@@ -1261,7 +1261,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassToElectricityPotentialUnit</strong>
+ <i>Public Decimal</i><br /><strong> spaceHeatingDemand</strong>
</td>
</tr>
<tr>
@@ -1309,7 +1309,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassToThermalPotential</strong>
+ <i>Public CharacterString</i><br /><strong> spaceHeatingDemandUnit</strong>
</td>
</tr>
<tr>
@@ -1357,7 +1357,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassToThermalPotentialUnit</strong>
+ <i>Public <a href="EA9.htm">vegetationCoverCategoryValues</a></i><br /><strong> vegetationCoverCategory</strong>
</td>
</tr>
<tr>
@@ -1419,7 +1419,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> energySurveyProperty<br />
+ <strong>Name:</strong> energySurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA5.htm b/public/FWELanduse/v2.1/UML/EARoot/EA5.htm
index 2f72a02578dbb96d3c6ed7c56dea6b9ddf7317c9..d7b793d5efabd447f18c0292f5b171dd39653a1c 100644
--- a/public/FWELanduse/v2.1/UML/EARoot/EA5.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA5.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">05/01/2021 17:39:38</td>
+ <td width="85%" class="ObjectDetailsValue">1/5/2021 5:39:38 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">05/01/2021 17:40:01</td>
+ <td class="ObjectDetailsValue">1/5/2021 5:40:01 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA6.htm b/public/FWELanduse/v2.1/UML/EARoot/EA6.htm
index 142ba921f555f6375c9da34f1106b74763949906..281769567a28bc175d0d060605e683465fccd438 100644
--- a/public/FWELanduse/v2.1/UML/EARoot/EA6.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA6.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 18:52:19</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 6:52:19 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 18:53:15</td>
+ <td class="ObjectDetailsValue">5/12/2020 6:53:15 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodDemand</strong>
+ <i>Public Decimal</i><br /><strong> foodConsumption</strong>
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodConsumptionUnit</strong>
</td>
</tr>
<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProduction</strong>
+ <i>Public Decimal</i><br /><strong> foodDemand</strong>
</td>
</tr>
<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodDemandUnit</strong>
</td>
</tr>
<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProductionWaterDemand</strong>
+ <i>Public Decimal</i><br /><strong> foodProduction</strong>
</td>
</tr>
<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionWaterDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> foodProductionEnergyDemand</strong>
</td>
</tr>
<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProductionEnergyDemand</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionEngeryDemandUnit</strong>
</td>
</tr>
<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionEngeryDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionUnit</strong>
</td>
</tr>
<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodConsumption</strong>
+ <i>Public Decimal</i><br /><strong> foodProductionWaterDemand</strong>
</td>
</tr>
<tr>
@@ -589,7 +589,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodConsumptionUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -651,7 +651,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> foodSurveyProperties<br />
+ <strong>Name:</strong> foodSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA7.htm b/public/FWELanduse/v2.1/UML/EARoot/EA7.htm
index 238787d5a957371b4a1a379745df97fb5cfff658..deb498264164ab5480a7630f96642463880dfd1a 100644
--- a/public/FWELanduse/v2.1/UML/EARoot/EA7.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA7.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 18:03:57</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 6:03:57 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 18:20:37</td>
+ <td class="ObjectDetailsValue">5/12/2020 6:20:37 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -98,7 +98,7 @@ function nameClassifier(name, separator)
<div class="TableGroup" id="TableGroup">
<ul class="ItemTitle">
<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
- <li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
+ <li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
</ul>
<div class="ItemBody" id="AttributesTable">
@@ -108,7 +108,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> surfaceArea</strong>
+ <i>Public CharacterString</i><br /><strong> fweAreaName</strong>
</td>
</tr>
<tr>
@@ -150,13 +150,13 @@ function nameClassifier(name, separator)
</tr>
</table>
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> fweAreaName</strong>
+ <i>Public CharacterString</i><br /><strong> fweSystemName</strong>
</td>
</tr>
<tr>
@@ -198,62 +198,14 @@ function nameClassifier(name, separator)
</tr>
</table>
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-
-
- </td>
- </tr> <tr>
- <td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> fweSystemName</strong>
- </td>
- </tr>
- <tr>
- <td class="TableRowBottomDashed" colspan="1">
- <a href="#" onclick="parent.toggleData('DetailsImageAttributes55')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes55" border="0" />Details:</a>
- <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-
- <tr id="DetailsImageAttributes55_00" style="display: none;">
- <td width="75"><i>Alias:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes55_01" style="display: none;">
- <td width="75"><i>Initial:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes55_02" style="display: none;">
- <td width="75"><i>Stereotype: </i></td>
- <td><<Property>></td>
- </tr>
- <tr id="DetailsImageAttributes55_03" style="display: none;">
- <td width="75"><i>Ordered: </i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes55_04" style="display: none;">
- <td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
- </tr>
- <tr id="DetailsImageAttributes55_05" style="display: none;">
- <td width="75"><i>Transient: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes55_06" style="display: none;">
- <td width="75"><i>Derived: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes55_07" style="display: none;">
- <td width="75"><i>IsID: </i></td>
- <td>False</td>
- </tr>
- </table>
-
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
</td>
</tr>
</table>
</div>
- <div class="ItemBody" id="AssociationsToTable">
+ <div class="ItemBody" id="AssociationsFromTable">
<table border="0" cellspacing="0" cellpadding="0" class="Table">
<tr>
<td width="40%" class="TableHeading">Element</td>
@@ -266,18 +218,18 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> <br />
+ <strong>Name:</strong> consistsOfFWEsurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> landUseSurveyProperties<br />
+ <strong>Name:</strong> <br />
</td>
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink56" onclick="parent.toggleDiv('detailsDIVLink56','DetailsImageLink56')" />Details:
- <div id="detailsDIVLink56" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink55" onclick="parent.toggleDiv('detailsDIVLink55','DetailsImageLink55')" />Details:
+ <div id="detailsDIVLink55" class="DetailsDiv" >
</div>
</div>
@@ -295,6 +247,13 @@ function nameClassifier(name, separator)
<td width="10%" class="TableHeading">Direction</td>
<td width="40%" class="TableHeading">Notes</td>
</tr>
+ <tr>
+ <td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» LandUseSurvey</a></td>
+ <td width="10%" class="TableRow" valign="top">Class</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">From</td>
+ <td width="40%" class="TableRow" valign="top"> </td>
+ </tr>
<tr>
<td width="30%" class="TableRow" valign="top">LandUse</td>
<td width="10%" class="TableRow" valign="top">Class</td>
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA8.htm b/public/FWELanduse/v2.1/UML/EARoot/EA8.htm
index a5c33d33c6a7c35b9f41a30d957444ba5d75986b..850b0c947f7cf31710e2a6e604a52faf56a38a79 100644
--- a/public/FWELanduse/v2.1/UML/EARoot/EA8.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA8.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 18:41:39</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 6:41:39 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">12/05/2020 18:41:54</td>
+ <td class="ObjectDetailsValue">5/12/2020 6:41:54 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -98,6 +98,7 @@ function nameClassifier(name, separator)
<div class="TableGroup" id="TableGroup">
<ul class="ItemTitle">
<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
+ <li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
<li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
<li onClick="parent.toggleItem('TaggedVal');" id="TaggedValTitle">Tagged Values</li>
<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
@@ -109,7 +110,55 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Integer</i><br /><strong> surveyYear</strong>
+ <i>Public Area</i><br /><strong> buildingFootprintArea</strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="1">
+ <a href="#" onclick="parent.toggleData('DetailsImageAttributes56')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes56" border="0" />Details:</a>
+ <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+
+ <tr id="DetailsImageAttributes56_00" style="display: none;">
+ <td width="75"><i>Alias:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes56_01" style="display: none;">
+ <td width="75"><i>Initial:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes56_02" style="display: none;">
+ <td width="75"><i>Stereotype: </i></td>
+ <td><<Property>></td>
+ </tr>
+ <tr id="DetailsImageAttributes56_03" style="display: none;">
+ <td width="75"><i>Ordered: </i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes56_04" style="display: none;">
+ <td width="75"><i>Range: </i></td>
+ <td>Range:0 to 1</td>
+ </tr>
+ <tr id="DetailsImageAttributes56_05" style="display: none;">
+ <td width="75"><i>Transient: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes56_06" style="display: none;">
+ <td width="75"><i>Derived: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes56_07" style="display: none;">
+ <td width="75"><i>IsID: </i></td>
+ <td>False</td>
+ </tr>
+ </table>
+
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+
+
+ </td>
+ </tr> <tr>
+ <td width="100%" class="TableRow">
+ <i>Public Integer</i><br /><strong> population</strong>
</td>
</tr>
<tr>
@@ -157,7 +206,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> surveyYearVersion</strong>
+ <i>Public Area</i><br /><strong> surfaceArea</strong>
</td>
</tr>
<tr>
@@ -183,7 +232,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes58_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to *</td>
+ <td>Range:0 to 1</td>
</tr>
<tr id="DetailsImageAttributes58_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -253,7 +302,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Integer</i><br /><strong> population</strong>
+ <i>Public Integer</i><br /><strong> surveyYear</strong>
</td>
</tr>
<tr>
@@ -279,7 +328,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes60_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes60_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -301,7 +350,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> buildingFootprintArea</strong>
+ <i>Public Decimal</i><br /><strong> surveyYearVersion</strong>
</td>
</tr>
<tr>
@@ -327,7 +376,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes61_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes61_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -350,7 +399,7 @@ function nameClassifier(name, separator)
</tr>
</table>
</div>
- <div class="ItemBody" id="AssociationsFromTable">
+ <div class="ItemBody" id="AssociationsToTable">
<table border="0" cellspacing="0" cellpadding="0" class="Table">
<tr>
<td width="40%" class="TableHeading">Element</td>
@@ -359,11 +408,11 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA4.htm">«FeatureType» EnergySurvey</a><br />
+ <a href="EA7.htm">«ADEElement» LandUse</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> energySurveyProperty<br />
+ <strong>Name:</strong> consistsOfFWEsurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -380,13 +429,23 @@ function nameClassifier(name, separator)
</div>
</td>
</tr>
+
+ </table>
+ </div>
+ <div class="ItemBody" id="AssociationsFromTable">
+ <table border="0" cellspacing="0" cellpadding="0" class="Table">
+ <tr>
+ <td width="40%" class="TableHeading">Element</td>
+ <td width="30%" class="TableHeading">Source Role</td>
+ <td width="30%" class="TableHeading">Target Role</td>
+ </tr>
<tr>
<td width="40%" class="TableRow" valign="top">
<a href="EA6.htm">«FeatureType» FoodSurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> foodSurveyProperties<br />
+ <strong>Name:</strong> foodSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -405,11 +464,11 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA10.htm">«FeatureType» WaterSurvey</a><br />
+ <a href="EA4.htm">«FeatureType» EnergySurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> waterSurveyProperty<br />
+ <strong>Name:</strong> energySurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -428,15 +487,15 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA7.htm">«ADEElement» LandUse</a><br />
+ <a href="EA10.htm">«FeatureType» WaterSurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> <br />
+ <strong>Name:</strong> waterSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> landUseSurveyProperties<br />
+ <strong>Name:</strong> <br />
</td>
</tr>
@@ -509,23 +568,23 @@ function nameClassifier(name, separator)
<td width="40%" class="TableHeading">Notes</td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» EnergySurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» FoodSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» FoodSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» EnergySurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA10.htm">«FeatureType» WaterSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» FoodSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
@@ -536,6 +595,13 @@ function nameClassifier(name, separator)
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
+ <tr>
+ <td width="30%" class="TableRow" valign="top"><a href="EA7.htm">«ADEElement» LandUse</a></td>
+ <td width="10%" class="TableRow" valign="top">Class</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">To</td>
+ <td width="40%" class="TableRow" valign="top"> </td>
+ </tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA10.htm">«FeatureType» WaterSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
@@ -544,9 +610,9 @@ function nameClassifier(name, separator)
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» FoodSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA10.htm">«FeatureType» WaterSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
diff --git a/public/FWELanduse/v2.1/UML/EARoot/EA9.htm b/public/FWELanduse/v2.1/UML/EARoot/EA9.htm
index b87e0b0794f24921d6765079ae13650943ce2adf..11b6d96ac8536371c2a01b4c4efb21398a1e69ff 100644
--- a/public/FWELanduse/v2.1/UML/EARoot/EA9.htm
+++ b/public/FWELanduse/v2.1/UML/EARoot/EA9.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">05/01/2021 17:41:08</td>
+ <td width="85%" class="ObjectDetailsValue">1/5/2021 5:41:08 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">05/01/2021 17:41:22</td>
+ <td class="ObjectDetailsValue">1/5/2021 5:41:22 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
diff --git a/public/FWESystem/v2.1/UML/EARoot/EA1.htm b/public/FWESystem/v2.1/UML/EARoot/EA1.htm
index 68d1cd8eb1e74778e36e45c88d1a93b8c059cfd2..bb3e1923404ad7b81f051fea8a194aba7776a31c 100644
--- a/public/FWESystem/v2.1/UML/EARoot/EA1.htm
+++ b/public/FWESystem/v2.1/UML/EARoot/EA1.htm
@@ -36,10 +36,10 @@ function nameClassifier(name, separator)
<img src="EA2.png" usemap="#EA2" border="0" />
<MAP NAME="EA2">
-<area shape="rect" coords="372,369,628,558" href="EA8.htm" target="_self">
-<area shape="rect" coords="694,653,1017,896" href="EA4.htm" target="_self">
-<area shape="rect" coords="337,653,663,897" href="EA9.htm" target="_self">
-<area shape="rect" coords="10,653,306,911" href="EA6.htm" target="_self">
+<area shape="rect" coords="372,369,628,575" href="EA8.htm" target="_self">
+<area shape="rect" coords="694,669,1017,912" href="EA4.htm" target="_self">
+<area shape="rect" coords="337,669,663,913" href="EA9.htm" target="_self">
+<area shape="rect" coords="10,669,306,927" href="EA6.htm" target="_self">
<area shape="rect" coords="372,173,628,276" href="EA7.htm" target="_self">
</MAP>
@@ -47,11 +47,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:20:18</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:20:18 PM</td>
</tr>
<tr>
<td width="15%" class="ObjectDetailsTopic">Modified:</td>
- <td width="85%" class="ObjectDetailsValue">06/01/2021 12:42:08</td>
+ <td width="85%" class="ObjectDetailsValue">1/9/2021 5:32:08 PM</td>
</tr>
<tr style="padding-top: 10px;">
<td width="15%" class="ObjectDetailsTopic"><img src="../images/plus03.gif" align="absmiddle" id="proj" onclick="parent.toggleData(this.id)" />Project:</td>
diff --git a/public/FWESystem/v2.1/UML/EARoot/EA2.png b/public/FWESystem/v2.1/UML/EARoot/EA2.png
index e54258319c0af17fe68e93618e3aefd463dd3db8..ecc939216a8199ba2c84453d9e677283c6b20fd8 100644
Binary files a/public/FWESystem/v2.1/UML/EARoot/EA2.png and b/public/FWESystem/v2.1/UML/EARoot/EA2.png differ
diff --git a/public/FWESystem/v2.1/UML/EARoot/EA3.htm b/public/FWESystem/v2.1/UML/EARoot/EA3.htm
index 06c96b37a84abd0ff769bff91b4a3e9e8a84c292..f5b9326bb8466eea274849ab51456ccbda5c465b 100644
--- a/public/FWESystem/v2.1/UML/EARoot/EA3.htm
+++ b/public/FWESystem/v2.1/UML/EARoot/EA3.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">12/05/2020 13:20:16</td>
+ <td width="85%" class="ObjectDetailsValue">5/12/2020 1:20:16 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">04/01/2021 17:46:25</td>
+ <td class="ObjectDetailsValue">1/4/2021 5:46:25 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
diff --git a/public/FWESystem/v2.1/UML/EARoot/EA4.htm b/public/FWESystem/v2.1/UML/EARoot/EA4.htm
index 39d8c2440db724d359c68853dc48fe6c06424e3f..9ead973391b82613097ae87e8de4689db9142605 100644
--- a/public/FWESystem/v2.1/UML/EARoot/EA4.htm
+++ b/public/FWESystem/v2.1/UML/EARoot/EA4.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">13/05/2020 17:52:04</td>
+ <td width="85%" class="ObjectDetailsValue">5/13/2020 5:52:04 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">13/05/2020 17:52:10</td>
+ <td class="ObjectDetailsValue">5/13/2020 5:52:10 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -109,7 +109,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> spaceHeatingDemand</strong>
+ <i>Public Decimal</i><br /><strong> biomassElectricityPotential</strong>
</td>
</tr>
<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> spaceHeatingDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> biomassElectricityPotentialUnit</strong>
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> spaceCoolingDemand</strong>
+ <i>Public Decimal</i><br /><strong> biomassPrimaryEnergyPotential</strong>
</td>
</tr>
<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> spaceCoolingDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> biomassPrimaryEnergyPotentialUnit</strong>
</td>
</tr>
<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> residentialElectricityDemand</strong>
+ <i>Public Decimal</i><br /><strong> biomassThermalPotential</strong>
</td>
</tr>
<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> residentialElectricityDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> biomassThermalPotentialUnit</strong>
</td>
</tr>
<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassPrimaryEnergyPotential</strong>
+ <i>Public Decimal</i><br /><strong> residentialElectricityDemand</strong>
</td>
</tr>
<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassPrimaryEnergyPotentialUnit</strong>
+ <i>Public CharacterString</i><br /><strong> residentialElectricityDemandUnit</strong>
</td>
</tr>
<tr>
@@ -589,7 +589,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassElectricityPotential</strong>
+ <i>Public Decimal</i><br /><strong> spaceCoolingDemand</strong>
</td>
</tr>
<tr>
@@ -637,7 +637,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassElectricityPotentialUnit</strong>
+ <i>Public CharacterString</i><br /><strong> spaceCoolingDemandUnit</strong>
</td>
</tr>
<tr>
@@ -685,7 +685,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> biomassThermalPotential</strong>
+ <i>Public Decimal</i><br /><strong> spaceHeatingDemand</strong>
</td>
</tr>
<tr>
@@ -733,7 +733,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> biomassThermalPotentialUnit</strong>
+ <i>Public CharacterString</i><br /><strong> spaceHeatingDemandUnit</strong>
</td>
</tr>
<tr>
@@ -795,7 +795,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> energySurveyProperty<br />
+ <strong>Name:</strong> energySurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -874,14 +874,14 @@ function nameClassifier(name, separator)
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» SystemSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» SystemSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
diff --git a/public/FWESystem/v2.1/UML/EARoot/EA5.htm b/public/FWESystem/v2.1/UML/EARoot/EA5.htm
index ec2e2120df4a8a6e383945471bef602297384fb0..d8bb6b19c25d63e93bcebeee5f7d288778b6d74f 100644
--- a/public/FWESystem/v2.1/UML/EARoot/EA5.htm
+++ b/public/FWESystem/v2.1/UML/EARoot/EA5.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">05/01/2021 22:21:56</td>
+ <td width="85%" class="ObjectDetailsValue">1/5/2021 10:21:56 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">05/01/2021 22:22:08</td>
+ <td class="ObjectDetailsValue">1/5/2021 10:22:08 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
diff --git a/public/FWESystem/v2.1/UML/EARoot/EA6.htm b/public/FWESystem/v2.1/UML/EARoot/EA6.htm
index 81b67dac80294ae64c676ff2393a813dbb674be7..1ecddb41baad2025a0cdcd573aab01cbc228dc25 100644
--- a/public/FWESystem/v2.1/UML/EARoot/EA6.htm
+++ b/public/FWESystem/v2.1/UML/EARoot/EA6.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">13/05/2020 17:51:45</td>
+ <td width="85%" class="ObjectDetailsValue">5/13/2020 5:51:45 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">13/05/2020 17:51:53</td>
+ <td class="ObjectDetailsValue">5/13/2020 5:51:53 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -157,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodDemand</strong>
+ <i>Public Decimal</i><br /><strong> foodConsumption</strong>
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodConsumptionUnit</strong>
</td>
</tr>
<tr>
@@ -253,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodImport</strong>
+ <i>Public Decimal</i><br /><strong> foodDemand</strong>
</td>
</tr>
<tr>
@@ -301,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodImportUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodDemandUnit</strong>
</td>
</tr>
<tr>
@@ -349,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProduction</strong>
+ <i>Public Decimal</i><br /><strong> foodImport</strong>
</td>
</tr>
<tr>
@@ -397,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodImportUnit</strong>
</td>
</tr>
<tr>
@@ -445,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProductionWaterDemand</strong>
+ <i>Public Decimal</i><br /><strong> foodProduction</strong>
</td>
</tr>
<tr>
@@ -493,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionWaterDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> foodProductionEnergyDemand</strong>
</td>
</tr>
<tr>
@@ -541,7 +541,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodProductionEnergyDemand</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionEnergyDemandUnit</strong>
</td>
</tr>
<tr>
@@ -589,7 +589,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodProductionEnergyDemandUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionUnit</strong>
</td>
</tr>
<tr>
@@ -637,7 +637,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> foodConsumption</strong>
+ <i>Public Decimal</i><br /><strong> foodProductionWaterDemand</strong>
</td>
</tr>
<tr>
@@ -685,7 +685,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> foodConsumptionUnit</strong>
+ <i>Public CharacterString</i><br /><strong> foodProductionWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -747,7 +747,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> foodSurveyProperties<br />
+ <strong>Name:</strong> foodSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -826,14 +826,14 @@ function nameClassifier(name, separator)
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» SystemSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
<td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» SystemSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
<td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
diff --git a/public/FWESystem/v2.1/UML/EARoot/EA7.htm b/public/FWESystem/v2.1/UML/EARoot/EA7.htm
index d9135ae3756a82ef6b5d00efcf02d9073ae2e706..0ee6fff349ff9faff267023c01aedf349414d806 100644
--- a/public/FWESystem/v2.1/UML/EARoot/EA7.htm
+++ b/public/FWESystem/v2.1/UML/EARoot/EA7.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">13/05/2020 17:43:46</td>
+ <td width="85%" class="ObjectDetailsValue">5/13/2020 5:43:46 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">13/05/2020 17:43:53</td>
+ <td class="ObjectDetailsValue">5/13/2020 5:43:53 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -99,6 +99,7 @@ function nameClassifier(name, separator)
<ul class="ItemTitle">
<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
<li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
+ <li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
<li onClick="parent.toggleItem('TaggedVal');" id="TaggedValTitle">Tagged Values</li>
<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
</ul>
@@ -109,7 +110,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> surfaceArea</strong>
+ <i>Public CharacterString</i><br /><strong> fweSystemName</strong>
</td>
</tr>
<tr>
@@ -151,55 +152,7 @@ function nameClassifier(name, separator)
</tr>
</table>
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-
-
- </td>
- </tr> <tr>
- <td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> fweSystemName</strong>
- </td>
- </tr>
- <tr>
- <td class="TableRowBottomDashed" colspan="1">
- <a href="#" onclick="parent.toggleData('DetailsImageAttributes43')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes43" border="0" />Details:</a>
- <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-
- <tr id="DetailsImageAttributes43_00" style="display: none;">
- <td width="75"><i>Alias:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes43_01" style="display: none;">
- <td width="75"><i>Initial:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes43_02" style="display: none;">
- <td width="75"><i>Stereotype: </i></td>
- <td><<Property>></td>
- </tr>
- <tr id="DetailsImageAttributes43_03" style="display: none;">
- <td width="75"><i>Ordered: </i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes43_04" style="display: none;">
- <td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
- </tr>
- <tr id="DetailsImageAttributes43_05" style="display: none;">
- <td width="75"><i>Transient: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes43_06" style="display: none;">
- <td width="75"><i>Derived: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes43_07" style="display: none;">
- <td width="75"><i>IsID: </i></td>
- <td>False</td>
- </tr>
- </table>
-
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>maxOccurs=1<br>minOccurs=0<br>
</td>
@@ -215,7 +168,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA8.htm">«FeatureType» SystemSurvey</a><br />
+ «type» GM_MultiSurface<br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
@@ -223,37 +176,47 @@ function nameClassifier(name, separator)
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> systemSurveyProperties<br />
+ <strong>Name:</strong> lod0MultiSurface<br />
</td>
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink44" onclick="parent.toggleDiv('detailsDIVLink44','DetailsImageLink44')" />Details:
- <div id="detailsDIVLink44" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink43" onclick="parent.toggleDiv('detailsDIVLink43','DetailsImageLink43')" />Details:
+ <div id="detailsDIVLink43" class="DetailsDiv" >
</div>
</div>
</td>
</tr>
+
+ </table>
+ </div>
+ <div class="ItemBody" id="AssociationsFromTable">
+ <table border="0" cellspacing="0" cellpadding="0" class="Table">
+ <tr>
+ <td width="40%" class="TableHeading">Element</td>
+ <td width="30%" class="TableHeading">Source Role</td>
+ <td width="30%" class="TableHeading">Target Role</td>
+ </tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- «type» GM_MultiSurface<br />
+ <a href="EA8.htm">«FeatureType» SystemSurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> <br />
+ <strong>Name:</strong> consistsOfFWEsurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> lod0MultiSurface<br />
+ <strong>Name:</strong> <br />
</td>
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink45" onclick="parent.toggleDiv('detailsDIVLink45','DetailsImageLink45')" />Details:
- <div id="detailsDIVLink45" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink44" onclick="parent.toggleDiv('detailsDIVLink44','DetailsImageLink44')" />Details:
+ <div id="detailsDIVLink44" class="DetailsDiv" >
</div>
</div>
@@ -274,8 +237,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario46" onclick="parent.toggleDiv('detailsDIVScenario46','DetailsImageScenario46')" />Details:
- <div id="detailsDIVScenario46" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario45" onclick="parent.toggleDiv('detailsDIVScenario45','DetailsImageScenario45')" />Details:
+ <div id="detailsDIVScenario45" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>
</div>
@@ -287,8 +250,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario47" onclick="parent.toggleDiv('detailsDIVScenario47','DetailsImageScenario47')" />Details:
- <div id="detailsDIVScenario47" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario46" onclick="parent.toggleDiv('detailsDIVScenario46','DetailsImageScenario46')" />Details:
+ <div id="detailsDIVScenario46" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>
</div>
@@ -300,10 +263,22 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario48" onclick="parent.toggleDiv('detailsDIVScenario48','DetailsImageScenario48')" />Details:
- <div id="detailsDIVScenario48" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario47" onclick="parent.toggleDiv('detailsDIVScenario47','DetailsImageScenario47')" />Details:
+ <div id="detailsDIVScenario47" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>
+ </div>
+ </div>
+ </td>
+ </tr> <tr>
+ <td width="50%" class="TableRow" valign="top">topLevel</td>
+ <td width="50%" class="TableRow" valign="top">true</td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="2">
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario48" onclick="parent.toggleDiv('detailsDIVScenario48','DetailsImageScenario48')" />Details:
+ <div id="detailsDIVScenario48" class="DetailsDiv" >
+
</div>
</div>
</td>
@@ -318,6 +293,13 @@ function nameClassifier(name, separator)
<td width="10%" class="TableHeading">Direction</td>
<td width="40%" class="TableHeading">Notes</td>
</tr>
+ <tr>
+ <td width="30%" class="TableRow" valign="top"><a href="EA8.htm">«FeatureType» SystemSurvey</a></td>
+ <td width="10%" class="TableRow" valign="top">Class</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
+ <td width="10%" class="TableRow" valign="top">From</td>
+ <td width="40%" class="TableRow" valign="top"> </td>
+ </tr>
<tr>
<td width="30%" class="TableRow" valign="top">_CityObject</td>
<td width="10%" class="TableRow" valign="top">Class</td>
diff --git a/public/FWESystem/v2.1/UML/EARoot/EA8.htm b/public/FWESystem/v2.1/UML/EARoot/EA8.htm
index 6fe58ed56e7c372d562af8ec3af5c4407c6120c8..bbffec814be7bf1c8a5e710cb01bd1c313b9a2ad 100644
--- a/public/FWESystem/v2.1/UML/EARoot/EA8.htm
+++ b/public/FWESystem/v2.1/UML/EARoot/EA8.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">13/05/2020 17:57:23</td>
+ <td width="85%" class="ObjectDetailsValue">5/13/2020 5:57:23 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">13/05/2020 17:57:32</td>
+ <td class="ObjectDetailsValue">5/13/2020 5:57:32 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -98,6 +98,7 @@ function nameClassifier(name, separator)
<div class="TableGroup" id="TableGroup">
<ul class="ItemTitle">
<li onClick="parent.toggleItem('Attributes');" id="AttributesTitle">Attributes</li>
+ <li onClick="parent.toggleItem('AssociationsTo');" id="AssociationsToTitle">Associations To</li>
<li onClick="parent.toggleItem('AssociationsFrom');" id="AssociationsFromTitle">Associations From</li>
<li onClick="parent.toggleItem('TaggedVal');" id="TaggedValTitle">Tagged Values</li>
<li onClick="parent.toggleItem('Links');" id="LinksTitle">Other Links</li>
@@ -109,7 +110,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Integer</i><br /><strong> surveyYear</strong>
+ <i>Public Area</i><br /><strong> buildingFootprintArea</strong>
</td>
</tr>
<tr>
@@ -157,7 +158,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> surveyYearVersion</strong>
+ <i>Public Area</i><br /><strong> openPlotArea</strong>
</td>
</tr>
<tr>
@@ -183,7 +184,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes50_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to *</td>
+ <td>Range:0 to 1</td>
</tr>
<tr id="DetailsImageAttributes50_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -205,7 +206,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> surveyDescription</strong>
+ <i>Public Integer</i><br /><strong> population</strong>
</td>
</tr>
<tr>
@@ -231,7 +232,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes51_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to *</td>
+ <td>Range:0 to 1</td>
</tr>
<tr id="DetailsImageAttributes51_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -253,7 +254,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Integer</i><br /><strong> population</strong>
+ <i>Public Area</i><br /><strong> settlementArea</strong>
</td>
</tr>
<tr>
@@ -301,7 +302,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> buildingFootprintArea</strong>
+ <i>Public Area</i><br /><strong> surfaceArea</strong>
</td>
</tr>
<tr>
@@ -349,7 +350,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> settlementArea</strong>
+ <i>Public CharacterString</i><br /><strong> surveyDescription</strong>
</td>
</tr>
<tr>
@@ -375,7 +376,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes54_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes54_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -397,7 +398,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> openPlotArea</strong>
+ <i>Public Integer</i><br /><strong> surveyYear</strong>
</td>
</tr>
<tr>
@@ -423,7 +424,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes55_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes55_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -445,7 +446,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> trafficArea</strong>
+ <i>Public Decimal</i><br /><strong> surveyYearVersion</strong>
</td>
</tr>
<tr>
@@ -471,7 +472,7 @@ function nameClassifier(name, separator)
</tr>
<tr id="DetailsImageAttributes56_04" style="display: none;">
<td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
+ <td>Range:0 to *</td>
</tr>
<tr id="DetailsImageAttributes56_05" style="display: none;">
<td width="75"><i>Transient: </i></td>
@@ -493,7 +494,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> vegetationArea</strong>
+ <i>Public Area</i><br /><strong> trafficArea</strong>
</td>
</tr>
<tr>
@@ -541,7 +542,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Area</i><br /><strong> waterBodyArea</strong>
+ <i>Public Area</i><br /><strong> vegetationArea</strong>
</td>
</tr>
<tr>
@@ -586,11 +587,59 @@ function nameClassifier(name, separator)
inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ </td>
+ </tr> <tr>
+ <td width="100%" class="TableRow">
+ <i>Public Area</i><br /><strong> waterBodyArea</strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="1">
+ <a href="#" onclick="parent.toggleData('DetailsImageAttributes59')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes59" border="0" />Details:</a>
+ <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+
+ <tr id="DetailsImageAttributes59_00" style="display: none;">
+ <td width="75"><i>Alias:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes59_01" style="display: none;">
+ <td width="75"><i>Initial:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes59_02" style="display: none;">
+ <td width="75"><i>Stereotype: </i></td>
+ <td><<Property>></td>
+ </tr>
+ <tr id="DetailsImageAttributes59_03" style="display: none;">
+ <td width="75"><i>Ordered: </i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes59_04" style="display: none;">
+ <td width="75"><i>Range: </i></td>
+ <td>Range:0 to 1</td>
+ </tr>
+ <tr id="DetailsImageAttributes59_05" style="display: none;">
+ <td width="75"><i>Transient: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes59_06" style="display: none;">
+ <td width="75"><i>Derived: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes59_07" style="display: none;">
+ <td width="75"><i>IsID: </i></td>
+ <td>False</td>
+ </tr>
+ </table>
+
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+
+
</td>
</tr>
</table>
</div>
- <div class="ItemBody" id="AssociationsFromTable">
+ <div class="ItemBody" id="AssociationsToTable">
<table border="0" cellspacing="0" cellpadding="0" class="Table">
<tr>
<td width="40%" class="TableHeading">Element</td>
@@ -603,30 +652,40 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> <br />
+ <strong>Name:</strong> consistsOfFWEsurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> systemSurveyProperties<br />
+ <strong>Name:</strong> <br />
</td>
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink59" onclick="parent.toggleDiv('detailsDIVLink59','DetailsImageLink59')" />Details:
- <div id="detailsDIVLink59" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink60" onclick="parent.toggleDiv('detailsDIVLink60','DetailsImageLink60')" />Details:
+ <div id="detailsDIVLink60" class="DetailsDiv" >
</div>
</div>
</td>
</tr>
+
+ </table>
+ </div>
+ <div class="ItemBody" id="AssociationsFromTable">
+ <table border="0" cellspacing="0" cellpadding="0" class="Table">
+ <tr>
+ <td width="40%" class="TableHeading">Element</td>
+ <td width="30%" class="TableHeading">Source Role</td>
+ <td width="30%" class="TableHeading">Target Role</td>
+ </tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA9.htm">«FeatureType» WaterSurvey</a><br />
+ <a href="EA6.htm">«FeatureType» FoodSurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> waterSurveyProperty<br />
+ <strong>Name:</strong> foodSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -636,8 +695,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink60" onclick="parent.toggleDiv('detailsDIVLink60','DetailsImageLink60')" />Details:
- <div id="detailsDIVLink60" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink61" onclick="parent.toggleDiv('detailsDIVLink61','DetailsImageLink61')" />Details:
+ <div id="detailsDIVLink61" class="DetailsDiv" >
</div>
</div>
@@ -645,11 +704,11 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA6.htm">«FeatureType» FoodSurvey</a><br />
+ <a href="EA4.htm">«FeatureType» EnergySurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> foodSurveyProperties<br />
+ <strong>Name:</strong> energySurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -659,8 +718,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink61" onclick="parent.toggleDiv('detailsDIVLink61','DetailsImageLink61')" />Details:
- <div id="detailsDIVLink61" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink62" onclick="parent.toggleDiv('detailsDIVLink62','DetailsImageLink62')" />Details:
+ <div id="detailsDIVLink62" class="DetailsDiv" >
</div>
</div>
@@ -668,11 +727,11 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="40%" class="TableRow" valign="top">
- <a href="EA4.htm">«FeatureType» EnergySurvey</a><br />
+ <a href="EA9.htm">«FeatureType» WaterSurvey</a><br />
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> energySurveyProperty<br />
+ <strong>Name:</strong> waterSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -682,8 +741,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink62" onclick="parent.toggleDiv('detailsDIVLink62','DetailsImageLink62')" />Details:
- <div id="detailsDIVLink62" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink63" onclick="parent.toggleDiv('detailsDIVLink63','DetailsImageLink63')" />Details:
+ <div id="detailsDIVLink63" class="DetailsDiv" >
</div>
</div>
@@ -704,8 +763,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario63" onclick="parent.toggleDiv('detailsDIVScenario63','DetailsImageScenario63')" />Details:
- <div id="detailsDIVScenario63" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario64" onclick="parent.toggleDiv('detailsDIVScenario64','DetailsImageScenario64')" />Details:
+ <div id="detailsDIVScenario64" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>
</div>
@@ -717,8 +776,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario64" onclick="parent.toggleDiv('detailsDIVScenario64','DetailsImageScenario64')" />Details:
- <div id="detailsDIVScenario64" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario65" onclick="parent.toggleDiv('detailsDIVScenario65','DetailsImageScenario65')" />Details:
+ <div id="detailsDIVScenario65" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>
</div>
@@ -730,8 +789,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario65" onclick="parent.toggleDiv('detailsDIVScenario65','DetailsImageScenario65')" />Details:
- <div id="detailsDIVScenario65" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario66" onclick="parent.toggleDiv('detailsDIVScenario66','DetailsImageScenario66')" />Details:
+ <div id="detailsDIVScenario66" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>
</div>
@@ -749,9 +808,9 @@ function nameClassifier(name, separator)
<td width="40%" class="TableHeading">Notes</td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» FoodSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
- <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
@@ -763,14 +822,14 @@ function nameClassifier(name, separator)
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA7.htm">«FeatureType» FWESystem</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Strong</td>
- <td width="10%" class="TableRow" valign="top">From</td>
+ <td width="10%" class="TableRow" valign="top">To</td>
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA6.htm">«FeatureType» FoodSurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» EnergySurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
@@ -784,7 +843,14 @@ function nameClassifier(name, separator)
<td width="40%" class="TableRow" valign="top"> </td>
</tr>
<tr>
- <td width="30%" class="TableRow" valign="top"><a href="EA4.htm">«FeatureType» EnergySurvey</a></td>
+ <td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
+ <td width="10%" class="TableRow" valign="top">Class</td>
+ <td width="10%" class="TableRow" valign="top">Generalization</td>
+ <td width="10%" class="TableRow" valign="top">From</td>
+ <td width="40%" class="TableRow" valign="top"> </td>
+ </tr>
+ <tr>
+ <td width="30%" class="TableRow" valign="top"><a href="EA9.htm">«FeatureType» WaterSurvey</a></td>
<td width="10%" class="TableRow" valign="top">Class</td>
<td width="10%" class="TableRow" valign="top">Strong</td>
<td width="10%" class="TableRow" valign="top">From</td>
diff --git a/public/FWESystem/v2.1/UML/EARoot/EA9.htm b/public/FWESystem/v2.1/UML/EARoot/EA9.htm
index aef85e823031ae16b707a88518b62594cdd06ef2..35513dfa3c7e9850cf731e57cb2920267c9e4894 100644
--- a/public/FWESystem/v2.1/UML/EARoot/EA9.htm
+++ b/public/FWESystem/v2.1/UML/EARoot/EA9.htm
@@ -38,11 +38,11 @@ function nameClassifier(name, separator)
<table border="0" cellpadding="0" cellspacing="0" class="ObjectDetails">
<tr>
<td width="15%" class="ObjectDetailsTopic">Created:</td>
- <td width="85%" class="ObjectDetailsValue">13/05/2020 17:51:55</td>
+ <td width="85%" class="ObjectDetailsValue">5/13/2020 5:51:55 PM</td>
</tr>
<tr>
<td class="ObjectDetailsTopic">Modified:</td>
- <td class="ObjectDetailsValue">13/05/2020 17:52:01</td>
+ <td class="ObjectDetailsValue">5/13/2020 5:52:01 PM</td>
</tr>
<tr style="height: 10px"><td colspan="2"></td></tr>
<tr>
@@ -109,55 +109,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticWaterDemand</strong>
- </td>
- </tr>
- <tr>
- <td class="TableRowBottomDashed" colspan="1">
- <a href="#" onclick="parent.toggleData('DetailsImageAttributes66')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes66" border="0" />Details:</a>
- <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
-
- <tr id="DetailsImageAttributes66_00" style="display: none;">
- <td width="75"><i>Alias:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes66_01" style="display: none;">
- <td width="75"><i>Initial:</i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes66_02" style="display: none;">
- <td width="75"><i>Stereotype: </i></td>
- <td><<Property>></td>
- </tr>
- <tr id="DetailsImageAttributes66_03" style="display: none;">
- <td width="75"><i>Ordered: </i></td>
- <td></td>
- </tr>
- <tr id="DetailsImageAttributes66_04" style="display: none;">
- <td width="75"><i>Range: </i></td>
- <td>Range:0 to 1</td>
- </tr>
- <tr id="DetailsImageAttributes66_05" style="display: none;">
- <td width="75"><i>Transient: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes66_06" style="display: none;">
- <td width="75"><i>Derived: </i></td>
- <td>False</td>
- </tr>
- <tr id="DetailsImageAttributes66_07" style="display: none;">
- <td width="75"><i>IsID: </i></td>
- <td>False</td>
- </tr>
- </table>
-
- inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
-
-
- </td>
- </tr> <tr>
- <td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticWaterDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> domesticHotWaterDemand</strong>
</td>
</tr>
<tr>
@@ -205,7 +157,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticHotWaterDemand</strong>
+ <i>Public CharacterString</i><br /><strong> domesticHotWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -253,7 +205,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticHotWaterDemandUnit</strong>
+ <i>Public Decimal</i><br /><strong> domesticSolidWaste</strong>
</td>
</tr>
<tr>
@@ -301,7 +253,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticWaterWaste</strong>
+ <i>Public CharacterString</i><br /><strong> domesticSolidWasteUnit</strong>
</td>
</tr>
<tr>
@@ -349,7 +301,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticWaterWasteUnit</strong>
+ <i>Public Decimal</i><br /><strong> domesticWaterDemand</strong>
</td>
</tr>
<tr>
@@ -397,7 +349,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> domesticSolidWaste</strong>
+ <i>Public CharacterString</i><br /><strong> domesticWaterDemandUnit</strong>
</td>
</tr>
<tr>
@@ -445,7 +397,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> domesticSolidWasteUnit</strong>
+ <i>Public Decimal</i><br /><strong> domesticWaterWaste</strong>
</td>
</tr>
<tr>
@@ -493,7 +445,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public Decimal</i><br /><strong> totalDomesticWaste</strong>
+ <i>Public CharacterString</i><br /><strong> domesticWaterWasteUnit</strong>
</td>
</tr>
<tr>
@@ -541,7 +493,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="100%" class="TableRow">
- <i>Public CharacterString</i><br /><strong> totalDomesticWasteUnit</strong>
+ <i>Public Decimal</i><br /><strong> totalDomesticWaste</strong>
</td>
</tr>
<tr>
@@ -682,6 +634,54 @@ function nameClassifier(name, separator)
inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+ </td>
+ </tr> <tr>
+ <td width="100%" class="TableRow">
+ <i>Public CharacterString</i><br /><strong> totalDomesticWasteUnit</strong>
+ </td>
+ </tr>
+ <tr>
+ <td class="TableRowBottomDashed" colspan="1">
+ <a href="#" onclick="parent.toggleData('DetailsImageAttributes78')" style="text-decoration: none; color: #000000;"><img src="../images/plus03.gif" align="absmiddle" id="DetailsImageAttributes78" border="0" />Details:</a>
+ <table border="0" cellspacing="0" cellpadding="0" class="Table" style="padding: 4px 18px;">
+
+ <tr id="DetailsImageAttributes78_00" style="display: none;">
+ <td width="75"><i>Alias:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes78_01" style="display: none;">
+ <td width="75"><i>Initial:</i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes78_02" style="display: none;">
+ <td width="75"><i>Stereotype: </i></td>
+ <td><<Property>></td>
+ </tr>
+ <tr id="DetailsImageAttributes78_03" style="display: none;">
+ <td width="75"><i>Ordered: </i></td>
+ <td></td>
+ </tr>
+ <tr id="DetailsImageAttributes78_04" style="display: none;">
+ <td width="75"><i>Range: </i></td>
+ <td>Range:0 to 1</td>
+ </tr>
+ <tr id="DetailsImageAttributes78_05" style="display: none;">
+ <td width="75"><i>Transient: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes78_06" style="display: none;">
+ <td width="75"><i>Derived: </i></td>
+ <td>False</td>
+ </tr>
+ <tr id="DetailsImageAttributes78_07" style="display: none;">
+ <td width="75"><i>IsID: </i></td>
+ <td>False</td>
+ </tr>
+ </table>
+
+ inlineOrByReference=inlineOrByReference<br>isMetadata=false<br>
+
+
</td>
</tr>
</table>
@@ -699,7 +699,7 @@ function nameClassifier(name, separator)
Class
</td>
<td width="30%" class="TableRow" valign="top">
- <strong>Name:</strong> waterSurveyProperty<br />
+ <strong>Name:</strong> waterSurvey<br />
</td>
<td width="30%" class="TableRow" valign="top">
@@ -709,8 +709,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="3">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink78" onclick="parent.toggleDiv('detailsDIVLink78','DetailsImageLink78')" />Details:
- <div id="detailsDIVLink78" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageLink79" onclick="parent.toggleDiv('detailsDIVLink79','DetailsImageLink79')" />Details:
+ <div id="detailsDIVLink79" class="DetailsDiv" >
</div>
</div>
@@ -731,8 +731,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario79" onclick="parent.toggleDiv('detailsDIVScenario79','DetailsImageScenario79')" />Details:
- <div id="detailsDIVScenario79" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario80" onclick="parent.toggleDiv('detailsDIVScenario80','DetailsImageScenario80')" />Details:
+ <div id="detailsDIVScenario80" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Create a named complex type ( property type ) that requires the instance to be encoded inline<br /></div>
</div>
@@ -744,8 +744,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario80" onclick="parent.toggleDiv('detailsDIVScenario80','DetailsImageScenario80')" />Details:
- <div id="detailsDIVScenario80" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario81" onclick="parent.toggleDiv('detailsDIVScenario81','DetailsImageScenario81')" />Details:
+ <div id="detailsDIVScenario81" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Identifies the class as a collection<br /></div>
</div>
@@ -757,8 +757,8 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
- <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario81" onclick="parent.toggleDiv('detailsDIVScenario81','DetailsImageScenario81')" />Details:
- <div id="detailsDIVScenario81" class="DetailsDiv" >
+ <div class="DetailsDivParent"><img src="../images/minus03.gif" align="absmiddle" id="DetailsImageScenario82" onclick="parent.toggleDiv('detailsDIVScenario82','DetailsImageScenario82')" />Details:
+ <div id="detailsDIVScenario82" class="DetailsDiv" >
<div class="ObjectDetailsNotes">Values: true,false<br />Default: false<br />Description: Suppress creation of a named complex type ( property type ) that supports inline or byReference encoding<br /></div>
</div>