Fix bad merge, separate segment and conditional road properties

docusaurus/docs/schema/attributes/transportation/roads.mdx

@@ -30,7 +30,7 @@ import ExampleTurnRestriction2Connector1 from '!!raw-loader!@site/docs/_examples
 import ExampleTurnRestriction2Connector2 from '!!raw-loader!@site/docs/_examples/transportation/docusaurus/turn-restriction-02-connector2.yaml';
 
 In the Overture Maps `transportation` theme, a road is any kind of road,
-street or path, including a dedicated path for walking or cycling, but excluding a railway. Road segments comprise the majority of ground-based transportation segments. Roads are modeled using[segment](/schema/reference/transportation/segment) features with the `subtype` property value set to the value `road`.
+street or path, including a dedicated path for walking or cycling, but excluding a railway. Road segments comprise the majority of ground-based transportation segments. Roads are modeled using [segment](/schema/reference/transportation/segment) features with the `subtype` property value set to the value `road`.
 
 ## Geometry and granularity
 
@@ -40,7 +40,7 @@ road being modeled. Road segments support modeling the road network at a range o
 granularities. For example, a single road segment can represent a:
 
 - bidirectional street including all of its lanes and sidewalks.
-- sidewalk by itself. (🚧 Note: the pedestrian model is under construction.)
+- sidewalk by itself.
 - one-way street or one direction of a dual carriageway.
 - single lane or single section of a multi-lane highway.
 - dedicated cycleway.
@@ -79,14 +79,12 @@ The `road_surface` property of a road indicates its physical surface. If
 omitted, a reasonable default value should be assumed based on the
 `class`.
 
-Like many road segment properties, the `road_surface` property supports[geometric scoping](/schema/attributes/scoping-rules#geometric-scoping-linear-referencing)
->>>>>>> ba43714b1e41da1e832b12aaa504a0527dd69d4a
-(linear referencing). Consequently, the effective road surface may vary
+Like many road segment properties, the `road_surface` property supports [geometric scoping](/schema/attributes/scoping-rules#geometric-scoping-linear-referencing) (linear referencing). Consequently, the effective road surface may vary
 along different sub-ranges of a road segment's geometry.
 
 ### Flags
 
-The `road_flags` property of a road is a set of named flag values
+The `road_flags` property of a segment is a set of named flag values
 indicating the presence or absence of simple physical characteristics.
 
 For example, a road segment with

schema/transportation/segment.yaml

@@ -19,21 +19,23 @@ properties:
     unevaluatedProperties: false
     required: [subtype]
     allOf:
+      - title: "Segment Properties"
+        required: [class]
+        properties:
+          class: { "$ref": "#/$defs/propertyDefinitions/roadClass" }
+          access_restrictions: { "$ref": "#/$defs/propertyContainers/accessContainer" }
+          level: { "$ref": "../defs.yaml#/$defs/propertyDefinitions/level" }
+          level_rules: { "$ref": "#/$defs/propertyContainers/levelRulesContainer" }
       - title: "Conditional Properties"
         if: { properties: { subtype: { enum: [road] } } }
         then:
-          required: [class]
           properties:
-            class: { "$ref": "#/$defs/propertyDefinitions/roadClass" }
-            speed_limits: { "$ref": "#/$defs/propertyContainers/speedLimitsContainer" }
-            access_restrictions: { "$ref": "#/$defs/propertyContainers/accessContainer" }
+            lanes: { "$ref": "#/$defs/propertyContainers/lanesContainer" }
             prohibited_transitions: { "$ref": "#/$defs/propertyContainers/prohibitedTransitionsContainer" }
             road_surface: { "$ref": "#/$defs/propertyContainers/surfaceContainer"}
             road_flags: { "$ref": "#/$defs/propertyContainers/flagsContainer" }
+            speed_limits: { "$ref": "#/$defs/propertyContainers/speedLimitsContainer" }
             width_rules: { "$ref": "#/$defs/propertyContainers/widthRulesContainer" }
-            lanes: { "$ref": "#/$defs/propertyContainers/lanesContainer" }
-            level_rules: { "$ref": "#/$defs/propertyContainers/levelRulesContainer" }
-            level: { "$ref": "../defs.yaml#/$defs/propertyDefinitions/level" }
             # The `road` property is deprecated and will be removed in the 2024-07 release
             road: { "$ref": "#/$defs/propertyDefinitions/road" }
       - "$ref": ../defs.yaml#/$defs/propertyContainers/overtureFeaturePropertiesContainer