From fc5fb1b0aaf2399dbe01cb78f5edb03ef32d064d Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Thu, 25 Apr 2024 17:29:33 -0700
Subject: [PATCH 01/13] destinations schema

---
 .../segment/road/bad-road-destinations.yaml   | 49 ++++++++++
 .../road/bad-road-flags-duplicate-flag.json   |  3 +-
 .../bad-road-destinations-bad-label-type.yaml | 29 ++++++
 .../bad-road-destinations-duplicate.yaml      | 31 +++++++
 ...d-road-destinations-empty-label-value.yaml | 29 ++++++
 ...ad-destinations-missing-final_heading.yaml | 28 ++++++
 .../road/destinations/road-destinations.yaml  | 34 +++++++
 .../transportation/segment/road/road.yaml     | 13 +++
 schema/transportation/segment.yaml            | 93 ++++++++++++++++---
 9 files changed, 296 insertions(+), 13 deletions(-)
 create mode 100644 counterexamples/transportation/segment/road/bad-road-destinations.yaml
 create mode 100644 counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
 create mode 100644 counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
 create mode 100644 counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
 create mode 100644 counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
 create mode 100644 examples/transportation/segment/road/destinations/road-destinations.yaml

diff --git a/counterexamples/transportation/segment/road/bad-road-destinations.yaml b/counterexamples/transportation/segment/road/bad-road-destinations.yaml
new file mode 100644
index 00000000..02999d3b
--- /dev/null
+++ b/counterexamples/transportation/segment/road/bad-road-destinations.yaml
@@ -0,0 +1,49 @@
+---
+id: overture:transportation:segment:example:destinations:1
+type: Feature
+geometry:
+  type: LineString
+  coordinates: [[0, 0], [1, 1]]
+properties:
+  theme: transportation
+  type: segment
+  subtype: road
+  class: secondary
+  version: 0
+  update_time: "2024-04-24T00:00:00-00:00"
+  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  destinations:
+    - labels:
+      - value: Seattle
+        type: place
+      - value: Seattle
+        type: place
+      - value: Redmond
+      - value: 
+        foo: bar
+        type: place
+      - value: Bellevue
+        type: other
+      - value: Main Street
+        type: street
+      - value: I90
+        type: route
+      symbols:
+      - airport
+      from:
+      - segment_id: overture:transportation:segment:234
+      - segment_id: overture:transportation:segment:567
+        connector_id: overture:transportation:connector:567
+        foo: bar
+        when:
+          heading: forward
+      to_connector_id: overture:transportation:connector:123
+      final_heading: backward
+    - labels:
+      - value: Kirkland
+        type: place
+      from:
+      - segment_id: overture:transportation:segment:567
+        connector_id: overture:transportation:connector:567
+  ext_expected_errors:
+    - "[I#/properties/destinations/0/label] items at index 0 and 1 are equal"
diff --git a/counterexamples/transportation/segment/road/bad-road-flags-duplicate-flag.json b/counterexamples/transportation/segment/road/bad-road-flags-duplicate-flag.json
index fbbab7fd..a3b7e51b 100644
--- a/counterexamples/transportation/segment/road/bad-road-flags-duplicate-flag.json
+++ b/counterexamples/transportation/segment/road/bad-road-flags-duplicate-flag.json
@@ -12,13 +12,12 @@
     "theme": "transportation",
     "type": "segment",
     "version": 19,
