Merge branch 'staging' into main

OvertureMaps · Oct 15, 2024 · f2ed92d · f2ed92d
2 parents 7524b37 + db8126e
commit f2ed92d
Show file tree

Hide file tree

Showing 119 changed files with 228 additions and 356 deletions.
diff --git a/counterexamples/addresses/bad-address-empty-levels.yaml b/counterexamples/addresses/bad-address-empty-levels.yaml
@@ -1,5 +1,5 @@
 ---
-id: overture:addresses:addres:1
+id: overture:addresses:address:1
 type: Feature
 geometry:
   type: Point

diff --git a/counterexamples/addresses/bad-address-too-many-levels.yaml b/counterexamples/addresses/bad-address-too-many-levels.yaml
@@ -1,5 +1,5 @@
 ---
-id: overture:addresses:addres:1
+id: overture:addresses:address:1
 type: Feature
 geometry:
   type: Point

diff --git a/counterexamples/addresses/bad-address-white-space.yaml b/counterexamples/addresses/bad-address-white-space.yaml
@@ -1,5 +1,5 @@
 ---
-id: overture:addresses:addres:1
+id: overture:addresses:address:1
 type: Feature
 geometry:
   type: Point
@@ -15,4 +15,4 @@ properties:
   street: ' COMMONWEALTH AVE'
   number: '1000'
   ext_expected_errors:
-    - "[I#/properties/street] does not match pattern [S#/$defs/propertyDefinitions/id/pattern]"
+    - "' COMMONWEALTH AVE' does not match pattern '^(\\\\S.*)?\\\\S$'"
diff --git a/counterexamples/buildings/bad-class.json b/counterexamples/buildings/bad-class.json
@@ -7,11 +7,11 @@
   },
   "properties": {
     "ext_expected_errors": [
-      "[I#/properties/class] [S#/properties/properties/properties/class/enum] value must be one of"
+      "/properties/properties/properties/class/enum]: value must be one of"
     ],
     "theme": "buildings",
     "type": "building",
     "class": "made-up-class",
-    "version": 0,
+    "version": 0
   }
 }
diff --git a/counterexamples/buildings/bad-confidence-in-source.yaml b/counterexamples/buildings/bad-confidence-in-source.yaml
@@ -6,8 +6,8 @@ geometry:
   coordinates: [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]
 properties:
   ext_expected_errors:
-    - "[I#/properties/sources/0/confidence] [S#/$defs/propertyDefinitions/property/properties/confidence/maximum] must be <= 1 but found 100"
-    - "[I#/properties/sources/1/confidence] [S#/$defs/propertyDefinitions/property/properties/confidence/minimum] must be >= 0 but found -1"
+    - "/property/properties/confidence/maximum]: maximum: got 100, want 1"
+    - "/property/properties/confidence/minimum]: minimum: got -1, want 0"
   theme: buildings
   type: building
   version: 1

diff --git a/counterexamples/buildings/bad-names/bad-common-language.yaml b/counterexamples/buildings/bad-names/bad-common-language.yaml
@@ -5,7 +5,7 @@ geometry:
   type: Polygon
   coordinates: [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]
 properties:
-  ext_expected_errors: ["additionalProperties 'abc123def456' not allowed"]
+  ext_expected_errors: ["additional properties 'abc123def456' not allowed"]
   theme: buildings
   type: building
   version: 1

diff --git a/counterexamples/buildings/bad-names/bad-name-language.yaml b/counterexamples/buildings/bad-names/bad-name-language.yaml
@@ -5,7 +5,7 @@ geometry:
   type: Polygon
   coordinates: [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]
 properties:
-  ext_expected_errors: ["[I#/properties/names/rules/0/language] [S#/$defs/propertyDefinitions/language/pattern] does not match pattern"]
+  ext_expected_errors: ["'ga:genitive' does not match pattern"]
   theme: buildings
   type: building
   version: 1

diff --git a/counterexamples/buildings/bad-names/bad-name-no-primary.yaml b/counterexamples/buildings/bad-names/bad-name-no-primary.yaml
@@ -5,7 +5,7 @@ geometry:
   type: Polygon
   coordinates: [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]
 properties:
