tough rebase

OvertureMaps · Sep 7, 2024 · 1dc2df2 · 1dc2df2
1 parent 3f4a42b
commit 1dc2df2
Show file tree

Hide file tree

Showing 234 changed files with 2,914 additions and 21,988 deletions.
diff --git a/counterexamples/admins/admin-lower-admin-level-no-context.json b/counterexamples/admins/admin-lower-admin-level-no-context.json
diff --git a/counterexamples/admins/locality/invalid-country-code-exceeded-max-length.json b/counterexamples/admins/locality/invalid-country-code-exceeded-max-length.json
diff --git a/counterexamples/admins/locality/invalid-country-code-less-than-min-length.json b/counterexamples/admins/locality/invalid-country-code-less-than-min-length.json
diff --git a/counterexamples/admins/locality/invalid-sub-country-code-exceeded-max-length.json b/counterexamples/admins/locality/invalid-sub-country-code-exceeded-max-length.json
diff --git a/counterexamples/admins/locality/invalid-sub-country-code-less-than-min-length.json b/counterexamples/admins/locality/invalid-sub-country-code-less-than-min-length.json
diff --git a/counterexamples/admins/locality/missing-names.json b/counterexamples/admins/locality/missing-names.json
diff --git a/counterexamples/buildings/bad-class.json b/counterexamples/buildings/bad-class.json
@@ -13,6 +13,5 @@
     "type": "building",
     "class": "made-up-class",
     "version": 0,
-    "update_time": "2023-02-23T00:04:00-08:00"
   }
 }
diff --git a/counterexamples/buildings/bad-confidence-in-source.yaml b/counterexamples/buildings/bad-confidence-in-source.yaml
@@ -11,7 +11,6 @@ properties:
   theme: buildings
   type: building
   version: 1
-  update_time: "2023-02-22T23:55:01-08:00"
   height: 21.34
   sources:
   - property: ""

diff --git a/counterexamples/buildings/bad-geometry-type.json b/counterexamples/buildings/bad-geometry-type.json
@@ -9,6 +9,5 @@
     "theme": "buildings",
     "type": "building",
     "version": 0,
-    "update_time": "2023-02-23T00:04:00-08:00"
   }
 }
diff --git a/counterexamples/buildings/bad-names/bad-common-language.yaml b/counterexamples/buildings/bad-names/bad-common-language.yaml
@@ -9,7 +9,6 @@ properties:
   theme: buildings
   type: building
   version: 1
-  update_time: "2023-02-22T23:55:01-08:00"
   names:
     primary: Empire State Building
     common:

diff --git a/counterexamples/buildings/bad-names/bad-name-language.yaml b/counterexamples/buildings/bad-names/bad-name-language.yaml
@@ -15,9 +15,5 @@ properties:
       en: Empire State Building
     rules:
       - variant: common
-<<<<<<<< HEAD:counterexamples/buildings/bad-names/bad-name-language.yaml
         language: ga:genitive
-========
-        language: local
->>>>>>>> 444399f (Remove "local" as a language. Fix counterexamples):counterexamples/buildings/bad-names/bad-name-local-not-allowed.yaml
         value: Blah
diff --git a/counterexamples/buildings/bad-names/bad-name-local-not-allowed.yaml b/counterexamples/buildings/bad-names/bad-name-local-not-allowed.yaml
diff --git a/counterexamples/buildings/bad-names/bad-name-no-primary.yaml b/counterexamples/buildings/bad-names/bad-name-no-primary.yaml
@@ -9,7 +9,6 @@ properties:
   theme: buildings
   type: building
   version: 1
-  update_time: "2023-02-22T23:55:01-08:00"
   names:
     common:
       en: Empire State Building
diff --git a/counterexamples/buildings/bad-time.yaml b/counterexamples/buildings/bad-time.yaml
@@ -6,9 +6,12 @@ geometry:
   coordinates: [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]
 properties:
   ext_expected_errors:
-    - "[I#/properties/update_time] [S#/$defs/propertyDefinitions/featureUpdateTime/format] 'abc2023-02-22T23:55:01-08:00' is not valid 'date-time'"
-    - "[I#/properties/update_time] [S#/$defs/propertyDefinitions/featureUpdateTime/pattern] does not match pattern"
+    - "[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"
   theme: buildings
   type: building
   version: 1
