diff --git a/.github/ISSUE_TEMPLATE/agenda-minutes-template.md b/.github/ISSUE_TEMPLATE/agenda-minutes-template.md deleted file mode 100644 index 3881bfe7..00000000 --- a/.github/ISSUE_TEMPLATE/agenda-minutes-template.md +++ /dev/null @@ -1,54 +0,0 @@ ---- -name: Agenda/Minutes Template -about: Agenda/Minutes Template -title: '' -labels: Agenda/Minutes -assignees: '' - ---- - -## Date: 2023 mm dd -Time 3:00pm UTC - See the time in your timezone https://everytimezone.com/s/a8399b00 - -- Co-Chair Rob Soetewey (TomTom) -- Co-Chair Assaji Aluwihare (Amazon) -- Convener Sean Mcilroy (Linux Foundation) - -## Meeting notices - -### Antitrust Policy - -The Steering Members, General Members, and Contributors acknowledge that they may compete with one another in various lines of business and that it is therefore imperative that they and their respective representatives act in a manner that does not violate any applicable antitrust laws and regulations. Each Steering Member, General Member, and Contributor may have similar agreements with others. Each Steering Member, General Member, and Contributor may design, develop, manufacture, acquire or market competitive deliverables, products and services, and conduct its business, in whatever way it chooses. No Steering Member, General Member, or Contributor is obligated to announce or market any products or services associated with or based on the Project. Without limiting the generality of the foregoing, the Steering Members, General Members, and Contributors agree not to have any discussion relating to any product pricing, methods or channels of product distribution, division of markets, allocation of customers or any other topic that should not be discussed among competitors. - -**Reminder - Meeting is recorded** - -## Roll Call - -Please add 'Attended' to this issue during the meeting to denote attendance. - -## Agenda - - [ ] **Convene & Roll Call** - - [ ] **Agree Agenda** - - [ ] **[Approve Previous Meeting Minutes](https://github.com/OvertureMaps/schema-wg/issues?q=is%3Aopen+is%3Aissue+label%3AAgenda%2FMinutes)** - -## Task Force (TF) Stand-up -**[Update status here](https://wiki.overturemaps.org/display/PROJ/Overture+H1+Technical+Deliverables+Tracking#OvertureH1TechnicalDeliverablesTracking-M3|APR-26(updatedApr-05))** -- [ ] Places TF -- [ ] Buildings TF -- [ ] Transportation TF -- [ ] Admin TF -- [ ] GERS TF - -## [PRs](https://github.com/OvertureMaps/schema-wg/pulls) - -## [Issue](https://github.com/OvertureMaps/schema-wg/issues) - - -## AOB - - [ ] Add - -## Next meeting -- [] dd mmm - -## Adjourn -- [ ] No objections? diff --git a/.github/PULL_REQUEST_TEMPLATE/documentation_update.md b/.github/PULL_REQUEST_TEMPLATE/documentation_update.md new file mode 100644 index 00000000..c6d981af --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/documentation_update.md @@ -0,0 +1,4 @@ +# Update to the Schema Documentation Website + +To view the changes this PR introduces to the documentation website, view the [https://dfhx9f55j8eg5.cloudfront.net/pr/](Page Preview) + diff --git a/.github/workflows/github-actions-copy-latest-docs-to-staging.yaml b/.github/workflows/github-actions-copy-latest-docs-to-staging.yaml index b9c1b410..d009928b 100644 --- a/.github/workflows/github-actions-copy-latest-docs-to-staging.yaml +++ b/.github/workflows/github-actions-copy-latest-docs-to-staging.yaml @@ -36,7 +36,7 @@ jobs: - name: Fetch AWS credentials uses: aws-actions/configure-aws-credentials@v2 with: - role-to-assume: arn:aws:iam::207370808101:role/Overture_GitHub_schema-wg_Publish_Docs_Staging + role-to-assume: arn:aws:iam::207370808101:role/Overture_GitHub_schema_Publish_Docs_Staging aws-region: us-east-2 - name: Copy Docusaurus website to staging bucket /latest/ diff --git a/.github/workflows/github-actions-copy-pr-docs-to-staging.yaml b/.github/workflows/github-actions-copy-pr-docs-to-staging.yaml index 159a489f..2ee70583 100644 --- a/.github/workflows/github-actions-copy-pr-docs-to-staging.yaml +++ b/.github/workflows/github-actions-copy-pr-docs-to-staging.yaml @@ -31,7 +31,7 @@ jobs: - name: Fetch AWS credentials uses: aws-actions/configure-aws-credentials@v2 with: - role-to-assume: arn:aws:iam::207370808101:role/Overture_GitHub_schema-wg_Publish_Docs_Staging + role-to-assume: arn:aws:iam::207370808101:role/Overture_GitHub_schema_Publish_Docs_Staging aws-region: us-east-2 - name: Copy Docusaurus website to staging bucket /pr/${{github.event.number}}/ diff --git a/docusaurus/README.md b/docusaurus/README.md index 386058c8..3d6d2ca4 100644 --- a/docusaurus/README.md +++ b/docusaurus/README.md @@ -21,34 +21,27 @@ Then, start the local server: ``` $ npm run start ``` -This command does 2 things: First, it copies the contents of `schema/` into `docusaurus/docs/yaml`, then it runs the docusaurus server which reads the contents of `docs/overture-schema` pages and the `docs/yaml` files to build the page. +This command does 2 things: First, it copies the contents of `schema/` into `docusaurus/docs/_schema`, and `examples/` into `docusaurus/docs/_examples`, then it runs the docusaurus server which builds the documentation. This command should also launch a browser window to `http://localhost:3000` where any changes to the source `.mdx` files are reflected live. ### Editing All of the relevant editable `.mdx` files are here: ``` -schema-wg/ +schema/ docusaurus/ docs/ - overture-schema/ - -schema.mdx - Addresses/ - -address.mdx - Buildings/ - -footprint.mdx + gers/ + reference/ + themes/ + index.mdx ``` These files may contain the headings, examples, etc. for each schema file, in markdown. -Adding descriptions to the actual schema elements, however, should be done in the schema YAML files directly in the main (`schema-wg/schema/`) directory. - -_Note: each time you run `npm run start`, the official YAML schema files from `schema-wg/schema` are copied to the `docusaurus/docs/yaml` directory, where docusaurus parses them._ - -### Adding a new Schema Page -1. Update the `src/YAML_FILE_TREE.js` file to include the _relative_ path to the YAML file. -2. Add a new `.mdx` file in the `docs/overture-schema` directory. +Adding descriptions to the actual schema elements, however, should be done in the schema YAML files directly in the main (`schema/`) directory. +_Note: each time you run `npm run start`, the official YAML schema files from `/schema` are copied to the `docusaurus/docs/_schema_` directory, where docusaurus parses them._ ## Publishing ``` diff --git a/docusaurus/docs/index.mdx b/docusaurus/docs/index.mdx index 29aa86fa..e0f98584 100644 --- a/docusaurus/docs/index.mdx +++ b/docusaurus/docs/index.mdx @@ -25,4 +25,5 @@ less common use cases ("the periphery") via extensibility. 4. Feature Geometries follow the [OGC Simple Feature Access specifications](https://www.ogc.org/standard/sfa/). 5. Measurements use SI units (e.g. meters for building heights) and local units for regulations and restrictions (e.g. speed limits in mph in the US and km/h in Germany). -Copyright © Overture Maps Foundation, 2023 +## License +Overture Maps Schema is licensed under [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/legalcode). diff --git a/docusaurus/docusaurus.config.js b/docusaurus/docusaurus.config.js index 950278d6..f31fefcf 100644 --- a/docusaurus/docusaurus.config.js +++ b/docusaurus/docusaurus.config.js @@ -69,6 +69,7 @@ const config = { logo: { alt: 'Overture Maps Foundation Logo', src: 'img/omf_logo_transparent.png', + href: 'https://overturemaps.org' }, items: [ { diff --git a/schema/buildings/building.yaml b/schema/buildings/building.yaml index 5b7e81b9..d300c716 100644 --- a/schema/buildings/building.yaml +++ b/schema/buildings/building.yaml @@ -8,7 +8,7 @@ type: object properties: geometry: description: >- - A regular building's geometry is deinfed as it's footprint or roofprint (if traced from aerial/satellite imagery). These MUST be a Polygon as defined by GeoJSON + A regular building's geometry is defined as it's footprint or roofprint (if traced from aerial/satellite imagery). These MUST be a Polygon as defined by GeoJSON schema. unevaluatedProperties: false oneOf: diff --git a/submission_process.svg b/submission_process.svg deleted file mode 100644 index d00fb250..00000000 --- a/submission_process.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
Rel v1.0
Rel v1.0
Rel v1.1
Rel v1.1
Rel v1.1.1
Rel v1.1.1
Releases
Releas...
Members
Members
Maintainer
Maintainer
Chair
Chair
merged by WG Chair
merged by WG Chair
...
...
merged by WG Chair
merged by WG Chair
?
?
NO
NO
Discussion
Discussion
PR
PR
?
?
NO
NO
Discussion
Discussion
PR
PR
GitHub Flow
GitHub Flow
"main"
"main"
merged by maintainer
merged by mainta...
merged by maintainer
merged by mainta...
"feature-branch-1"
"feature-branch-1"
"feature-branch-x"
"feature-branch-x"
Same process, merge back into "main"
Same process, merge back into "main"
WG Review
&
Approval
WG Review...
Roles:
Roles:Viewer does not support full SVG 1.1