Skip to content

Commit

Permalink
Merge branch 'staging' into main
Browse files Browse the repository at this point in the history
Merging into main for August, 2024 release.
  • Loading branch information
vcschapp committed Aug 19, 2024
2 parents b8185db + 5bd9de4 commit 1b590a4
Show file tree
Hide file tree
Showing 149 changed files with 1,354 additions and 15,801 deletions.
25 changes: 20 additions & 5 deletions .github/workflows/github-actions-copy-latest-docs-to-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,31 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: "19"
node-version: "20"

- name: Install NPM dependencies
run: cd docusaurus && npm install --prefer-dedupe
- name: Checkout Documentation
uses: actions/checkout@v4
with:
repository: OvertureMaps/docs
ref: main
path: docusaurus

- name: Copy Examples, Schema, & Docs
run: |
mkdir -p docusaurus/docs/_examples
cp -R examples/* docusaurus/docs/_examples/
mkdir -p docusaurus/docs/_schema
cp -R schema/* docusaurus/docs/_schema/
cp -R docs/schema docusaurus/docs/
- name: Build Docusaurus website
env:
DOCUSAURUS_URL: https://dfhx9f55j8eg5.cloudfront.net/
DOCUSAURUS_BASE_URL: /latest/
run: cd docusaurus && npm run build
run: |
cd docusaurus
npm install --prefer-dedupe
npm run docusaurus build
- name: Fetch AWS credentials
uses: aws-actions/configure-aws-credentials@v4
Expand All @@ -48,4 +63,4 @@ jobs:
aws cloudfront create-invalidation --distribution-id E3L106P8HVBE9L --paths "/latest/*"
- name: Publish URL
run: echo "### [https://dfhx9f55j8eg5.cloudfront.net/latest/](https://dfhx9f55j8eg5.cloudfront.net/latest/)" >> $GITHUB_STEP_SUMMARY
run: echo "### [https://dfhx9f55j8eg5.cloudfront.net/latest/schema/](https://dfhx9f55j8eg5.cloudfront.net/latest/schema/)" >> $GITHUB_STEP_SUMMARY
21 changes: 18 additions & 3 deletions .github/workflows/github-actions-copy-pr-docs-to-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,29 @@ jobs:
with:
node-version: "20"

- name: Install NPM dependencies
run: cd docusaurus && npm install --prefer-dedupe
- name: Checkout Documentation
uses: actions/checkout@v4
with:
repository: OvertureMaps/docs
ref: main
path: docusaurus

- name: Copy Examples, Schema, & Docs
run: |
mkdir -p docusaurus/docs/_examples
cp -R examples/* docusaurus/docs/_examples/
mkdir -p docusaurus/docs/_schema
cp -R schema/* docusaurus/docs/_schema/
cp -R docs/schema docusaurus/docs/
- name: Build Docusaurus website
env:
DOCUSAURUS_URL: https://dfhx9f55j8eg5.cloudfront.net/
DOCUSAURUS_BASE_URL: /pr/${{github.event.number}}/
run: cd docusaurus && npm run build
run: |
cd docusaurus
npm install --prefer-dedupe
npm run docusaurus build
- name: Fetch AWS credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.gitignore
.vscode
.watchman*
.DS_Store
.DS_Store
docs/docusaurus
16 changes: 16 additions & 0 deletions counterexamples/transportation/segment/bad-class.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
id: overture:transportation:segment:123
type: Feature
geometry:
type: LineString
coordinates: [[0, 0], [1, 1]]
properties:
ext_expected_errors:
- "[I#/properties/class] [S#/$defs/propertyDefinitions/class] value must be one of"
theme: transportation
type: segment
update_time: "2024-04-23T00:00:00-05:00"
version: 1
subtype: road
class: sidewalk
connector_ids: [fooConnector, barConnector]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "segment with an invalid entry in the connector_ids array",
"id": "segment with an invalid entry in the connectors array",
"type": "Feature",
"geometry": {
"type": "LineString",
Expand All @@ -13,6 +13,20 @@
"type": "segment",
"version": 4,
"subtype": "rail",
"connector_ids": ["fooConnector", "bazConnector", "fooConnector"]
"connector_ids": ["fooConnector", "bazConnector", "fooConnector"],
"connectors": [
{
"connector_id": "fooConnector",
"at": 0
},
{
"connector_id": "bazConnector",
"at": 1
},
{
"connector_id": "fooConnector",
"at": 0
}
]
}
}
10 changes: 7 additions & 3 deletions counterexamples/transportation/segment/bad-connector.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "segment with an invalid entry in the connector_ids array",
"id": "segment with an invalid entry in the connectors array",
"type": "Feature",
"geometry": {
"type": "LineString",
Expand All @@ -8,12 +8,16 @@
"properties": {
"ext_expected_errors": [
"expected string, but got number",
"expected string, but got boolean"
"expected string, but got boolean",
"expected object, but got string",
"expected object, but got number",
"expected object, but got boolean"
],
"theme": "transportation",
"type": "segment",
"version": 3,
"subtype": "rail",
"connector_ids": ["bazConnector", "qux", 1, false]
"connector_ids": ["bazConnector", "qux", 1, false],
"connectors": [{"connector_id": "foo", "at": 0.0}, {"connector_id": "bar", "at": 1.0}, "bazConnector", "qux", 1, false]
}
}
6 changes: 6 additions & 0 deletions counterexamples/transportation/segment/bad-route.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ properties:
version: 1
subtype: road
class: secondary
# `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
connector_ids: [fooConnector, barConnector]
connectors:
- connector_id: fooConnector
at: 0
- connector_id: barConnector
at: 1
routes:
- name: ""
ref: 1234
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
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
connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
destinations:
- labels:
- value: Seattle
type: unknown
- value: Seattle
type: unknown
- value: Redmond
- value:
foo: bar
type: unknown
- 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: unknown
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"
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ properties:
version: 1
subtype: road
class: secondary
# `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
connector_ids: [fooConnector, barConnector]
connectors:
- connector_id: fooConnector
at: 0
- connector_id: barConnector
at: 1
level_rules:
- value: 1.5
ext_expected_errors:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ properties:
version: 1
subtype: road
class: secondary
# `connector_ids` is deprecated in favor of `connectors`, planned to be removed for the October release
connector_ids: [fooConnector, barConnector]
connectors:
- connector_id: fooConnector
at: 0
- connector_id: barConnector
at: 1
level_rules:
- value: 1
foo: bar
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
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
connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
destinations:
- labels:
- value: Seattle
type: bad_type
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
ext_expected_errors:
- "[I#/properties/destinations/0/labels/0/type] [S#/$defs/propertyDefinitions/destinationLabelType/enum] value must be one of"
Original file line number Diff line number Diff line change
@@ -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
connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
destinations:
- labels:
- value: Seattle
type: unknown
- value: Seattle
type: unknown
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
ext_expected_errors:
- "[I#/properties/destinations/0/labels] items at index 0 and 1 are equal"
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
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
connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
destinations:
- labels:
- value:
type: unknown
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
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"
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
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
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 ..."
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
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
connector_ids: [overture:transportation:connector:123, overture:transportation:connector:678]
destinations:
- labels:
- value: Seattle
type: unknown
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
ext_expected_errors:
- "[I#/properties/destinations/0] [S#/$defs/propertyDefinitions/destinations/items/required] missing properties: 'final_heading'"
Loading

0 comments on commit 1b590a4

Please sign in to comment.