-    "update_time": "2024-03-14T08:05:36-08:00",
     "subtype": "road",
     "class": "primary",
     "road": {
       "flags": [
         {
-          "values": ["is_tunnel", "is_tunnel"]
+          "values": ["is_tunnel"]
         }
       ]
     }
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
new file mode 100644
index 00000000..04e758bd
--- /dev/null
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
@@ -0,0 +1,29 @@
+---
+id: overture:transportation:segment:example:destinations:1
+type: Feature
+geometry:
+  type: LineString
+  coordinates: [[0, 0], [1, 1]]
+properties:
+  theme: transportation
+  type: segment
+  subtype: road
+  class: secondary
+  version: 0
+  update_time: "2024-04-24T00:00:00-00:00"
+  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  destinations:
+    - labels:
+      - value: Seattle
+        type: bad_type
+      symbols:
+      - airport
+      from:
+      - segment_id: overture:transportation:segment:567
+        connector_id: overture:transportation:connector:567
+        when:
+          heading: forward
+      to_connector_id: overture:transportation:connector:123
+      final_heading: backward
+  ext_expected_errors:
+    - "[I#/properties/destinations/0/labels/0/type] [S#/$defs/propertyDefinitions/destinationLabelType/enum] value must be one of"
\ No newline at end of file
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
new file mode 100644
index 00000000..dc767738
--- /dev/null
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
@@ -0,0 +1,31 @@
+---
+id: overture:transportation:segment:example:destinations:1
+type: Feature
+geometry:
+  type: LineString
+  coordinates: [[0, 0], [1, 1]]
+properties:
+  theme: transportation
+  type: segment
+  subtype: road
+  class: secondary
+  version: 0
+  update_time: "2024-04-24T00:00:00-00:00"
+  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  destinations:
+    - labels:
+      - value: Seattle
+        type: place
+      - value: Seattle
+        type: place
+      symbols:
+      - airport
+      from:
+      - segment_id: overture:transportation:segment:567
+        connector_id: overture:transportation:connector:567
+        when:
+          heading: forward
+      to_connector_id: overture:transportation:connector:123
+      final_heading: backward
+  ext_expected_errors:
+    - "[I#/properties/destinations/0/labels] items at index 0 and 1 are equal"
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
new file mode 100644
index 00000000..5812d5f6
--- /dev/null
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
@@ -0,0 +1,29 @@
+---
+id: overture:transportation:segment:example:destinations:1
+type: Feature
+geometry:
+  type: LineString
+  coordinates: [[0, 0], [1, 1]]
+properties:
+  theme: transportation
+  type: segment
+  subtype: road
+  class: secondary
+  version: 0
+  update_time: "2024-04-24T00:00:00-00:00"
+  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  destinations:
+    - labels:
+      - value:
+        type: place
+      symbols:
+      - airport
+      from:
+      - segment_id: overture:transportation:segment:567
+        connector_id: overture:transportation:connector:567
+        when:
+          heading: forward
+      to_connector_id: overture:transportation:connector:123
+      final_heading: backward
+  ext_expected_errors:
+    - "[I#/properties/destinations/0/labels/0/value] [S#/$defs/propertyDefinitions/destinations/items/properties/labels/items/properties/value/type] expected string, but got null"
\ No newline at end of file
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
new file mode 100644
index 00000000..a130494b
--- /dev/null
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
@@ -0,0 +1,28 @@
+---
+id: overture:transportation:segment:example:destinations:1
+type: Feature
+geometry:
+  type: LineString
+  coordinates: [[0, 0], [1, 1]]
+properties:
+  theme: transportation
+  type: segment
+  subtype: road
+  class: secondary
+  version: 0
+  update_time: "2024-04-24T00:00:00-00:00"
+  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  destinations:
+    - labels:
+      - value: Seattle
+        type: place
+      symbols:
+      - airport
+      from:
+      - segment_id: overture:transportation:segment:567
+        connector_id: overture:transportation:connector:567
+        when:
+          heading: forward
+      to_connector_id: overture:transportation:connector:123
+  ext_expected_errors:
+    - "[I#/properties/destinations/0] [S#/$defs/propertyDefinitions/destinations/items/required] missing properties: 'final_heading'"
\ No newline at end of file
diff --git a/examples/transportation/segment/road/destinations/road-destinations.yaml b/examples/transportation/segment/road/destinations/road-destinations.yaml
new file mode 100644
index 00000000..308a4ee5
--- /dev/null
+++ b/examples/transportation/segment/road/destinations/road-destinations.yaml
@@ -0,0 +1,34 @@
+---
+id: overture:transportation:segment:example:destinations:1
+type: Feature
+geometry:
+  type: LineString
+  coordinates: [[0, 0], [1, 1]]
+properties:
+  theme: transportation
+  type: segment
+  subtype: road
+  class: secondary
+  version: 0
+  update_time: "2024-04-24T00:00:00-00:00"
+  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  destinations:
+    - labels:
+      - value: Seattle
+        type: place
+      - value: Main Street
+        type: street
+      - value: I90
+        type: route
+      symbols:
+      - motorway
+      - airport
+      from:
+      - segment_id: overture:transportation:segment:234
+        connector_id: overture:transportation:connector:234
+      - segment_id: overture:transportation:segment:567
+        connector_id: overture:transportation:connector:567
+        when:
+          heading: forward
+      to_connector_id: overture:transportation:connector:123
+      final_heading: backward
diff --git a/examples/transportation/segment/road/road.yaml b/examples/transportation/segment/road/road.yaml
index e5b49b06..680c0f9f 100644
--- a/examples/transportation/segment/road/road.yaml
+++ b/examples/transportation/segment/road/road.yaml
@@ -59,3 +59,16 @@ properties:
               connector_id: overture:transportation:connector:456
           final_heading: backward
           when: {heading: backward}
+  destinations:
+    - labels:
+      - value: Seattle
+        type: place
+      - value: I 90
+        type: route
+      from:
+      - segment_id: overture:transportation:segment:567
+        connector_id: overture:transportation:connector:567
+        when:
+          heading: forward
+      to_connector_id: overture:transportation:connector:123
+      final_heading: backward
\ No newline at end of file
diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml
index 1005aa24..0a990e38 100644
--- a/schema/transportation/segment.yaml
+++ b/schema/transportation/segment.yaml
@@ -19,13 +19,19 @@ properties:
     unevaluatedProperties: false
     required: [subtype]
     allOf:
-      - title: "Conditional Properties"
+      - title: "Conditional Properties for subtype road"
         if: { properties: { subtype: { enum: [road] } } }
         then:
           required: [class]
           properties:
             class: { "$ref": "#/$defs/propertyDefinitions/roadClass" }
             road: { "$ref": "#/$defs/propertyDefinitions/road" }
+            destinations: { "$ref": "#/$defs/propertyDefinitions/destinations" }
+      - title: "Conditional Properties for subtype water"
+        if: { properties: { subtype: { enum: [water] } } }
+        then:
+          properties:
+            destinations: { "$ref": "#/$defs/propertyDefinitions/destinations" }
       - "$ref": ../defs.yaml#/$defs/propertyContainers/overtureFeaturePropertiesContainer
       - "$ref": ../defs.yaml#/$defs/propertyContainers/namesContainer
     properties:
@@ -51,6 +57,71 @@ properties:
         default: []
 "$defs":
   propertyDefinitions:
+    destinationLabelType:
+      description: >-
+        The type of object of the destination label.
+      type: string
+      enum: 
+      - place
+      - street
+      - country 
+      - route
+    destinations:
+      description: >-
+        Information about what destinations can be reached if following this segment. 
+        Includes references to the segments from which it is needed to transition 
+        onto this segment to reach the destinations.
+      type: array
+      items:
+        type: object
+        unevaluatedProperties: false
+        required: [labels, from, to_connector_id, final_heading]
+        properties:
+          labels:
+            description: >-
+              Describes the destination labels on the directions sign.
+            type: array
+            items:
+              type: object
+              unevaluatedProperties: false
+              required: [value, type]
+              properties:
+                value:
+                  description: >-
+                    Names the object that is reached
+                  type: string
+                  pattern: ^(\S.*)?\S$
+                type: { "$ref": "#/$defs/propertyDefinitions/destinationLabelType" }
+            minItems: 1
+            uniqueItems: true
+          symbols:
+            type: array
+            items:
+              description: >-
+                A symbol or icon present on the sign.
+              type: string
+              pattern: ^(\S.*)?\S$
+          from:
+            description: >-
+              List of segments-connector pairs from where we need to transition 
+              to this segment to reach the destination.
+            type: array
+            items:
+              description: Pair of segment and connector IDs along the sequence
+              "$ref": "#/$defs/propertyDefinitions/subSegmentReference"
+              when:
+              allOf:
+                - "$ref": "#/$defs/propertyContainers/headingScopeContainer"
+          to_connector_id:
+            description: >-
+              Identifies the point of physical connection between the
+              previous segment in the sequence and the segment in this
+              sequence entry.
+            type: string                  
+          final_heading:
+            description: >-
+              Direction of travel on this segment needed to reach the destination.
+            "$ref": "#/$defs/propertyDefinitions/heading"    
     roadClass:
       description:
         Captures the kind of road and its position in the road network
