-
Notifications
You must be signed in to change notification settings - Fork 12
Add Bathymetry to Base #206
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+138
−0
Merged
Changes from all commits
Commits
Show all changes
101 commits
Select commit
Hold shift + click to select a range
8d9402c
Remove "local" as a language. Fix counterexamples
jwass f1fdebf
Country and sub-divison iso code validation
2c45347
Convert property names and enumeration member names to snake_case
vcschapp 288a818
Added roof shape and material mapping files
LukaszMichalski-TomTom 1f38de6
camelCased values
LukaszMichalski-TomTom db7abdf
added zinc
LukaszMichalski-TomTom d14723c
snake_case update
jenningsanderson 7c1bf83
combining properties and updating readme
jenningsanderson ed2bf33
break out into files
jenningsanderson fa3ca04
adding tar_paper as 4th largest value in OSM
jenningsanderson 91f2df1
putting tar_paper back
jenningsanderson 9b0c7d5
Adding more complex building logic
jenningsanderson 9c2d69a
Changing building mapping to a query
jenningsanderson 55ac539
Fix remaining water camel-case enums
jwass 3f1082c
fishpond -> fish_pond
jwass 24203dc
Add is_abandoned flag to segments (#132)
brad-richardson 3ede552
Remove mixed schema types for roads.surface property
84891be
Fix bug where test script spams OK on every assertion match
vcschapp f8c3c6e
Sort main schema types in alphabetical order by theme and type
vcschapp b997d0a
Use the feature's type as its title for each feature type sub-schema
vcschapp 0a7089a
Fix minor grammar and substance errors in building description
vcschapp 830975d
Factor out reusable `namesContainer`
vcschapp 9366be9
Factor out reusable localized `commonNames` sub-structure from names
vcschapp 6e045f3
Model schema for new divisions theme, a.k.a. admins 2.0
vcschapp 11498b2
feat: remove the use of mix-type fields for transportation access res…
bastiaanvanassche-tomtom 9f4fe80
Remove mixed schema types for roads.flags property (#135)
TheRBajaj 4af568f
Fix broken validation caused by recent overlapping PR merges
vcschapp 2a78b69
Rename connectors to connector_ids (#137)
brad-richardson 3ddf432
Add alley road class (#134)
brad-richardson d10f303
Drop primary name from division's `local_type` property
vcschapp 8f958a2
Add sql files
jenningsanderson 2e1f3a3
Switch schema url to schema.overturemaps.org (#160)
jenningsanderson 711aba8
Update docusaurus.config.js
jenningsanderson 24ef4b3
documentation continuity fix
jenningsanderson dc3f71f
Fix stale counterexamples, fix missing required properties
vcschapp c7b66ca
Restructure and remove mixed schema types for minOccupancy property (…
TheRBajaj 82d696b
Restructure and remove mixed schema types for road.restrictions.speed…
439dd43
Correct scoping implementation at schema level
vcschapp 1578a5b
Push segment level down into road property, add linear referencing
vcschapp e3af7ec
Lift road segment class up from road property to top level
vcschapp 0db2511
Remove outdated building_class_mapping.json file
jwass 9085e84
Remove reason property from prohitied transition rules
vcschapp c92d5a2
Rename `at` property for LR ranges to `between`
vcschapp 152d41f
Push `during` property under `when` to unblock except
vcschapp 6b02dc4
building=parking should be transportation, not service
jwass 4ada208
Adding infrastructure
jenningsanderson 8fbc029
Add min_floor field for buildings and parts
jwass 28b77f7
Add exclusiveMinimum of 0 for min_floor
jwass be5e1ba
Update defs.yaml
jenningsanderson 4d8c560
Base theme improvements (#150)
jenningsanderson 6e5702d
Rename type=part -> type=building_part (#152)
jwass a0de9de
remove description of GERS ID structure
danabauer 78d7f3e
update query
danabauer 4c2e8b4
add path road class
ylinzhi adfc60e
remove additional road property to keep the example simple
ylinzhi 3f3df3b
Add titles / documentation update (#155)
jenningsanderson ad4aa88
Rename subclass to class
jenningsanderson d1694dc
Adding pedestrian and plaza
jenningsanderson 8c854fa
Adding more infrastructure source tags
jenningsanderson 9d86178
Adding beach_resort
jenningsanderson 3e05b5e
Update land.sql
jenningsanderson dd37cb3
Adding grave_yard
jenningsanderson dc8d393
Fixes for national parks, nature reserves, state parks, forests, etc.…
BoZivk 14dc9ae
land and landuse fixes
jenningsanderson 860fdbd
comma fix
jenningsanderson 1b766ee
Update land_use.sql
jenningsanderson d8ab8e7
Adding stone
jenningsanderson 082562a
Adding places for islands and archipelagos
jenningsanderson e80ba61
Update water.sql
jenningsanderson 36baf3c
base logic updates
jenningsanderson bc6c40e
Adding new subtype and class values to base schema
jenningsanderson b6d3917
add reference docs for `divisions` and remove narrative docs from sch…
danabauer 7b1840e
Added missing bracket to categories list (#189)
jeffdefacto 95498cf
Create bathymetry.yaml
jonahadkins dcfe5df
Update defs.yaml
jonahadkins 891717f
Update schema.yaml
jonahadkins 7476645
Create bathymetry-example.yaml
jonahadkins 8d1e196
Create bathymetry.mdx
jonahadkins c3e3a9a
Update YAML_FILE_TREE.js
jonahadkins afb1380
Reverting changes to dev
jenningsanderson 1f54ef0
Update schema.yaml
jonahadkins 4061516
Reverting changes to dev
jenningsanderson 9fc7069
bringing bathymetry branch up to dev
jenningsanderson 28a8b31
bringing bathymetry up to date
jenningsanderson 3b62aef
tough rebase
jonahadkins 2bfef7c
take 2 :movie_camera:
jonahadkins 5adc159
tough rebase
jonahadkins 7bc986a
tough rebase part 2
jonahadkins c3dd886
get current take 1
jonahadkins 941ddca
Update schema.yaml
jonahadkins 7ab9acc
Update defs.yaml
jonahadkins 914422c
Update defs.yaml
jonahadkins 34724b0
Update bathymetry.yaml
jonahadkins f479b42
Update bathymetry-example.yaml
jonahadkins 5d4a985
Update bathymetry.yaml
jonahadkins 3c265d6
Update bathymetry.mdx
jonahadkins f8c835f
Update bathymetry.mdx
jonahadkins 1a0e62a
Tweak feature description
vcschapp 883efd3
Add bathymetry counterexamples
vcschapp 8675311
Make minor correction to depth description
vcschapp 883c674
Sync docs with feature schema
vcschapp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| --- | ||
| id: "overture:bathymetry:counterexample:bad-depth" | ||
| type: Feature | ||
| geometry: | ||
| type: Polygon | ||
| coordinates: [[[-73.1902319,41.6678018],[-73.1896302,41.667817],[-73.1890448,41.6667723],[-73.1899188,41.6666994],[-73.1902319,41.6678018]]] | ||
| properties: | ||
| theme: base | ||
| type: bathymetry | ||
| version: 0 | ||
| depth: 1 | ||
| sources: | ||
| - record_id: x123 | ||
| property: "" | ||
| dataset: some source | ||
| ext_expected_errors: | ||
| - "depth/maximum]: maximum: got 1, want 0" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- | ||
| id: "overture:bathymetry:counterexample:bad-depth" | ||
| type: Feature | ||
| geometry: | ||
| type: Polygon | ||
| coordinates: [[[-73.1902319,41.6678018],[-73.1896302,41.667817],[-73.1890448,41.6667723],[-73.1899188,41.6666994],[-73.1902319,41.6678018]]] | ||
| properties: | ||
| theme: base | ||
| type: bathymetry | ||
| version: 0 | ||
| ext_expected_errors: | ||
| - "missing property 'depth'" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| --- | ||
| title: bathymetry | ||
| --- | ||
|
|
||
| import CodeBlock from '@theme/CodeBlock'; | ||
| import JSONSchemaViewer from "@theme/JSONSchemaViewer"; | ||
| import generateResolverOptions from "@site/src/components/shared-libs/generateResolverOptions" | ||
| import yamlLoad from "@site/src/components/yamlLoad" | ||
| import BathymetrySchema from "!!raw-loader!@site/docs/_schema/base/bathymetry.yaml"; | ||
|
|
||
| import BathymetryExample from "!!raw-loader!@site/docs/_examples/base/bathymetry-example.yaml"; | ||
|
|
||
| import Tabs from '@theme/Tabs'; | ||
| import TabItem from '@theme/TabItem'; | ||
|
|
||
| # Bathymetry | ||
|
|
||
| <table> | ||
| <tbody> | ||
| <tr> | ||
| <th>Geometry Type</th> | ||
| <td> | ||
| <code>Polygon</code> or <code>MultiPolygon</code> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <th>Theme</th> | ||
| <td><code>base</code></td> | ||
| </tr> | ||
| <tr> | ||
| <th>Type</th> | ||
| <td><code>bathymetry</code></td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
|
|
||
| ## Schema | ||
|
|
||
| <Tabs> | ||
| <TabItem value="browsable" label="Browsable" default> | ||
| <JSONSchemaViewer schema={ yamlLoad(BathymetrySchema) } resolverOptions={ generateResolverOptions({remote: true, yamlBasePath: '/base'})}/> | ||
| </TabItem> | ||
| <TabItem value="yaml" label="YAML" default> | ||
| <CodeBlock language="jsx">{BathymetrySchema}</CodeBlock> | ||
| </TabItem> | ||
| </Tabs> | ||
|
|
||
| ## Examples | ||
|
|
||
| <Tabs> | ||
| <TabItem value="1" label="bathymetry" default> | ||
| <CodeBlock language="json">{ JSON.stringify(yamlLoad(BathymetryExample), null, 2) }</CodeBlock> | ||
| </TabItem> | ||
|
|
||
| </Tabs> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| --- | ||
| id: "overture:bathymetry:example:1" | ||
| type: Feature | ||
| geometry: | ||
| type: Polygon | ||
| coordinates: [[[-73.1902319,41.6678018],[-73.1896302,41.667817],[-73.1890448,41.6667723],[-73.1899188,41.6666994],[-73.1902319,41.6678018]]] | ||
| properties: | ||
| theme: base | ||
| type: bathymetry | ||
| depth: -2500 | ||
| cartography: | ||
| min_zoom: 0 | ||
| max_zoom: 23 | ||
| sort_key: 7 | ||
| sources: | ||
| - record_id: x123 | ||
| property: "" | ||
| dataset: some source | ||
| version: 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --- | ||
| "$schema": https://json-schema.org/draft/2020-12/schema | ||
| title: bathymetry | ||
| description: Topographic representation of an underwater area, such as a part of the ocean floor. | ||
| type: object | ||
| properties: | ||
| id: | ||
| "$ref": ../defs.yaml#/$defs/propertyDefinitions/id | ||
| geometry: | ||
| unevaluatedProperties: false | ||
| oneOf: | ||
| - "$ref": https://geojson.org/schema/Polygon.json | ||
| - "$ref": https://geojson.org/schema/MultiPolygon.json | ||
| properties: | ||
| unevaluatedProperties: false | ||
| allOf: | ||
| - "$ref": ../defs.yaml#/$defs/propertyContainers/overtureFeaturePropertiesContainer | ||
| - "$ref": ../defs.yaml#/$defs/propertyContainers/levelContainer | ||
| - "$ref": ../defs.yaml#/$defs/propertyContainers/cartographyContainer | ||
| required: [depth] | ||
| properties: | ||
jonahadkins marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| depth: { "$ref": "./defs.yaml#/$defs/propertyDefinitions/depth" } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.