Merge branch 'master' into CivilSpatial

.vscode/settings.json

@@ -1,4 +1,9 @@
 {
+  "[xml]": { 
+    "editor.tabSize": 4,
+    "editor.insertSpaces": true, 
+    "editor.detectIndentation": false
+  },
   "cSpell.words": [
     "ASHRAE",
     "CMAP",

Domains/0-Core/BisCore.ecschema.xml

@@ -1510,6 +1510,9 @@
         <BaseClass>ElementUniqueAspect</BaseClass>
         <ECCustomAttributes>
             <ClassHasHandler xmlns="BisCore.01.00.00"/>
+            <Deprecated xmlns="CoreCustomAttributes.01.00.03">
+                <Description>Settings are now stored in the `JsonProperties` attribute of TextAnnotation2d and TextAnnotation3d classes.</Description>
+            </Deprecated>
         </ECCustomAttributes>
         <ECProperty propertyName="TextAnnotation" typeName="binary" displayLabel="Text Annotation" description="Text in Annotations.fb.h flat buffer format">
             <ECCustomAttributes>
@@ -1526,6 +1529,11 @@
     </ECEntityClass>
     <ECRelationshipClass typeName="TextAnnotation2dOwnsTextAnnotationData" strength="embedding" modifier="None">
         <BaseClass>ElementOwnsUniqueAspect</BaseClass>
+        <ECCustomAttributes>
+            <Deprecated xmlns="CoreCustomAttributes.01.00.03">
+                <Description>See deprecation description for TextAnnotationData class.</Description>
+            </Deprecated>
+        </ECCustomAttributes>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
             <Class class="TextAnnotation2d"/>
         </Source>
@@ -1542,6 +1550,11 @@
     </ECEntityClass>
     <ECRelationshipClass typeName="TextAnnotation3dOwnsTextAnnotationData" strength="embedding" modifier="None">
         <BaseClass>ElementOwnsUniqueAspect</BaseClass>
+        <ECCustomAttributes>
+            <Deprecated xmlns="CoreCustomAttributes.01.00.03">
+                <Description>See deprecation description for TextAnnotationData class.</Description>
+            </Deprecated>
+        </ECCustomAttributes>
         <Source multiplicity="(1..1)" roleLabel="owns" polymorphic="true">
             <Class class="TextAnnotation3d"/>
         </Source>
@@ -2155,6 +2168,9 @@
         <BaseClass>DefinitionElement</BaseClass>
         <ECCustomAttributes>
             <ClassHasHandler xmlns="BisCore.01.00.00"/>
+            <Deprecated xmlns="CoreCustomAttributes.01.00.03">
+                <Description>Not modeled with BIS anymore.</Description>
+            </Deprecated>
         </ECCustomAttributes>
         <ECProperty propertyName="Description" typeName="string" description="Description of the style">
             <ECCustomAttributes>

Domains/2-DisciplinePhysical/Civil/RoadRailUnits/RoadRailUnits.ecschema.xml

@@ -24,10 +24,12 @@
     <KindOfQuantity typeName="ELEVATION" displayLabel="Road &amp; Rail Elevation" persistenceUnit="u:M" presentationUnits="f:DefaultRealU(2)[u:M];f:DefaultRealU(2)[u:FT]" relativeError="0.0001"/>
     <KindOfQuantity typeName="FLOW" displayLabel="Road &amp; Rail Flow" persistenceUnit="u:CUB_M_PER_SEC" presentationUnits="f:DefaultRealU(2)[u:CUB_M_PER_SEC];f:DefaultRealU(2)[u:CUB_FT_PER_SEC]" relativeError="0.0001"/>
     <KindOfQuantity typeName="LENGTH" displayLabel="Road &amp; Rail Length" persistenceUnit="u:M" presentationUnits="f:DefaultRealU(2)[u:M];f:DefaultRealU(2)[u:FT];f:DefaultRealU(2)[u:US_SURVEY_FT]" relativeError="0.0001"/>
-    <KindOfQuantity typeName="LENGTH_SHORT" displayLabel="Road &amp; Rail Short Length" persistenceUnit="u:M" presentationUnits="f:DefaultRealU(3)[u:M];f:AmerFI" relativeError="0.0001"/>
+    <KindOfQuantity typeName="LENGTH_SHORT" displayLabel="Road &amp; Rail Short Length" persistenceUnit="u:M" presentationUnits="f:DefaultRealU(1)[u:MM];f:DefaultRealU(1)[u:IN]" relativeError="0.0001"/>
     <KindOfQuantity typeName="SLOPE" displayLabel="Road &amp; Rail Slope" persistenceUnit="u:M_PER_M" presentationUnits="f:DefaultRealU(2)[u:PERCENT_SLOPE]" relativeError="0.0001" />
     <KindOfQuantity typeName="STATION" displayLabel="Road &amp; Rail Station" persistenceUnit="u:M" presentationUnits="f:StationZ_1000_3[u:M];f:StationZ_100_2[u:FT];f:StationZ_100_2[u:US_SURVEY_FT];f:DefaultRealU(2)[u:M];f:DefaultRealU(2)[u:FT];f:DefaultRealU(2)[u:US_SURVEY_FT]" relativeError="0.0001"/>
     <KindOfQuantity typeName="VELOCITY" displayLabel="Road &amp; Rail Velocity" persistenceUnit="u:M_PER_SEC" presentationUnits="f:DefaultRealU(2)[u:KM_PER_HR];f:DefaultRealU(2)[u:MPH]" relativeError="0.0001"/>
     <KindOfQuantity typeName="VOLUME" displayLabel="Road &amp; Rail Volume" persistenceUnit="u:CUB_M" presentationUnits="f:DefaultRealU(2)[u:CUB_M];f:DefaultRealU(2)[u:CUB_FT]" relativeError="0.0001"/>
     <KindOfQuantity typeName="PERCENTAGE" displayLabel="Road &amp; Rail Percentage" persistenceUnit="u:DECIMAL_PERCENT" presentationUnits="f:DefaultRealU(2)[u:PERCENT];f:DefaultRealU(4)[u:DECIMAL_PERCENT]" relativeError="0.0001"/>
+    <KindOfQuantity typeName="SIDE_SLOPE" displayLabel="Road &amp; Rail Side Slope" persistenceUnit="u:M_HORIZONTAL_PER_M_VERTICAL" presentationUnits="f:DefaultRealU(1)[u:HORIZONTAL_PER_VERTICAL]" relativeError="0.0001"/>
+    <KindOfQuantity typeName="INTENSITY_INFILTRATION" displayLabel="Road &amp; Rail Intensity/Infiltration" persistenceUnit="u:M_PER_SEC" presentationUnits="f:DefaultRealU(2)[u:MM_PER_HR];f:DefaultRealU(2)[u:IN_PER_HR]" relativeError="0.0001"/>
 </ECSchema>

Domains/3-DisciplineOther/Hydraulics/SewerHydraulicAnalysis.ecschema.xml

@@ -10,7 +10,7 @@
     <ECSchemaReference name="BisCore" version="01.00.10" alias="bis" />
     <ECSchemaReference name="Analytical" version="01.00.01" alias="anlyt" />
     <ECSchemaReference name="AecUnits" version="01.00.03" alias="AECU"/>
-    <ECSchemaReference name="RoadRailUnits" version="01.00.02" alias="rru"/>
+    <ECSchemaReference name="RoadRailUnits" version="01.00.03" alias="rru"/>
     <ECSchemaReference name="NetworkTopology" version="01.00.01" alias="net"/>
     <ECSchemaReference name="StormSewerPhysical" version="01.00.01" alias="stmswrphys"/>
 
@@ -885,8 +885,8 @@
     <ECEntityClass typeName="TrapezoidalShapeAspect" modifier="Sealed" displayLabel="Trapezoidal">
         <BaseClass>ChannelShapeAspect</BaseClass>
         <ECProperty propertyName="BottomWidth" typeName="double" displayLabel="Bottom Width" category="HydraulicData" kindOfQuantity="rru:LENGTH"/>
-        <ECProperty propertyName="LeftSideSlope" typeName="double" displayLabel="LeftSideSlope" category="HydraulicData" kindOfQuantity="rru:LENGTH"/>
-        <ECProperty propertyName="RightSideSlope" typeName="double" displayLabel="RightSideSlope" category="HydraulicData" kindOfQuantity="rru:LENGTH"/>
+        <ECProperty propertyName="LeftSideSlope" typeName="double" displayLabel="LeftSideSlope" category="HydraulicData" kindOfQuantity="rru:SIDE_SLOPE"/>
+        <ECProperty propertyName="RightSideSlope" typeName="double" displayLabel="RightSideSlope" category="HydraulicData" kindOfQuantity="rru:SIDE_SLOPE"/>
     </ECEntityClass>
 
     <ECEntityClass typeName="Pipe" modifier="Sealed" displayLabel="Pipe">
@@ -1082,8 +1082,8 @@
 
     <ECEntityClass typeName="CatchmentHortonInfiltrationMethodAspect" modifier="Sealed" displayLabel="CatchmentHortonInfiltrationMethodAspect">
         <BaseClass >CatchmentInfiltrationMethodAspect</BaseClass>
-        <ECProperty propertyName="Hortonfc" typeName="double" displayLabel="fc" category="HydraulicData" description="The equilibrium infiltration rate on the Horton infiltration curve reached once the soil becomes saturated."/>
-        <ECProperty propertyName="Hortonfo" typeName="double" displayLabel="fo" category="HydraulicData" description="The initial or maximum infiltration rate on Horton infiltration curve."/>
+        <ECProperty propertyName="Hortonfc" typeName="double" displayLabel="fc" category="HydraulicData" kindOfQuantity="rru:INTENSITY_INFILTRATION" description="The equilibrium infiltration rate on the Horton infiltration curve reached once the soil becomes saturated."/>
+        <ECProperty propertyName="Hortonfo" typeName="double" displayLabel="fo" category="HydraulicData" kindOfQuantity="rru:INTENSITY_INFILTRATION" description="The initial or maximum infiltration rate on Horton infiltration curve."/>
         <ECProperty propertyName="HortonK" typeName="double" displayLabel="K" category="HydraulicData" description="Decay constant associated with the soil."/>
         <ECProperty propertyName="HortonIA" typeName="double" displayLabel="Initial Abstraction" category="HydraulicData" kindOfQuantity="rru:LENGTH_SHORT" description="The initial abstraction accounts for all losses prior to runoff and consists mainly of interception, infiltration, evaporation, and surface depression storage."/>
         <ECProperty propertyName="HortonMaxVolume" typeName="double" displayLabel="Volume (Maximum)" category="HydraulicData" kindOfQuantity="rru:LENGTH_SHORT" description="Maximum infiltration volume possible (0 if not applicable). Can be estimated as the difference between a soil's porosity and its wilting point times the depth of the infiltration zone."/>
@@ -1161,7 +1161,7 @@
 
     <ECStructClass typeName="IDFPoint" description="Point of IDF Curve" modifier="Sealed">
         <ECProperty propertyName="Duration" typeName="double" description="Duration of storm" kindOfQuantity="AECU:TIME" />
-        <ECProperty propertyName="Intensity" typeName="double" description="Intensity at duration" />
+        <ECProperty propertyName="Intensity" typeName="double" kindOfQuantity="rru:INTENSITY_INFILTRATION" description="Intensity at duration" />
     </ECStructClass>
 
     <ECEntityClass typeName="IDFRainfallEventAspect" modifier="Sealed" displayLabel="IDF Curve">

Domains/4-Application/Connectors/ConceptStation/CSPhysical.ecschema.xml

@@ -3,7 +3,7 @@
 |  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 |  * See LICENSE.md in the project root for license terms and full copyright notice.
 ======================================================================================= -->
-<ECSchema schemaName="CSPhysical" alias="csp" version="01.00.01" description="iModel Connector schema capturing application data from ConceptStation." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
+<ECSchema schemaName="CSPhysical" alias="csp" version="01.00.02" description="iModel Connector schema capturing application data from ConceptStation." xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.2">
 
     <ECSchemaReference name="BisCore" version="01.00.14" alias="bis"/>
     <ECSchemaReference name="CoreCustomAttributes" version="01.00.03" alias="CoreCA"/>
@@ -59,6 +59,26 @@
         <BaseClass>ConceptStationPhysicalElement</BaseClass>
     </ECEntityClass>
 
+    <!-- Rail schema definintions -->
+    <ECEntityClass typeName="OLECantilever" modifier="Sealed" displayLabel="OLE Cantilever" description="A physical OLE Cantilever structure.">
+        <BaseClass>ConceptStationPhysicalElement</BaseClass>
+    </ECEntityClass>
+    <ECEntityClass typeName="OLEStructure" modifier="Sealed" displayLabel="OLE Structure" description="A physical OLE Structure.">
+       <BaseClass>ConceptStationPhysicalElement</BaseClass>
+    </ECEntityClass>
+    <ECEntityClass typeName="WireSpan" modifier="Sealed" displayLabel="Wire Span" description="A physical WireSpan structure.">
+       <BaseClass>ConceptStationPhysicalElement</BaseClass>
+    </ECEntityClass>
+    <ECEntityClass typeName="CorridorSegment" modifier="Sealed" displayLabel="Corridor Segment" description="A physical stretch of railway that groups all components across its width.">
+        <BaseClass>SegmentAssembly</BaseClass>
+    </ECEntityClass>
+    <ECEntityClass typeName="TrackSegment" modifier="Sealed" displayLabel="Track Segment" description="A physical stretch of railway that groups all components across its width.">
+        <BaseClass>SegmentAssembly</BaseClass>
+    </ECEntityClass>
+    <ECEntityClass typeName="TurnoutIntersection" modifier="Sealed" displayLabel="Turnout" description="A physical stretch of railway where two or more legs intersect.">
+       <BaseClass>SegmentAssembly</BaseClass>
+    </ECEntityClass>
+
     <ECEntityClass typeName="PayItemQuantityAspect" displayLabel="Pay Item Quantity Aspect" description="A bis:ElementMultiAspect that stores common pay item data for ConceptStation elements.">
         <BaseClass>bis:ElementMultiAspect</BaseClass>
         <ECProperty propertyName="UnitCodeGroupLabel" displayLabel="Category" typeName="string" description="The label of the unit cost group."/>

SchemaInventory.json

@@ -4885,7 +4885,7 @@
       "name": "CSPhysical",
       "path": "Domains\\4-Application\\Connectors\\ConceptStation\\CSPhysical.ecschema.xml",
       "released": false,
-      "version": "01.00.01",
+      "version": "01.00.02",
       "comment": "Working Copy",
       "sha1": "",
       "author": "",