@@ -270,12 +341,12 @@ properties:
                     type: array
                     items:
                       description: Pair of segment and connector IDs along the sequence
-                      "$ref": "#/$defs/propertyDefinitions/sequenceEntry"
+                      "$ref": "#/$defs/propertyDefinitions/subSegmentReference"
                     minItems: 1
                     uniqueItems: true
                   final_heading:
                     description: >-
-                      Direction of travel that is prohibited on the destination
+                      Direction of travel that is prohibited on the final
                       segment of the sequence.
                     "$ref": "#/$defs/propertyDefinitions/heading"
                   when:
@@ -455,23 +526,23 @@ properties:
           properties: { is_at_most: { allOf: [ { "$ref": "#/$defs/propertyDefinitions/weightValueWithUnit" } ] } }
         - required: [is_less_than]
           properties: { is_less_than: { allOf: [ { "$ref": "#/$defs/propertyDefinitions/weightValueWithUnit" } ] } }
-    sequenceEntry:
+    subSegmentReference:
       description: >-
-        A segment/connector pair in a prohibited transition sequence.
+        A segment/connector pair used to reference a part of a segment 
+        that can have connections to other segments. 
+        Used in describing prohibited transition sequences and source 
+        segments for destinations.
       type: object
       required: [connector_id, segment_id]
       properties:
         connector_id:
           description: >-
-            Identifies the point of physical connection between the
-            previous segment in the sequence and the segment in this
-            sequence entry.
+            Identifies the point of physical connection between this segment 
+            and other segments.
           type: string
         segment_id:
           description: >-
-            Identifies the segment that the previous segment in the
-            sequence is physically connected to via the sequence entry's
-            connector.
+            Identifies the segment.
           type: string
   propertyContainers:
     headingScopeContainer:

From c7980e738f7b38014bfcfea90ac07ee605cb63c3 Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Mon, 29 Apr 2024 12:54:51 -0700
Subject: [PATCH 02/13] revert accidental change to unrelated counterexample

---
 .../segment/road/bad-road-flags-duplicate-flag.json            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/counterexamples/transportation/segment/road/bad-road-flags-duplicate-flag.json b/counterexamples/transportation/segment/road/bad-road-flags-duplicate-flag.json
index a3b7e51b..fbbab7fd 100644
--- a/counterexamples/transportation/segment/road/bad-road-flags-duplicate-flag.json
+++ b/counterexamples/transportation/segment/road/bad-road-flags-duplicate-flag.json
@@ -12,12 +12,13 @@
     "theme": "transportation",
     "type": "segment",
     "version": 19,
+    "update_time": "2024-03-14T08:05:36-08:00",
     "subtype": "road",
     "class": "primary",
     "road": {
       "flags": [
         {
-          "values": ["is_tunnel"]
+          "values": ["is_tunnel", "is_tunnel"]
         }
       ]
     }

From 139f361c92784090fd34ab1c5fe98b4bb98cc91d Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Thu, 2 May 2024 09:18:36 -0700
Subject: [PATCH 03/13] add eols

---
 .../road/destinations/bad-road-destinations-bad-label-type.yaml | 2 +-
 .../destinations/bad-road-destinations-empty-label-value.yaml   | 2 +-
 .../bad-road-destinations-missing-final_heading.yaml            | 2 +-
 examples/transportation/segment/road/road.yaml                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
index 04e758bd..5fe7a7d6 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
@@ -26,4 +26,4 @@ properties:
       to_connector_id: overture:transportation:connector:123
       final_heading: backward
   ext_expected_errors:
-    - "[I#/properties/destinations/0/labels/0/type] [S#/$defs/propertyDefinitions/destinationLabelType/enum] value must be one of"
\ No newline at end of file
+    - "[I#/properties/destinations/0/labels/0/type] [S#/$defs/propertyDefinitions/destinationLabelType/enum] value must be one of"
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
index 5812d5f6..f9d733aa 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
@@ -26,4 +26,4 @@ properties:
       to_connector_id: overture:transportation:connector:123
       final_heading: backward
   ext_expected_errors:
-    - "[I#/properties/destinations/0/labels/0/value] [S#/$defs/propertyDefinitions/destinations/items/properties/labels/items/properties/value/type] expected string, but got null"
\ No newline at end of file
+    - "[I#/properties/destinations/0/labels/0/value] [S#/$defs/propertyDefinitions/destinations/items/properties/labels/items/properties/value/type] expected string, but got null"
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
index a130494b..19db2c94 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
@@ -25,4 +25,4 @@ properties:
           heading: forward
       to_connector_id: overture:transportation:connector:123
   ext_expected_errors:
-    - "[I#/properties/destinations/0] [S#/$defs/propertyDefinitions/destinations/items/required] missing properties: 'final_heading'"
\ No newline at end of file
+    - "[I#/properties/destinations/0] [S#/$defs/propertyDefinitions/destinations/items/required] missing properties: 'final_heading'"
diff --git a/examples/transportation/segment/road/road.yaml b/examples/transportation/segment/road/road.yaml
index 680c0f9f..557101fb 100644
--- a/examples/transportation/segment/road/road.yaml
+++ b/examples/transportation/segment/road/road.yaml
@@ -71,4 +71,4 @@ properties:
         when:
           heading: forward
       to_connector_id: overture:transportation:connector:123
-      final_heading: backward
\ No newline at end of file
+      final_heading: backward

From e9f138c16c4bd48a9821785c5660c197a2c52179 Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Mon, 8 Jul 2024 18:05:07 -0700
Subject: [PATCH 04/13] refactor destination schema proposal to model the data
 on the 'from' segment instead of the 'to'.

---
 .../road/destinations/road-destinations.yaml  |  34 +++---
 schema/transportation/segment.yaml            | 103 ++++++++++++------
 2 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/examples/transportation/segment/road/destinations/road-destinations.yaml b/examples/transportation/segment/road/destinations/road-destinations.yaml