-  ext_expected_errors: ["missing properties: 'primary'"]
+  ext_expected_errors: ["missing property 'primary'"]
   theme: buildings
   type: building
   version: 1

diff --git a/counterexamples/buildings/bad-time.yaml b/counterexamples/buildings/bad-time.yaml
@@ -6,8 +6,7 @@ geometry:
   coordinates: [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]
 properties:
   ext_expected_errors:
-    - "[I#/properties/sources/0/update_time] [S#/$defs/propertyDefinitions/featureUpdateTime/format] 'abc2023-02-22T23:55:01-08:00' is not valid 'date-time'"
-    - "[I#/properties/sources/0/update_time] [S#/$defs/propertyDefinitions/featureUpdateTime/pattern] does not match pattern"
+    - "propertyDefinitions/featureUpdateTime/format]: 'abc2023-02-22T23:55:01-08:00' is not valid date-time"
   theme: buildings
   type: building
   version: 1

diff --git a/counterexamples/buildings/negative-height.json b/counterexamples/buildings/negative-height.json
@@ -7,7 +7,7 @@
   },
   "properties": {
     "ext_expected_errors": [
-      "[I#/properties/height] [S#/shapeContainer/properties/height/exclusiveMinimum] must be > 0 but found -1.23"
+      "properties/height/exclusiveMinimum]: exclusiveMinimum: got -1.23, want 0"
     ],
     "theme": "buildings",
     "type": "building",

diff --git a/counterexamples/buildings/negative-num-floors.json b/counterexamples/buildings/negative-num-floors.json
@@ -7,7 +7,7 @@
   },
   "properties": {
     "ext_expected_errors": [
-      "[I#/properties/num_floors] [S#/shapeContainer/properties/num_floors/exclusiveMinimum] must be > 0 but found -3"
+      "shapeContainer/properties/num_floors/exclusiveMinimum]: exclusiveMinimum: got -3, want 0"
     ],
     "theme": "buildings",
     "type": "building",

diff --git a/counterexamples/common/names/names-invalid-language.yaml b/counterexamples/common/names/names-invalid-language.yaml
@@ -19,12 +19,15 @@ properties:
     rules:
       - language: etymology:wikidata
         value: Not allowed to have a colon
+        variant: common
       - language: etymology
         value: Too long
+        variant: alternate
       - language: pronunciation
         value: Too long
+        variant: official
   ext_expected_errors:
-    - "additionalProperties 'zh_pinyin', 'en1', 'ja_rm' not allowed"
-    - "[I#/properties/names/rules/0/language] [S#/$defs/propertyDefinitions/language/pattern] does not match pattern"
-    - "[I#/properties/names/rules/1/language] [S#/$defs/propertyDefinitions/language/pattern] does not match pattern"
-    - "[I#/properties/names/rules/2/language] [S#/$defs/propertyDefinitions/language/pattern] does not match pattern"
+    - "additionalProperties]: additional properties"
+    - "'etymology:wikidata' does not match pattern"
+    - "'etymology' does not match pattern"
+    - "'pronunciation' does not match pattern"
diff --git a/counterexamples/common/names/names-invalid-variant.yaml b/counterexamples/common/names/names-invalid-variant.yaml
@@ -0,0 +1,22 @@
+---
+id: names-invalid-variant
+type: Feature
+geometry:
+  type: LineString
+  coordinates: [[0, 0], [1, 1]]
+properties:
+  theme: transportation
+  type: segment
+  version: 1
+  subtype: road
+  class: primary
+  names:
+    primary: Bar
+    rules:
+      - value: I am missing the variant
+      - language: en-us
+        value: I have a fake/unsupported variant
+        variant: fake-variant
+  ext_expected_errors:
+    - "missing property 'variant'"
+    - "value must be one of 'common', 'official', 'alternate', 'short'"
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-days.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-days.yaml
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-hours.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-hours.yaml
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-miliseconds.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-miliseconds.yaml
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-minutes.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-minutes.yaml
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-months.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-months.yaml
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-seconds.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-seconds.yaml
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-timezone.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-timezone.yaml
diff --git a/counterexamples/common/timestamp/bad-timestamp-no-timezone.yaml b/counterexamples/common/timestamp/bad-timestamp-no-timezone.yaml
diff --git a/counterexamples/common/timestamp/bad-timestamp-yaml-no-quotes.yaml b/counterexamples/common/timestamp/bad-timestamp-yaml-no-quotes.yaml
diff --git a/counterexamples/divisions/boundary/bad-class.yaml b/counterexamples/divisions/boundary/bad-class.yaml
diff --git a/counterexamples/divisions/division/bad-capital-division-id.yaml b/counterexamples/divisions/division/bad-capital-division-id.yaml
@@ -20,4 +20,4 @@ properties:
     driving_side: right
   capital_division_ids: ['    ']
   ext_expected_errors:
-    - "[I#/properties/capital_division_ids] [S#/$defs/propertyDefinitions/id/pattern] does not match pattern"
+    - "'    ' does not match pattern"
diff --git a/counterexamples/divisions/division/bad-country.yaml b/counterexamples/divisions/division/bad-country.yaml
@@ -19,5 +19,5 @@ properties:
   norms:
     driving_side: left
   ext_expected_errors:
-    - "[I#/properties/country] [S#/$defs/propertyDefinitions/iso3166_1Alpha2CountryCode/maxLength] length must be <= 2, but got 3"
-    - "[I#/properties/country] [S#/$defs/propertyDefinitions/iso3166_1Alpha2CountryCode/pattern] does not match pattern"
+    - "maxLength: got 3, want 2"
+    - "'ZZZ' does not match pattern"
diff --git a/counterexamples/divisions/division/bad-geometry-coordinates.yaml b/counterexamples/divisions/division/bad-geometry-coordinates.yaml
@@ -19,4 +19,4 @@ properties:
   norms:
     driving_side: left
   ext_expected_errors:
-    - "[I#/geometry/coordinates/0] [S#/properties/coordinates/items/type] expected number, but got string"
+    - "properties/coordinates/items/type]: got string, want number"
diff --git a/counterexamples/divisions/division/bad-geometry-type.yaml b/counterexamples/divisions/division/bad-geometry-type.yaml
@@ -19,4 +19,4 @@ properties:
   norms:
     driving_side: left
   ext_expected_errors:
-    - value must be "Point"
+    - "value must be 'Point'"
diff --git a/counterexamples/divisions/division/bad-hierarchies.yaml b/counterexamples/divisions/division/bad-hierarchies.yaml
@@ -23,7 +23,7 @@ properties:
   norms:
     driving_side: left
   ext_expected_errors:
-    - "[I#/properties/hierarchies/0/0] [S#/$defs/typeDefinitions/hierarchyItem/required] missing properties: 'name'"
-    - "[I#/properties/hierarchies/0/1] [S#/$defs/typeDefinitions/hierarchyItem/required] missing properties: 'division_id'"
-    - "[I#/properties/hierarchies/0/2] [S#/$defs/typeDefinitions/hierarchyItem/required] missing properties: 'subtype'"
-    - "[I#/properties/hierarchies/1] [S#/$defs/typeDefinitions/hierarchy/minItems] minimum 1 items required, but found 0 items"
+    - "/propertyDefinitions/hierarchyItem/required]: missing property 'name'"
+    - "/propertyDefinitions/hierarchyItem/required]: missing property 'division_id'"
+    - "/propertyDefinitions/hierarchyItem/required]: missing property 'subtype'"
+    - "/propertyDefinitions/hierarchy/minItems]: minItems: got 0, want 1"
diff --git a/counterexamples/divisions/division/bad-names.yaml b/counterexamples/divisions/division/bad-names.yaml
@@ -21,5 +21,5 @@ properties:
   norms:
     driving_side: left
   ext_expected_errors:
-    - "[I#/properties/names/primary] [S#/$defs/propertyDefinitions/allNames/properties/primary/type] expected string, but got null"
-    - additionalProperties 'a-b-c-d-e-f-g-h-i-j-k-l' not allowed
+    - "/propertyDefinitions/allNames/properties/primary/type]: got null, want string"
+    - additional properties 'a-b-c-d-e-f-g-h-i-j-k-l' not allowed
diff --git a/counterexamples/divisions/division/bad-norms.yaml b/counterexamples/divisions/division/bad-norms.yaml
@@ -20,5 +20,5 @@ properties:
     driving_side: middle
     random_property: 10
   ext_expected_errors:
-    - value must be one of "left", "right"
-    - "[S#/properties/properties/properties/norms/unevaluatedProperties] not allowed"
+    - "value must be one of 'left', 'right'"
+    - "/properties/properties/properties/norms/unevaluatedProperties]: false schema"
diff --git a/counterexamples/divisions/division/bad-parent-division-id.yaml b/counterexamples/divisions/division/bad-parent-division-id.yaml
@@ -23,4 +23,4 @@ properties:
     driving_side: right
   parent_division_id: " "
   ext_expected_errors:
-    - "[I#/properties/parent_division_id] [S#/$defs/propertyDefinitions/id/pattern] does not match pattern"
+    - "' ' does not match pattern"
diff --git a/counterexamples/divisions/division/bad-region.yaml b/counterexamples/divisions/division/bad-region.yaml
@@ -22,5 +22,5 @@ properties:
         name: A division with an invalid ISO 3166-2 primary subdivision code ('region')
   parent_division_id: counterexample:division:some-parent-division
   ext_expected_errors:
-    - length must be >= 4, but got 3
-    - does not match pattern
+    - "minLength: got 3, want 4"
+    - "'foo' does not match pattern"
diff --git a/counterexamples/divisions/division/bad-subtype.yaml b/counterexamples/divisions/division/bad-subtype.yaml
@@ -17,5 +17,5 @@ properties:
         subtype: foo
         name: A division with an invalid subtype
   ext_expected_errors:
-    - '[I#/properties/subtype] [S#/$defs/typeDefinitions/placetype/enum] value must be one of "country",'
-    - '[I#/properties/hierarchies/0/0/subtype] [S#/$defs/typeDefinitions/placetype/enum] value must be one of "country",'
+    - "/propertyDefinitions/placetype/enum]: value must be one of 'country',"
+    - "/propertyDefinitions/placetype/enum]: value must be one of 'country',"
diff --git a/counterexamples/divisions/division/missing-properties.yaml b/counterexamples/divisions/division/missing-properties.yaml
@@ -9,4 +9,4 @@ properties:
   type: division
   version: 0
   ext_expected_errors:
-    - "missing properties: 'names', 'subtype', 'country', 'hierarchies'"
+    - "missing properties 'names', 'subtype', 'country', 'hierarchies'"
diff --git a/counterexamples/divisions/division/parent-not-allowed-on-country.yaml b/counterexamples/divisions/division/parent-not-allowed-on-country.yaml
@@ -18,4 +18,4 @@ properties:
         name: A country division that has a parent ID, which is not allowed
   parent_division_id: counterexample:division:some-parent-division
   ext_expected_errors:
-    - "[I#/properties] [S#/properties/properties/allOf/2/then/not] not failed"
+    - "[S#/properties/properties/allOf/2/then]: not failed"
diff --git a/counterexamples/divisions/division/parent-required-on-sub-country.yaml b/counterexamples/divisions/division/parent-required-on-sub-country.yaml
@@ -21,4 +21,4 @@ properties:
         subtype: region
         name: A sub-country division that lacks a parent ID
   ext_expected_errors:
-    - "missing properties: 'parent_division_id'"
+    - "missing property 'parent_division_id'"
diff --git a/counterexamples/divisions/division_area/bad-class.yaml b/counterexamples/divisions/division_area/bad-class.yaml
@@ -15,4 +15,4 @@ properties:
     primary: A division area with an invalid class property.
   country: ZZ
   ext_expected_errors:
-    - 'value must be one of "land", "maritime"'
+    - "value must be one of 'land', 'maritime'"