-  update_time: abc2023-02-22T23:55:01-08:00
+  sources:
+    - dataset: OpenStreetMap
+      property: "/blah"
+      update_time: abc2023-02-22T23:55:01-08:00
diff --git a/counterexamples/buildings/bad-type.json b/counterexamples/buildings/bad-type.json
@@ -9,6 +9,5 @@
     "theme": "buildings",
     "type": "fake",
     "version": 1,
-    "update_time": "2023-02-23T00:04:00-08:00"
   }
 }
diff --git a/counterexamples/buildings/negative-height.json b/counterexamples/buildings/negative-height.json
@@ -13,7 +13,6 @@
     "type": "building",
     "class": "residential",
     "version": 0,
-    "update_time": "2023-02-23T00:04:00-08:00",
     "height": -1.23
   }
 }
diff --git a/counterexamples/buildings/negative-num-floors.json b/counterexamples/buildings/negative-num-floors.json
@@ -13,7 +13,6 @@
     "type": "building",
     "class": "residential",
     "version": 0,
-    "update_time": "2023-02-23T00:04:00-08:00",
     "num_floors": -3
   }
 }
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-days.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-days.yaml
@@ -10,6 +10,5 @@ properties:
   theme: places
   type: place
   version: 0
-  update_time: "2024-02-32T15:45:22Z"
   ext_expected_errors:
     - "does not match pattern"
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-hours.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-hours.yaml
@@ -10,6 +10,5 @@ properties:
   theme: places
   type: place
   version: 0
-  update_time: "2024-01-12T24:59:22-08:00"
   ext_expected_errors:
     - "does not match pattern"
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-miliseconds.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-miliseconds.yaml
@@ -10,6 +10,5 @@ properties:
   theme: places
   type: place
   version: 0
-  update_time: "2024-01-12T22:59:22.1234-08:00"
   ext_expected_errors:
     - "does not match pattern"
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-minutes.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-minutes.yaml
@@ -10,6 +10,5 @@ properties:
   theme: places
   type: place
   version: 0
-  update_time: "2024-01-12T14:60:22-08:00"
   ext_expected_errors:
     - "does not match pattern"
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-months.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-months.yaml
@@ -10,6 +10,5 @@ properties:
   theme: places
   type: place
   version: 0
-  update_time: "2024-13-22T12:59:22-08:00"
   ext_expected_errors:
     - "does not match pattern"
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-seconds.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-seconds.yaml
@@ -10,6 +10,5 @@ properties:
   theme: places
   type: place
   version: 0
-  update_time: "2024-11-22T12:44:61-08:00"
   ext_expected_errors:
     - "does not match pattern"
diff --git a/counterexamples/common/timestamp/bad-timestamp-invalid-timezone.yaml b/counterexamples/common/timestamp/bad-timestamp-invalid-timezone.yaml
@@ -10,6 +10,5 @@ properties:
   theme: places
   type: place
   version: 0
-  update_time: "2024-11-22T12:44:22+25:00"
   ext_expected_errors:
     - "does not match pattern"
diff --git a/counterexamples/common/timestamp/bad-timestamp-no-timezone.yaml b/counterexamples/common/timestamp/bad-timestamp-no-timezone.yaml
@@ -10,6 +10,5 @@ properties:
   theme: places
   type: place
   version: 0
-  update_time: "2024-11-22T12:44:22"
   ext_expected_errors:
     - "does not match pattern"
diff --git a/counterexamples/common/timestamp/bad-timestamp-yaml-no-quotes.yaml b/counterexamples/common/timestamp/bad-timestamp-yaml-no-quotes.yaml
@@ -5,6 +5,5 @@ geometry:
   type: Point
   coordinates: [0, 0]
 properties:
-  update_time: 2023-05-31T17:24:13-06:00
   ext_expected_errors:
     - "jsonschema: invalid jsonType: time.Time"
diff --git a/counterexamples/divisions/boundary/bad-class.yaml b/counterexamples/divisions/boundary/bad-class.yaml
@@ -11,9 +11,7 @@ properties:
   version: 0
   subtype: country
   class: foo
-  divisions:
-    - division_id: example:division:country:left
-      is_disputing: false
-    - division_id: example:division:country:right
+  divisions: ["example:division:country:left", "example:division:country:right"]
+  is_disputed: false
   ext_expected_errors:
     - value must be one of "land", "maritime"
diff --git a/counterexamples/divisions/boundary/bad-divisions-1.yaml b/counterexamples/divisions/boundary/bad-divisions-1.yaml