index 308a4ee5..53c54435 100644
--- a/examples/transportation/segment/road/destinations/road-destinations.yaml
+++ b/examples/transportation/segment/road/destinations/road-destinations.yaml
@@ -13,22 +13,30 @@ properties:
   update_time: "2024-04-24T00:00:00-00:00"
   connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
   destinations:
-    - labels:
+    - when:
+        heading: forward
+      from_connector_id: overture:transportation:connector:123
+      to_connector_id: overture:transportation:connector:123
+      to_segment_id: overture:transportation:segment:567
+      final_heading: backward
+      labels:
       - value: Seattle
-        type: place
+        type: unknown
       - value: Main Street
         type: street
       - value: I90
-        type: route
-      symbols:
-      - motorway
-      - airport
-      from:
-      - segment_id: overture:transportation:segment:234
-        connector_id: overture:transportation:connector:234
-      - segment_id: overture:transportation:segment:567
-        connector_id: overture:transportation:connector:567
-        when:
-          heading: forward
+        type: route_ref
+        symbols:
+        - motorway
+        - airport  
+    - when:
+        heading: backward
+      from_connector_id: overture:transportation:connector:123
       to_connector_id: overture:transportation:connector:123
+      to_segment_id: overture:transportation:segment:567
       final_heading: backward
+      labels:
+      - value: Redmond
+        type: unknown
+      - value: I5
+        type: toward_route_ref
diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml
index 0a990e38..6a697568 100644
--- a/schema/transportation/segment.yaml
+++ b/schema/transportation/segment.yaml
@@ -62,10 +62,11 @@ properties:
         The type of object of the destination label.
       type: string
       enum: 
-      - place
       - street
       - country 
-      - route
+      - route_ref
+      - toward_route_ref
+      - unknown
     destinations:
       description: >-
         Information about what destinations can be reached if following this segment. 
@@ -75,7 +76,7 @@ properties:
       items:
         type: object
         unevaluatedProperties: false
-        required: [labels, from, to_connector_id, final_heading]
+        required: [labels, from_connector_id, to_connector_id, to_segment_id, final_heading]
         properties:
           labels:
             description: >-
@@ -92,35 +93,42 @@ properties:
                   type: string
                   pattern: ^(\S.*)?\S$
                 type: { "$ref": "#/$defs/propertyDefinitions/destinationLabelType" }
+                symbols:
+                  description: >-
+                    A collection of symbols or icons present on the sign next to current 
+                    destination label.
+                  type: array
+                  items:
+                  type: array
+                  items: { "$ref": "#/$defs/propertyDefinitions/destinationSignSymbol" }
+                  uniqueItems: true
+                  minLength: 1
             minItems: 1
             uniqueItems: true
-          symbols:
-            type: array
-            items:
-              description: >-
-                A symbol or icon present on the sign.
-              type: string
-              pattern: ^(\S.*)?\S$
-          from:
+          from_connector_id:
             description: >-
-              List of segments-connector pairs from where we need to transition 
-              to this segment to reach the destination.
-            type: array
-            items:
-              description: Pair of segment and connector IDs along the sequence
-              "$ref": "#/$defs/propertyDefinitions/subSegmentReference"
-              when:
-              allOf:
-                - "$ref": "#/$defs/propertyContainers/headingScopeContainer"
+              Identifies the point of physical connection on this segment before which
+              the destination sign or marking is visible.
+            type: string
+          to_segment_id:
+            description: >-
+              Identifies the segment to transition to reach the destination(s) labeled 
+              on the sign or marking.
+            type: string
           to_connector_id:
             description: >-
-              Identifies the point of physical connection between the
-              previous segment in the sequence and the segment in this
-              sequence entry.
-            type: string                  
+              Identifies the point of physical connection on the segment identified by 
+              'to_segment_id' to transition to for reaching the destination(s).
+            type: string
+          when:
+            allOf:
+              - "$ref": "#/$defs/propertyContainers/headingScopeContainer"
+            minProperties: 1
+            unevaluatedProperties: false
           final_heading:
             description: >-
-              Direction of travel on this segment needed to reach the destination.
+              Direction of travel on the segment identified by 'to_segment_id' that leads 
+              to the destination.
             "$ref": "#/$defs/propertyDefinitions/heading"    
     roadClass:
       description:
@@ -197,6 +205,31 @@ properties:
       enum: [ motor_vehicle, car, truck, motorcycle, foot, bicycle, bus, hgv, hov, emergency ]
       "$comment": >-
         motor_vehicle includes car, truck and motorcycle
+    destinationSignSymbol:
+      description: >-
+        Indicates what special symbol/icon is present on a signpost, visible as road marking or similar.
+      type: string
+      enum: 
+      - motorway
+      - airport
+      - hospital
+      - center           # centre in raw OSM value
+      - industrial
+      - parking
+      - bus
+      - train_station
+      - rest_area
+      - ferry
+      - motorroad
+      - fuel
+      - viewpoint
+      - fuel_diesel
+      - food
+      - lodging
+      - info
+      - camp_site
+      - interchange
+      - toilets          # what's the appropriate US english value for this, restrooms?
     road:
       description: >-
         Properties for segments whose segment subtype is road. The road
@@ -341,12 +374,12 @@ properties:
                     type: array
                     items:
                       description: Pair of segment and connector IDs along the sequence
-                      "$ref": "#/$defs/propertyDefinitions/subSegmentReference"
+                      "$ref": "#/$defs/propertyDefinitions/sequenceEntry"
                     minItems: 1
                     uniqueItems: true
                   final_heading:
                     description: >-
-                      Direction of travel that is prohibited on the final
+                      Direction of travel that is prohibited on the destination
                       segment of the sequence.
                     "$ref": "#/$defs/propertyDefinitions/heading"
                   when:
@@ -526,23 +559,23 @@ properties:
           properties: { is_at_most: { allOf: [ { "$ref": "#/$defs/propertyDefinitions/weightValueWithUnit" } ] } }
         - required: [is_less_than]
           properties: { is_less_than: { allOf: [ { "$ref": "#/$defs/propertyDefinitions/weightValueWithUnit" } ] } }
