Skip to content
Merged
Show file tree
Hide file tree
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 Feb 2, 2024
f1fdebf
Country and sub-divison iso code validation
Jan 31, 2024
2c45347
Convert property names and enumeration member names to snake_case
vcschapp Feb 17, 2024
288a818
Added roof shape and material mapping files
LukaszMichalski-TomTom Dec 5, 2023
1f38de6
camelCased values
LukaszMichalski-TomTom Dec 12, 2023
db7abdf
added zinc
LukaszMichalski-TomTom Dec 12, 2023
d14723c
snake_case update
jenningsanderson Feb 22, 2024
7c1bf83
combining properties and updating readme
jenningsanderson Feb 23, 2024
ed2bf33
break out into files
jenningsanderson Feb 26, 2024
fa3ca04
adding tar_paper as 4th largest value in OSM
jenningsanderson Feb 26, 2024
91f2df1
putting tar_paper back
jenningsanderson Feb 26, 2024
9b0c7d5
Adding more complex building logic
jenningsanderson Feb 27, 2024
9c2d69a
Changing building mapping to a query
jenningsanderson Feb 27, 2024
55ac539
Fix remaining water camel-case enums
jwass Feb 26, 2024
3f1082c
fishpond -> fish_pond
jwass Feb 26, 2024
24203dc
Add is_abandoned flag to segments (#132)
brad-richardson Feb 29, 2024
3ede552
Remove mixed schema types for roads.surface property
Feb 22, 2024
84891be
Fix bug where test script spams OK on every assertion match
vcschapp Feb 23, 2024
f8c3c6e
Sort main schema types in alphabetical order by theme and type
vcschapp Feb 22, 2024
b997d0a
Use the feature's type as its title for each feature type sub-schema
vcschapp Feb 22, 2024
0a7089a
Fix minor grammar and substance errors in building description
vcschapp Feb 22, 2024
830975d
Factor out reusable `namesContainer`
vcschapp Feb 22, 2024
9366be9
Factor out reusable localized `commonNames` sub-structure from names
vcschapp Feb 22, 2024
6e045f3
Model schema for new divisions theme, a.k.a. admins 2.0
vcschapp Feb 23, 2024
11498b2
feat: remove the use of mix-type fields for transportation access res…
bastiaanvanassche-tomtom Feb 29, 2024
9f4fe80
Remove mixed schema types for roads.flags property (#135)
TheRBajaj Mar 4, 2024
4af568f
Fix broken validation caused by recent overlapping PR merges
vcschapp Mar 4, 2024
2a78b69
Rename connectors to connector_ids (#137)
brad-richardson Mar 5, 2024
3ddf432
Add alley road class (#134)
brad-richardson Mar 5, 2024
d10f303
Drop primary name from division's `local_type` property
vcschapp Mar 4, 2024
8f958a2
Add sql files
jenningsanderson Feb 26, 2024
2e1f3a3
Switch schema url to schema.overturemaps.org (#160)
jenningsanderson Apr 4, 2024
711aba8
Update docusaurus.config.js
jenningsanderson Apr 5, 2024
24ef4b3
documentation continuity fix
jenningsanderson Apr 5, 2024
dc3f71f
Fix stale counterexamples, fix missing required properties
vcschapp Mar 6, 2024
c7b66ca
Restructure and remove mixed schema types for minOccupancy property (…
TheRBajaj Mar 11, 2024
82d696b
Restructure and remove mixed schema types for road.restrictions.speed…
Mar 7, 2024
439dd43
Correct scoping implementation at schema level
vcschapp Mar 11, 2024
1578a5b
Push segment level down into road property, add linear referencing
vcschapp Mar 11, 2024
e3af7ec
Lift road segment class up from road property to top level
vcschapp Mar 13, 2024
0db2511
Remove outdated building_class_mapping.json file
jwass Mar 13, 2024
9085e84
Remove reason property from prohitied transition rules
vcschapp Mar 14, 2024
c92d5a2
Rename `at` property for LR ranges to `between`
vcschapp Mar 14, 2024
152d41f
Push `during` property under `when` to unblock except
vcschapp Mar 14, 2024
6b02dc4
building=parking should be transportation, not service
jwass Mar 13, 2024
4ada208
Adding infrastructure
jenningsanderson Feb 20, 2024
8fbc029
Add min_floor field for buildings and parts
jwass Mar 12, 2024
28b77f7
Add exclusiveMinimum of 0 for min_floor
jwass Mar 13, 2024
be5e1ba
Update defs.yaml
jenningsanderson Mar 26, 2024
4d8c560
Base theme improvements (#150)
jenningsanderson Mar 27, 2024
6e5702d
Rename type=part -> type=building_part (#152)
jwass Mar 27, 2024
a0de9de
remove description of GERS ID structure
danabauer Apr 1, 2024
78d7f3e
update query
danabauer Apr 1, 2024
4c2e8b4
add path road class
ylinzhi Mar 27, 2024
adfc60e
remove additional road property to keep the example simple
ylinzhi Mar 28, 2024
3f3df3b
Add titles / documentation update (#155)
jenningsanderson Apr 10, 2024
ad4aa88
Rename subclass to class
jenningsanderson Mar 27, 2024
d1694dc
Adding pedestrian and plaza
jenningsanderson Mar 27, 2024
8c854fa
Adding more infrastructure source tags
jenningsanderson Mar 27, 2024
9d86178
Adding beach_resort
jenningsanderson Mar 27, 2024
3e05b5e
Update land.sql
jenningsanderson Mar 27, 2024
dd37cb3
Adding grave_yard
jenningsanderson Mar 27, 2024
dc8d393
Fixes for national parks, nature reserves, state parks, forests, etc.…
BoZivk Apr 2, 2024
14dc9ae
land and landuse fixes
jenningsanderson Apr 3, 2024
860fdbd
comma fix
jenningsanderson Apr 3, 2024
1b766ee
Update land_use.sql
jenningsanderson Apr 3, 2024
d8ab8e7
Adding stone
jenningsanderson Apr 3, 2024
082562a
Adding places for islands and archipelagos
jenningsanderson Apr 3, 2024
e80ba61
Update water.sql
jenningsanderson Apr 4, 2024
36baf3c
base logic updates
jenningsanderson Apr 5, 2024
bc6c40e
Adding new subtype and class values to base schema
jenningsanderson Apr 10, 2024
b6d3917
add reference docs for `divisions` and remove narrative docs from sch…
danabauer Apr 10, 2024
7b1840e
Added missing bracket to categories list (#189)
jeffdefacto May 22, 2024
95498cf
Create bathymetry.yaml
jonahadkins May 30, 2024
dcfe5df
Update defs.yaml
jonahadkins May 30, 2024
891717f
Update schema.yaml
jonahadkins May 30, 2024
7476645
Create bathymetry-example.yaml
jonahadkins May 30, 2024
8d1e196
Create bathymetry.mdx
jonahadkins May 30, 2024
c3e3a9a
Update YAML_FILE_TREE.js
jonahadkins May 30, 2024
afb1380
Reverting changes to dev
jenningsanderson May 30, 2024
1f54ef0
Update schema.yaml
jonahadkins May 30, 2024
4061516
Reverting changes to dev
jenningsanderson May 30, 2024
9fc7069
bringing bathymetry branch up to dev
jenningsanderson Jul 31, 2024
28a8b31
bringing bathymetry up to date
jenningsanderson Jul 31, 2024
3b62aef
tough rebase
jonahadkins Sep 7, 2024
2bfef7c
take 2 :movie_camera:
jonahadkins Sep 7, 2024
5adc159
tough rebase
jonahadkins Nov 22, 2024
7bc986a
tough rebase part 2
jonahadkins Nov 22, 2024
c3dd886
get current take 1
jonahadkins Nov 22, 2024
941ddca
Update schema.yaml
jonahadkins Nov 22, 2024
7ab9acc
Update defs.yaml
jonahadkins Nov 22, 2024
914422c
Update defs.yaml
jonahadkins Dec 4, 2024
34724b0
Update bathymetry.yaml
jonahadkins Dec 4, 2024
f479b42
Update bathymetry-example.yaml
jonahadkins Dec 4, 2024
5d4a985
Update bathymetry.yaml
jonahadkins Dec 4, 2024
3c265d6
Update bathymetry.mdx
jonahadkins Dec 4, 2024
f8c835f
Update bathymetry.mdx
jonahadkins Dec 4, 2024
1a0e62a
Tweak feature description
vcschapp Dec 4, 2024
883efd3
Add bathymetry counterexamples
vcschapp Dec 4, 2024
8675311
Make minor correction to depth description
vcschapp Dec 4, 2024
883c674
Sync docs with feature schema
vcschapp Dec 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions counterexamples/base/bathymetry/bad-depth.yaml
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"
12 changes: 12 additions & 0 deletions counterexamples/base/bathymetry/missing-depth.yaml
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'"
55 changes: 55 additions & 0 deletions docs/schema/reference/base/bathymetry.mdx
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>
19 changes: 19 additions & 0 deletions examples/base/bathymetry-example.yaml
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
22 changes: 22 additions & 0 deletions schema/base/bathymetry.yaml
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:
depth: { "$ref": "./defs.yaml#/$defs/propertyDefinitions/depth" }
4 changes: 4 additions & 0 deletions schema/base/defs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ description: Common schema definitions the base theme (primarily from OSM)
description: Elevation above sea level (in meters) of the feature.
type: integer
maximum: 9000
depth:
description: Depth below surface level (in meters) of the feature.
type: integer
maximum: 0
height:
description: >-
Height of the feature in meters.
Expand Down
1 change: 1 addition & 0 deletions schema/defs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ description: Common schema definitions shared by all themes
type: string
enum:
- address
- bathymetry
- building
- connector
- division
Expand Down
8 changes: 8 additions & 0 deletions schema/schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ oneOf:
type: { enum: [address] }
then: { "$ref": addresses/address.yaml }
else: { propertyNames: false }
- if:
properties:
properties:
properties:
theme: { enum: [base] }
type: { enum: [bathymetry] }
then: { "$ref": base/bathymetry.yaml }
else: { propertyNames: false }
- if:
properties:
properties:
Expand Down
Loading