-    subSegmentReference:
+    sequenceEntry:
       description: >-
-        A segment/connector pair used to reference a part of a segment 
-        that can have connections to other segments. 
-        Used in describing prohibited transition sequences and source 
-        segments for destinations.
+        A segment/connector pair in a prohibited transition sequence.
       type: object
       required: [connector_id, segment_id]
       properties:
         connector_id:
           description: >-
-            Identifies the point of physical connection between this segment 
-            and other segments.
+            Identifies the point of physical connection between the
+            previous segment in the sequence and the segment in this
+            sequence entry.
           type: string
         segment_id:
           description: >-
-            Identifies the segment.
+            Identifies the segment that the previous segment in the
+            sequence is physically connected to via the sequence entry's
+            connector.
           type: string
   propertyContainers:
     headingScopeContainer:

From 9a70923e70ccabbd99d40e78be809960862b5b24 Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Tue, 9 Jul 2024 12:01:51 -0700
Subject: [PATCH 05/13] symbols independent of labels; updates to examples and
 counterexamples

---
 1                                             |  0
 .../bad-road-destinations-bad-label-type.yaml |  9 +++---
 .../bad-road-destinations-duplicate.yaml      | 13 ++++-----
 ...d-road-destinations-empty-label-value.yaml | 11 ++++----
 .../bad-road-destinations-invalid-symbol.yaml | 28 +++++++++++++++++++
 ...ad-destinations-missing-final_heading.yaml | 11 ++++----
 .../road/destinations/road-destinations.yaml  |  6 ++--
 .../transportation/segment/road/road.yaml     | 15 +++++-----
 schema/transportation/segment.yaml            | 20 ++++++-------
 9 files changed, 68 insertions(+), 45 deletions(-)
 create mode 100644 1
 create mode 100644 counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml

diff --git a/1 b/1
new file mode 100644
index 00000000..e69de29b
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
index 5fe7a7d6..ffd9e8c1 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
@@ -18,12 +18,11 @@ properties:
         type: bad_type
       symbols:
       - airport
-      from:
-      - segment_id: overture:transportation:segment:567
-        connector_id: overture:transportation:connector:567
-        when:
-          heading: forward
+      when:
+        heading: forward
+      from_connector_id: overture:transportation:connector:123
       to_connector_id: overture:transportation:connector:123
+      to_segment_id: overture:transportation:segment:567
       final_heading: backward
   ext_expected_errors:
     - "[I#/properties/destinations/0/labels/0/type] [S#/$defs/propertyDefinitions/destinationLabelType/enum] value must be one of"
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
index dc767738..2a9096c8 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
@@ -15,17 +15,16 @@ properties:
   destinations:
     - labels:
       - value: Seattle
-        type: place
+        type: unknown
       - value: Seattle
-        type: place
+        type: unknown
       symbols:
       - airport
-      from:
-      - segment_id: overture:transportation:segment:567
-        connector_id: overture:transportation:connector:567
-        when:
-          heading: forward
+      when:
+        heading: forward
+      from_connector_id: overture:transportation:connector:123
       to_connector_id: overture:transportation:connector:123
+      to_segment_id: overture:transportation:segment:567
       final_heading: backward
   ext_expected_errors:
     - "[I#/properties/destinations/0/labels] items at index 0 and 1 are equal"
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
index f9d733aa..762d79fe 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
@@ -15,15 +15,14 @@ properties:
   destinations:
     - labels:
       - value:
-        type: place
+        type: unknown
       symbols:
       - airport
-      from:
-      - segment_id: overture:transportation:segment:567
-        connector_id: overture:transportation:connector:567
-        when:
-          heading: forward
+      when:
+        heading: forward
+      from_connector_id: overture:transportation:connector:123
       to_connector_id: overture:transportation:connector:123
+      to_segment_id: overture:transportation:segment:567
       final_heading: backward
   ext_expected_errors:
     - "[I#/properties/destinations/0/labels/0/value] [S#/$defs/propertyDefinitions/destinations/items/properties/labels/items/properties/value/type] expected string, but got null"
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml
new file mode 100644
index 00000000..d7c3c7c6
--- /dev/null
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml
@@ -0,0 +1,28 @@
+---
+id: overture:transportation:segment:example:destinations:1
+type: Feature
+geometry:
+  type: LineString
+  coordinates: [[0, 0], [1, 1]]
+properties:
+  theme: transportation
+  type: segment
+  subtype: road
+  class: secondary
+  version: 0
+  update_time: "2024-04-24T00:00:00-00:00"
+  connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
+  destinations:
+    - labels:
+      - value: Seattle
+        type: unknown
+      symbols:
+      - bad_symbol
+      when:
+        heading: forward
+      from_connector_id: overture:transportation:connector:123
+      to_connector_id: overture:transportation:connector:123
+      to_segment_id: overture:transportation:segment:567
+      final_heading: backward
+  ext_expected_errors:
+    - "[I#/properties/destinations/0] [S#/$defs/propertyDefinitions/destinationSignSymbol/enum] value must be one of ..."
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
index 19db2c94..98f70820 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
@@ -15,14 +15,13 @@ properties:
   destinations:
     - labels:
       - value: Seattle
-        type: place
+        type: unknown
       symbols:
       - airport
-      from:
-      - segment_id: overture:transportation:segment:567
-        connector_id: overture:transportation:connector:567
-        when:
-          heading: forward
+      when:
+        heading: forward
+      from_connector_id: overture:transportation:connector:123
       to_connector_id: overture:transportation:connector:123
+      to_segment_id: overture:transportation:segment:567
   ext_expected_errors:
     - "[I#/properties/destinations/0] [S#/$defs/propertyDefinitions/destinations/items/required] missing properties: 'final_heading'"
diff --git a/examples/transportation/segment/road/destinations/road-destinations.yaml b/examples/transportation/segment/road/destinations/road-destinations.yaml
index 53c54435..5fd6a155 100644
--- a/examples/transportation/segment/road/destinations/road-destinations.yaml
+++ b/examples/transportation/segment/road/destinations/road-destinations.yaml
@@ -26,9 +26,9 @@ properties:
         type: street
       - value: I90
         type: route_ref
-        symbols:
-        - motorway
-        - airport  
+      symbols:
+      - motorway
+      - airport  
     - when:
         heading: backward
       from_connector_id: overture:transportation:connector:123
diff --git a/examples/transportation/segment/road/road.yaml b/examples/transportation/segment/road/road.yaml
index 557101fb..68bdc9a3 100644
--- a/examples/transportation/segment/road/road.yaml
+++ b/examples/transportation/segment/road/road.yaml
@@ -62,13 +62,14 @@ properties:
   destinations:
     - labels:
       - value: Seattle
-        type: place
+        type: unknown
       - value: I 90
-        type: route
-      from:
-      - segment_id: overture:transportation:segment:567
-        connector_id: overture:transportation:connector:567
-        when:
-          heading: forward
+        type: route_ref
+      symbols:
+      - airport
+      when:
+        heading: forward
+      from_connector_id: overture:transportation:connector:123
       to_connector_id: overture:transportation:connector:123
+      to_segment_id: overture:transportation:segment:567
       final_heading: backward
diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml
index 6a697568..25d37028 100644
--- a/schema/transportation/segment.yaml
+++ b/schema/transportation/segment.yaml
@@ -93,19 +93,17 @@ properties:
                   type: string
                   pattern: ^(\S.*)?\S$
                 type: { "$ref": "#/$defs/propertyDefinitions/destinationLabelType" }
-                symbols:
-                  description: >-
-                    A collection of symbols or icons present on the sign next to current 
-                    destination label.
-                  type: array
-                  items:
-                  type: array
-                  items: { "$ref": "#/$defs/propertyDefinitions/destinationSignSymbol" }
-                  uniqueItems: true
-                  minLength: 1
             minItems: 1
             uniqueItems: true
-          from_connector_id:
+          symbols:
+            description: >-
+              A collection of symbols or icons present on the sign next to current 
+              destination label.
+            type: array
+            items: { "$ref": "#/$defs/propertyDefinitions/destinationSignSymbol" }
+            uniqueItems: true
+            minLength: 1            
+          from_connector_id:          
             description: >-
               Identifies the point of physical connection on this segment before which
               the destination sign or marking is visible.

From f3543c147f9f09fb36638a7f380079921aa1d655 Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Tue, 9 Jul 2024 12:13:49 -0700
Subject: [PATCH 06/13] update descriptions

---
 schema/transportation/segment.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml
index 25d37028..7a563345 100644
--- a/schema/transportation/segment.yaml
+++ b/schema/transportation/segment.yaml
@@ -69,9 +69,10 @@ properties:
       - unknown
     destinations:
       description: >-
-        Information about what destinations can be reached if following this segment. 
-        Includes references to the segments from which it is needed to transition 
-        onto this segment to reach the destinations.
+        Describes objects that can be reached by following a transportation segment in the
+        same way those objects are described on signposts or ground writing that a traveller
+        following the segment in would observe in the real world. This allows navigation systems
+        to refer to signs and observable writing that a traveller actually sees.
       type: array
       items:
         type: object
@@ -80,7 +81,7 @@ properties:
         properties:
           labels:
             description: >-
-              Describes the destination labels on the directions sign.
+              Labeled destinations that can be reached by following the segment.
             type: array
             items:
               type: object

From 1e5a8f3c8f87d1d3abbf414c51f53a6f768ba66c Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Thu, 11 Jul 2024 14:22:21 -0700
Subject: [PATCH 07/13] revert road; minor touchoups

---
 schema/transportation/segment.yaml | 168 +----------------------------
 1 file changed, 3 insertions(+), 165 deletions(-)

diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml
index c2471b0b..957e197a 100644
--- a/schema/transportation/segment.yaml
+++ b/schema/transportation/segment.yaml
@@ -77,7 +77,7 @@ properties:
       description: >-
         Describes objects that can be reached by following a transportation segment in the
         same way those objects are described on signposts or ground writing that a traveller
-        following the segment in would observe in the real world. This allows navigation systems
+        following the segment would observe in the real world. This allows navigation systems
         to refer to signs and observable writing that a traveller actually sees.
       type: array
       items:
@@ -218,7 +218,7 @@ properties:
       - motorway
       - airport
       - hospital
-      - center           # centre in raw OSM value
+      - center           # center of a locality, city center or downtown, from centre in raw OSM value
       - industrial
       - parking
       - bus
@@ -234,169 +234,7 @@ properties:
       - info
       - camp_site
       - interchange
-      - toilets          # what's the appropriate US english value for this, restrooms?
-    road:
-      description: >-
-        Properties for segments whose segment subtype is road. The road
-        subtype includes any variety of road, street, or path, including
-        dedicated paths for walking and cycling.
-      type: object
-      unevaluatedProperties: false
-      default: {}
-      properties:
-        surface:
-          description: Physical surface of the road. May either be
-            specified as a single global value for the segment, or as
-            an array of surface rules.
-          type: array
-          items:
-            type: object
-            allOf:
-              - { "$ref": "../defs.yaml#/$defs/propertyContainers/geometricRangeScopeContainer" }
-            unevaluatedProperties: false
-            properties:
-              value: { "$ref": "#/$defs/propertyDefinitions/roadSurface" }
-          minItems: 1
-          uniqueItems: true
-          "$comment":
-            We should likely restrict the available surface types to
-            the subset of the common OSM surface=* tag values that are
-            useful both for routing and for map tile rendering.
-        flags:
-          description:
-            Set of boolean attributes applicable to roads. May be
-            specified either as a single flag array of flag values, or
-            as an array of flag rules.
-          type: array
-          items:
-            type: object
-            allOf:
-              - { "$ref": "../defs.yaml#/$defs/propertyContainers/geometricRangeScopeContainer" }
-            unevaluatedProperties: false
-            properties:
-              values:
-                type: array
-                items: { "$ref": "#/$defs/propertyDefinitions/roadFlag" }
-                uniqueItems: true
-                minLength: 1
-          uniqueItems: true
-          minLength: 1
-        level:
-          description:
-            Defines the Z-order, i.e. stacking order, of the road
-            segment.
-          type: array
-          items:
-            description:
-              A single level rule defining the Z-order, i.e. stacking
-              order, applicable within a given scope on the road
-              segment.
-            type: object
-            allOf:
-              - { "$ref": "../defs.yaml#/$defs/propertyContainers/geometricRangeScopeContainer" }
-            unevaluatedProperties: false
-            required: [value]
-            properties:
-              value: { "$ref": "../defs.yaml#/$defs/propertyDefinitions/level" }
-        width:
-          description: >-
-            Edge-to-edge width of the road modeled by this segment, in
-            meters.
-
-            Examples: (1) If this segment models a carriageway without
-            sidewalk, this value represents the edge-to-edge width of the
-            carriageway, inclusive of any shoulder. (2) If this segment
-            models a sidewalk by itself, this value represents the
-            edge-to-edge width of the sidewalk. (3) If this segment models a
-            combined sidewalk and carriageway, this value represents the
-            edge-to-edge width inclusive of sidewalk.
-          type: array
-          items:
-            type: object
-            allOf:
-              - { "$ref": "../defs.yaml#/$defs/propertyContainers/geometricRangeScopeContainer" }
-            required: [value]
-            properties:
-              value:
-                type: number
-                exclusiveMinimum: 0
-            unevaluatedProperties: false
-          minItems: 1
-          uniqueItems: true
-        lanes:
-          description: >-
-            List of lane block rules describing the layout of lanes on
-            the road plus lane-related information. The standard rule
-            evaluation algorithm is used to determine which lane block
-            applies at a given place and time along the segment.
-
-            Each lane block contains the list of lanes that make up the
-            block. Lanes in the block are listed from left to right as
-            they would be seen by a person standing on the road segment
-            facing in the direction of the segment's orientation (toward
-            the end).
-          type: array
-          items:
-            type: object
-            unevaluatedProperties: false
-            allOf:
-              - "$ref": "../defs.yaml#/$defs/propertyContainers/geometricRangeScopeContainer"
-            properties:
-              value:
-                type: array
-                items:  { "$ref": "#/$defs/propertyDefinitions/lane" }
-                minItems: 1
-              when:
-                allOf:
-                  - "$ref": "#/$defs/propertyContainers/temporalScopeContainer"
-                minProperties: 1
-                unevaluatedProperties: false
-          minItems: 1
-          uniqueItems: true
-        restrictions:
-          description: Restrictions on how the road may be used
-          type: object
-          unevaluatedProperties: false
-          properties:
-            speed_limits: { "$ref": "#/$defs/propertyContainers/speedLimitsContainer" }
-            access: { "$ref": "#/$defs/propertyContainers/accessContainer" }
-            prohibited_transitions:
-              description: >-
-                Rules preventing transitions from this segment to
-                another segment.
-              type: array
-              items:
-                type: object
-                unevaluatedProperties: false
-                allOf:
-                  - "$ref": "../defs.yaml#/$defs/propertyContainers/geometricRangeScopeContainer"
-                required: [sequence, final_heading]
-                properties:
-                  sequence:
-                    description: >-
-                      Ordered sequence of connector/segment pairs that it is
-                      prohibited to follow from this segment.
-                    type: array
-                    items:
-                      description: Pair of segment and connector IDs along the sequence
-                      "$ref": "#/$defs/propertyDefinitions/sequenceEntry"
-                    minItems: 1
-                    uniqueItems: true
-                  final_heading:
-                    description: >-
-                      Direction of travel that is prohibited on the destination
-                      segment of the sequence.
-                    "$ref": "#/$defs/propertyDefinitions/heading"
-                  when:
-                    allOf:
-                      - "$ref": "#/$defs/propertyContainers/headingScopeContainer"
-                      - "$ref": "#/$defs/propertyContainers/temporalScopeContainer"
-                      - "$ref": "#/$defs/propertyContainers/purposeOfUseScopeContainer"
-                      - "$ref": "#/$defs/propertyContainers/recognizedStatusScopeContainer"
-                      - "$ref": "#/$defs/propertyContainers/travelModeScopeContainer"
-                      - "$ref": "#/$defs/propertyContainers/vehicleScopeContainer"
-                    minProperties: 1
-                    unevaluatedProperties: false
+      - restrooms          # 'toilets' in OSM
     roadFlag:
       description: Simple flags that can be on or off for a road segment
       type: string

From 0d4a9a9796d890e4e404e4ee32573091d4535da5 Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Fri, 19 Jul 2024 10:21:19 -0700
Subject: [PATCH 08/13] either labels or symbols myst be present

---
 schema/defs.yaml                   | 1 +
 schema/transportation/segment.yaml | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/schema/defs.yaml b/schema/defs.yaml
index fc5f17d0..58a425f2 100644
--- a/schema/defs.yaml
+++ b/schema/defs.yaml
@@ -12,6 +12,7 @@ description: Common schema definitions shared by all themes
         represents an entity that is part of GERS.
       minLength: 1
       pattern: ^(\S.*)?\S$    # Leading and trailing whitespace are not allowed.
+      isIdentifierReference: true
     level:
       description: Z-order of the feature where 0 is visual level
       type: integer
diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml
index 957e197a..445ba6ed 100644
--- a/schema/transportation/segment.yaml
+++ b/schema/transportation/segment.yaml
@@ -83,7 +83,10 @@ properties:
       items:
         type: object
         unevaluatedProperties: false
-        required: [labels, from_connector_id, to_connector_id, to_segment_id, final_heading]
+        required: [from_connector_id, to_connector_id, to_segment_id, final_heading]
+        oneOf:
+          - required: [labels]
+          - required: [symbols]
         properties:
           labels:
             description: >-
@@ -218,7 +221,7 @@ properties:
       - motorway
       - airport
       - hospital
-      - center           # center of a locality, city center or downtown, from centre in raw OSM value
+      - center             # center of a locality, city center or downtown, from centre in raw OSM value
       - industrial
       - parking
       - bus
@@ -229,7 +232,7 @@ properties:
       - fuel
       - viewpoint
       - fuel_diesel
-      - food
+      - food               # 'food', 'restaurant' in OSM
       - lodging
       - info
       - camp_site

From c2b68f599bc9a6ba459f19a8eeed550a8d5ec4e1 Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Mon, 22 Jul 2024 14:16:19 -0700
Subject: [PATCH 09/13] either labels or symbols must be present, but both is
 also valid, replace the required oneOf with anyOf

---
 schema/transportation/segment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml
index 445ba6ed..9bff5652 100644
--- a/schema/transportation/segment.yaml
+++ b/schema/transportation/segment.yaml
@@ -84,7 +84,7 @@ properties:
         type: object
         unevaluatedProperties: false
         required: [from_connector_id, to_connector_id, to_segment_id, final_heading]
-        oneOf:
+        anyOf:
           - required: [labels]
           - required: [symbols]
         properties:

From 32fbb35d64f817dbdb3fe66f90e6005764de3ca1 Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Mon, 22 Jul 2024 14:32:05 -0700
Subject: [PATCH 10/13] fix place->unknown; remove deprecated update_time from
 example

---
 .../segment/road/bad-road-destinations.yaml               | 8 ++++----
 .../segment/road/destinations/road-destinations.yaml      | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/counterexamples/transportation/segment/road/bad-road-destinations.yaml b/counterexamples/transportation/segment/road/bad-road-destinations.yaml
index 02999d3b..aa1ad5ec 100644
--- a/counterexamples/transportation/segment/road/bad-road-destinations.yaml
+++ b/counterexamples/transportation/segment/road/bad-road-destinations.yaml
@@ -15,13 +15,13 @@ properties:
   destinations:
     - labels:
       - value: Seattle
-        type: place
+        type: unknown
       - value: Seattle
-        type: place
+        type: unknown
       - value: Redmond
       - value: 
         foo: bar
-        type: place
+        type: unknown
       - value: Bellevue
         type: other
       - value: Main Street
@@ -41,7 +41,7 @@ properties:
       final_heading: backward
     - labels:
       - value: Kirkland
-        type: place
+        type: unknown
       from:
       - segment_id: overture:transportation:segment:567
         connector_id: overture:transportation:connector:567
diff --git a/examples/transportation/segment/road/destinations/road-destinations.yaml b/examples/transportation/segment/road/destinations/road-destinations.yaml
index 5fd6a155..e063ae40 100644
--- a/examples/transportation/segment/road/destinations/road-destinations.yaml
+++ b/examples/transportation/segment/road/destinations/road-destinations.yaml
@@ -10,7 +10,6 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  update_time: "2024-04-24T00:00:00-00:00"
   connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
   destinations:
     - when:

From 8801dc452b5e2927648baaa95015b09c1ddffb0c Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Mon, 22 Jul 2024 14:40:07 -0700
Subject: [PATCH 11/13] remove deprecated update_time from the new
 counterexamples

---
 .../transportation/segment/road/bad-road-destinations.yaml       | 1 -
 .../road/destinations/bad-road-destinations-bad-label-type.yaml  | 1 -
 .../road/destinations/bad-road-destinations-duplicate.yaml       | 1 -
 .../destinations/bad-road-destinations-empty-label-value.yaml    | 1 -
 .../road/destinations/bad-road-destinations-invalid-symbol.yaml  | 1 -
 .../bad-road-destinations-missing-final_heading.yaml             | 1 -
 6 files changed, 6 deletions(-)

diff --git a/counterexamples/transportation/segment/road/bad-road-destinations.yaml b/counterexamples/transportation/segment/road/bad-road-destinations.yaml
index aa1ad5ec..e6a7e66d 100644
--- a/counterexamples/transportation/segment/road/bad-road-destinations.yaml
+++ b/counterexamples/transportation/segment/road/bad-road-destinations.yaml
@@ -10,7 +10,6 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  update_time: "2024-04-24T00:00:00-00:00"
   connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
   destinations:
     - labels:
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
index ffd9e8c1..1873c365 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-bad-label-type.yaml
@@ -10,7 +10,6 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  update_time: "2024-04-24T00:00:00-00:00"
   connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
   destinations:
     - labels:
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
index 2a9096c8..0b731ab4 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-duplicate.yaml
@@ -10,7 +10,6 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  update_time: "2024-04-24T00:00:00-00:00"
   connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
   destinations:
     - labels:
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
index 762d79fe..3e1bd7d7 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-empty-label-value.yaml
@@ -10,7 +10,6 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  update_time: "2024-04-24T00:00:00-00:00"
   connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
   destinations:
     - labels:
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml
index d7c3c7c6..a09e69e3 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-invalid-symbol.yaml
@@ -10,7 +10,6 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  update_time: "2024-04-24T00:00:00-00:00"
   connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
   destinations:
     - labels:
diff --git a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
index 98f70820..336890ce 100644
--- a/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
+++ b/counterexamples/transportation/segment/road/destinations/bad-road-destinations-missing-final_heading.yaml
@@ -10,7 +10,6 @@ properties:
   subtype: road
   class: secondary
   version: 0
-  update_time: "2024-04-24T00:00:00-00:00"
   connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
   destinations:
     - labels:

From 7accd7deb36fccbe5e71a3694ee3621acb3f0122 Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Tue, 23 Jul 2024 11:14:56 -0700
Subject: [PATCH 12/13] revert accidental added property

---
 schema/defs.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/schema/defs.yaml b/schema/defs.yaml
index 58a425f2..fc5f17d0 100644
--- a/schema/defs.yaml
+++ b/schema/defs.yaml
@@ -12,7 +12,6 @@ description: Common schema definitions shared by all themes
         represents an entity that is part of GERS.
       minLength: 1
       pattern: ^(\S.*)?\S$    # Leading and trailing whitespace are not allowed.
-      isIdentifierReference: true
     level:
       description: Z-order of the feature where 0 is visual level
       type: integer

From 4af1cc29722e8f24c363569241403723bd14151f Mon Sep 17 00:00:00 2001
From: ibnt1 <ibantea@microsoft.com>
Date: Wed, 24 Jul 2024 08:44:43 -0700
Subject: [PATCH 13/13] cleanup

---
 1 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 1

diff --git a/1 b/1
deleted file mode 100644
index e69de29b..00000000