diff --git a/counterexamples/places/bad-address-missing-required-property.yaml b/counterexamples/places/bad-address-missing-required-property.yaml deleted file mode 100644 index 345bc76f..00000000 --- a/counterexamples/places/bad-address-missing-required-property.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -id: overture:places:place:1 -type: Feature -geometry: - type: Point - coordinates: [0, 0] -properties: - categories: - main: someCategory - addresses: - - freeform: "770 Broadway, Floor 8" - locality: "New York" - - locality: "New York" - region: "NY" - country: "US" - # Overture properties - theme: places - type: place - version: 0 - updateTime: "2023-02-22T23:55:01-08:00" diff --git a/docusaurus/docs/reference/buildings/part.mdx b/docusaurus/docs/reference/buildings/part.mdx new file mode 100644 index 00000000..4dfded22 --- /dev/null +++ b/docusaurus/docs/reference/buildings/part.mdx @@ -0,0 +1,51 @@ +--- +title: part +--- + +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 BuildingPartSchema from "!!raw-loader!@site/docs/_schema/buildings/part.yaml"; + +import BuildingPartExample from "!!raw-loader!@site/docs/_examples/buildings/building-part-basic.yaml"; + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + +# Building Part + + + + + + + + + + + + + + +
Geometry TypePolygon or MultiPolygon
Themebuildings
Typepart
+ + +## Schema + + + + + + + {BuildingPartSchema} + + + +## Examples + + + + { JSON.stringify(yamlLoad(BuildingPartExample), null, 2) } + + diff --git a/docusaurus/docs/reference/transportation/segment.mdx b/docusaurus/docs/reference/transportation/segment.mdx index 69fd2f70..64d346be 100644 --- a/docusaurus/docs/reference/transportation/segment.mdx +++ b/docusaurus/docs/reference/transportation/segment.mdx @@ -13,6 +13,9 @@ import ExampleTurnRestrictionConnector1 from '!!raw-loader!@site/docs/_examples/ import ExampleTurnRestrictionConnector2 from '!!raw-loader!@site/docs/_examples/transportation/docusaurus/turn-restriction-02-connector2.yaml'; import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; +import ThemedImage from '@theme/ThemedImage'; +import useBaseUrl from '@docusaurus/useBaseUrl'; + # segment @@ -131,7 +134,13 @@ The schema for `water` segments is under development.
-![Diagram of the "via" transition from source to destination segment.](/img/transportation/turn-restriction-02.svg) +
diff --git a/docusaurus/docs/themes/transportation/roads.mdx b/docusaurus/docs/themes/transportation/roads.mdx index d1c81ca5..fc5161e0 100644 --- a/docusaurus/docs/themes/transportation/roads.mdx +++ b/docusaurus/docs/themes/transportation/roads.mdx @@ -1,6 +1,8 @@ import CodeBlock from '@theme/CodeBlock'; import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; +import ThemedImage from '@theme/ThemedImage'; +import useBaseUrl from '@docusaurus/useBaseUrl'; import ExampleAccessRestrictionsBlanketDeny from '!!raw-loader!@site/docs/_examples/transportation/docusaurus/access-restriction-01-blanket.yaml'; import ExampleAccessRestrictionPrivateAccessWithDeliveries from '!!raw-loader!@site/docs/_examples/transportation/docusaurus/access-restriction-02-private-with-deliveries.yaml'; import ExampleAccessRestrictionMotorVehiclesDestinationOnly from '!!raw-loader!@site/docs/_examples/transportation/docusaurus/access-restriction-03-motor-vehicles-destination-only.yaml'; @@ -56,7 +58,7 @@ granularities. For example, a single road segment can represent: The `road.class` property of a road specifies its general purpose of use and its relative importance within the transportation network. The `road.class` property also helps establish reasonable default values. -For example, the class `footway` implies that the default +For example, the class `sidewalk` implies that the default [access restrictions](#access-restrictions) for the segment allow access for the [travel mode](travel-modes) `foot` and deny access to all other travel modes. @@ -202,7 +204,13 @@ where the sequence of maneuvers is important.
-![A simple transition restriction prohibiting a right turn](/img/transportation/turn-restriction-01.svg) +
@@ -284,7 +292,13 @@ real-world context to the example.*
-![A via restriction](/img/transportation/turn-restriction-02.svg) +
@@ -439,27 +453,57 @@ respectively.
-
+
-![West-oriented road segment with two lanes](/img/transportation/lane-number-01-west.svg) +
-
+
-![North-oriented road segment with two lanes](/img/transportation/lane-number-02-north.svg) +
+ +
-
+
+ +
-![East-oriented road segment with two lanes](/img/transportation/lane-number-03-east.svg) +
-
+
+ +
-![East-oriented road segment with two lanes](/img/transportation/lane-number-04-south.svg) +
@@ -586,7 +630,13 @@ segments.
-![A segment with two geometrically-scoped lane blocks connected to a segment oriented in the opposite direction](/img/transportation/lane-blocks.svg) +
diff --git a/docusaurus/docs/themes/transportation/scoping-rules.mdx b/docusaurus/docs/themes/transportation/scoping-rules.mdx index 598ec829..488086cd 100644 --- a/docusaurus/docs/themes/transportation/scoping-rules.mdx +++ b/docusaurus/docs/themes/transportation/scoping-rules.mdx @@ -1,6 +1,8 @@ import CodeBlock from '@theme/CodeBlock'; import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; +import ThemedImage from '@theme/ThemedImage'; +import useBaseUrl from '@docusaurus/useBaseUrl'; import ExampleGeometricScoping from '!!raw-loader!@site/docs/_examples/transportation/docusaurus/geometric-scoping.yaml'; import ExampleTemporalScoping from '!!raw-loader!@site/docs/_examples/transportation/docusaurus/temporal-scoping.yaml'; import ExampleSubjectiveUsagePurposeScoping from '!!raw-loader!@site/docs/_examples/transportation/docusaurus/subjective-usage-purpose-scoping.yaml'; @@ -60,7 +62,13 @@ start.
-![Diagram showing a single geometrically-scoped position.](/img/transportation/geometric-scoping-position.svg) +
@@ -83,7 +91,13 @@ length from the start.
-![Diagram showing a geometrically-scoped range.](/img/transportation/geometric-scoping-range.svg) +
diff --git a/docusaurus/docs/themes/transportation/shape-connectivity.mdx b/docusaurus/docs/themes/transportation/shape-connectivity.mdx index f6a3cac8..bab13247 100644 --- a/docusaurus/docs/themes/transportation/shape-connectivity.mdx +++ b/docusaurus/docs/themes/transportation/shape-connectivity.mdx @@ -1,3 +1,6 @@ +import ThemedImage from '@theme/ThemedImage'; +import useBaseUrl from '@docusaurus/useBaseUrl'; + # Shape and Connectivity The Overture Transportation theme captures the physical shape and connectivity @@ -9,7 +12,13 @@ types: Segments and Connectors.
-![Three segments physically joined by a connector](/img/transportation/network.svg) +
@@ -96,14 +105,24 @@ coordinates:
-![West-oriented segment geometry](/img/transportation/oriented-west.svg) +
+
+ *This segment geometry is oriented due west.* +
+
@@ -123,14 +142,24 @@ coordinates:
-![East-oriented segment geometry](/img/transportation/oriented-east.svg) +
+
+ *This segment geometry is oriented due east.* +
+
@@ -150,7 +179,13 @@ back toward the start of the segment.
-![Travel heading along a segment oriented due east](/img/transportation/heading.svg) +
@@ -204,7 +239,13 @@ order than a greater number.
-![Three segments physically joined by a connector](/img/transportation/levels.svg) +
@@ -292,14 +333,25 @@ segments remain as they were and no data needs to be re-conflated.
-![A city block without with back alley omitted](/img/transportation/interior-connectors-before.svg) - +
-![A city block without with back alley omitted](/img/transportation/interior-connectors-after.svg) +
@@ -341,7 +393,13 @@ less churn in conflated data.
-![A single segment with a geometrically-scoped speed limit](/img/transportation/geometrically-scoped-speed-limit.svg) +
@@ -370,13 +428,25 @@ can be corrected by splitting the segment into *N* pieces.
-![Illegal circular loop](/img/transportation/circle-looped.svg) +
-![Illegal circular loop](/img/transportation/circle-unlooped.svg) +
@@ -402,13 +472,25 @@ can be corrected by splitting the segment into *N* pieces.
-![Illegal self-crossing loop](/img/transportation/crossing-looped.svg) +
-![Correction to self-crossing loop](/img/transportation/crossing-unlooped.svg) +
diff --git a/docusaurus/docs/themes/transportation/travel-modes.mdx b/docusaurus/docs/themes/transportation/travel-modes.mdx index d9c07fa6..9eed7fc8 100644 --- a/docusaurus/docs/themes/transportation/travel-modes.mdx +++ b/docusaurus/docs/themes/transportation/travel-modes.mdx @@ -1,3 +1,6 @@ +import ThemedImage from '@theme/ThemedImage'; +import useBaseUrl from '@docusaurus/useBaseUrl'; + # Travel Modes In the real world, a travel mode can be thought of intuitively as a way @@ -174,21 +177,15 @@ in the diagram below.
-
- -
- -![The Overture travel modes taxonomy](/img/transportation/travel-modes-taxonomy.svg) - -
- -
- -![Legend graphic for Overture travel modes taxonomy](/img/transportation/travel-modes-legend.svg) - -
+
-
+
diff --git a/docusaurus/sidebars.js b/docusaurus/sidebars.js index 7460e56a..fccfbc13 100644 --- a/docusaurus/sidebars.js +++ b/docusaurus/sidebars.js @@ -77,6 +77,7 @@ const sidebars = { collapsed: false, items: [ 'reference/buildings/building', + 'reference/buildings/part' ] }, { diff --git a/docusaurus/src/YAML_FILE_TREE.js b/docusaurus/src/YAML_FILE_TREE.js index f80c0d27..01d9415a 100644 --- a/docusaurus/src/YAML_FILE_TREE.js +++ b/docusaurus/src/YAML_FILE_TREE.js @@ -7,6 +7,8 @@ const _default = { '/admins/locality.yaml': require('!!raw-loader!@site/docs/_schema/admins/locality.yaml'), '/buildings/building.yaml': require('!!raw-loader!@site/docs/_schema/buildings/building.yaml'), + '/buildings/part.yaml': require('!!raw-loader!@site/docs/_schema/buildings/part.yaml'), + '/buildings/defs.yaml': require('!!raw-loader!@site/docs/_schema/buildings/defs.yaml'), '/places/place.yaml': require('!!raw-loader!@site/docs/_schema/places/place.yaml'), diff --git a/docusaurus/static/img/transportation/circle-looped-dark.png b/docusaurus/static/img/transportation/circle-looped-dark.png new file mode 100644 index 00000000..bcefeb7c Binary files /dev/null and b/docusaurus/static/img/transportation/circle-looped-dark.png differ diff --git a/docusaurus/static/img/transportation/circle-looped-light.png b/docusaurus/static/img/transportation/circle-looped-light.png new file mode 100644 index 00000000..fc4eafed Binary files /dev/null and b/docusaurus/static/img/transportation/circle-looped-light.png differ diff --git a/docusaurus/static/img/transportation/circle-looped.svg b/docusaurus/static/img/transportation/circle-looped.svg deleted file mode 100644 index 79597693..00000000 --- a/docusaurus/static/img/transportation/circle-looped.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/docusaurus/static/img/transportation/circle-unlooped-dark.png b/docusaurus/static/img/transportation/circle-unlooped-dark.png new file mode 100644 index 00000000..c02808b5 Binary files /dev/null and b/docusaurus/static/img/transportation/circle-unlooped-dark.png differ diff --git a/docusaurus/static/img/transportation/circle-unlooped-light.png b/docusaurus/static/img/transportation/circle-unlooped-light.png new file mode 100644 index 00000000..ffdb0c35 Binary files /dev/null and b/docusaurus/static/img/transportation/circle-unlooped-light.png differ diff --git a/docusaurus/static/img/transportation/circle-unlooped.svg b/docusaurus/static/img/transportation/circle-unlooped.svg deleted file mode 100644 index ec4c2686..00000000 --- a/docusaurus/static/img/transportation/circle-unlooped.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/docusaurus/static/img/transportation/crossing-looped-dark.png b/docusaurus/static/img/transportation/crossing-looped-dark.png new file mode 100644 index 00000000..19acc8c1 Binary files /dev/null and b/docusaurus/static/img/transportation/crossing-looped-dark.png differ diff --git a/docusaurus/static/img/transportation/crossing-looped-light.png b/docusaurus/static/img/transportation/crossing-looped-light.png new file mode 100644 index 00000000..91f7caf9 Binary files /dev/null and b/docusaurus/static/img/transportation/crossing-looped-light.png differ diff --git a/docusaurus/static/img/transportation/crossing-looped.svg b/docusaurus/static/img/transportation/crossing-looped.svg deleted file mode 100644 index 66bba2a9..00000000 --- a/docusaurus/static/img/transportation/crossing-looped.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/docusaurus/static/img/transportation/crossing-unlooped-dark.png b/docusaurus/static/img/transportation/crossing-unlooped-dark.png new file mode 100644 index 00000000..827fe19b Binary files /dev/null and b/docusaurus/static/img/transportation/crossing-unlooped-dark.png differ diff --git a/docusaurus/static/img/transportation/crossing-unlooped-light.png b/docusaurus/static/img/transportation/crossing-unlooped-light.png new file mode 100644 index 00000000..ca329667 Binary files /dev/null and b/docusaurus/static/img/transportation/crossing-unlooped-light.png differ diff --git a/docusaurus/static/img/transportation/crossing-unlooped.svg b/docusaurus/static/img/transportation/crossing-unlooped.svg deleted file mode 100644 index a17fed5e..00000000 --- a/docusaurus/static/img/transportation/crossing-unlooped.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/docusaurus/static/img/transportation/geometric-scoping-position-dark.svg b/docusaurus/static/img/transportation/geometric-scoping-position-dark.svg new file mode 100644 index 00000000..2bd5a8c0 --- /dev/null +++ b/docusaurus/static/img/transportation/geometric-scoping-position-dark.svg @@ -0,0 +1,4 @@ + + + +
back
back
front
front
"at": 0.15
"at": 0.15
Text is not SVG - cannot display
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/geometric-scoping-position.svg b/docusaurus/static/img/transportation/geometric-scoping-position-light.svg similarity index 100% rename from docusaurus/static/img/transportation/geometric-scoping-position.svg rename to docusaurus/static/img/transportation/geometric-scoping-position-light.svg diff --git a/docusaurus/static/img/transportation/geometric-scoping-range-dark.svg b/docusaurus/static/img/transportation/geometric-scoping-range-dark.svg new file mode 100644 index 00000000..da7be3df --- /dev/null +++ b/docusaurus/static/img/transportation/geometric-scoping-range-dark.svg @@ -0,0 +1,4 @@ + + + +
back
back
front
front
"at": [0.35, 0.75]
"at": [0.35, 0.75]
Text is not SVG - cannot display
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/geometric-scoping-range.svg b/docusaurus/static/img/transportation/geometric-scoping-range-light.svg similarity index 100% rename from docusaurus/static/img/transportation/geometric-scoping-range.svg rename to docusaurus/static/img/transportation/geometric-scoping-range-light.svg diff --git a/docusaurus/static/img/transportation/geometric-scoping.svg b/docusaurus/static/img/transportation/geometric-scoping.svg deleted file mode 100644 index d0e1756b..00000000 --- a/docusaurus/static/img/transportation/geometric-scoping.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
back
back
front
front
"at": 0.15
"at": 0.15
"at": [0.35, 0.75]
"at": [0.35, 0.75]
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/geometrically-scoped-speed-limit-dark.png b/docusaurus/static/img/transportation/geometrically-scoped-speed-limit-dark.png new file mode 100644 index 00000000..55a7d1fe Binary files /dev/null and b/docusaurus/static/img/transportation/geometrically-scoped-speed-limit-dark.png differ diff --git a/docusaurus/static/img/transportation/geometrically-scoped-speed-limit-light.png b/docusaurus/static/img/transportation/geometrically-scoped-speed-limit-light.png new file mode 100644 index 00000000..b21f4a90 Binary files /dev/null and b/docusaurus/static/img/transportation/geometrically-scoped-speed-limit-light.png differ diff --git a/docusaurus/static/img/transportation/geometrically-scoped-speed-limit.svg b/docusaurus/static/img/transportation/geometrically-scoped-speed-limit.svg deleted file mode 100644 index 63a6bf4c..00000000 --- a/docusaurus/static/img/transportation/geometrically-scoped-speed-limit.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
speed limit: 60 mph
speed limit: 60 mph
speed limit: 30 mph
speed limit: 30 mph
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/heading-dark.svg b/docusaurus/static/img/transportation/heading-dark.svg new file mode 100644 index 00000000..0c51c2fe --- /dev/null +++ b/docusaurus/static/img/transportation/heading-dark.svg @@ -0,0 +1,4 @@ + + + +
forward heading
forward he...
backward heading
backward h...
segment orientation
segment orientation
Text is not SVG - cannot display
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/heading.svg b/docusaurus/static/img/transportation/heading-light.svg similarity index 100% rename from docusaurus/static/img/transportation/heading.svg rename to docusaurus/static/img/transportation/heading-light.svg diff --git a/docusaurus/static/img/transportation/interior-connectors-after-dark.png b/docusaurus/static/img/transportation/interior-connectors-after-dark.png new file mode 100644 index 00000000..abe34c27 Binary files /dev/null and b/docusaurus/static/img/transportation/interior-connectors-after-dark.png differ diff --git a/docusaurus/static/img/transportation/interior-connectors-after-light.png b/docusaurus/static/img/transportation/interior-connectors-after-light.png new file mode 100644 index 00000000..188e8876 Binary files /dev/null and b/docusaurus/static/img/transportation/interior-connectors-after-light.png differ diff --git a/docusaurus/static/img/transportation/interior-connectors-after.svg b/docusaurus/static/img/transportation/interior-connectors-after.svg deleted file mode 100644 index c2b4f8ab..00000000 --- a/docusaurus/static/img/transportation/interior-connectors-after.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/docusaurus/static/img/transportation/interior-connectors-before-dark.png b/docusaurus/static/img/transportation/interior-connectors-before-dark.png new file mode 100644 index 00000000..0fe1040c Binary files /dev/null and b/docusaurus/static/img/transportation/interior-connectors-before-dark.png differ diff --git a/docusaurus/static/img/transportation/interior-connectors-before-light.png b/docusaurus/static/img/transportation/interior-connectors-before-light.png new file mode 100644 index 00000000..060149ea Binary files /dev/null and b/docusaurus/static/img/transportation/interior-connectors-before-light.png differ diff --git a/docusaurus/static/img/transportation/interior-connectors-before.svg b/docusaurus/static/img/transportation/interior-connectors-before.svg deleted file mode 100644 index 0ed3706c..00000000 --- a/docusaurus/static/img/transportation/interior-connectors-before.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/docusaurus/static/img/transportation/lane-blocks-dark.png b/docusaurus/static/img/transportation/lane-blocks-dark.png new file mode 100644 index 00000000..6f1b1f3a Binary files /dev/null and b/docusaurus/static/img/transportation/lane-blocks-dark.png differ diff --git a/docusaurus/static/img/transportation/lane-blocks-light.png b/docusaurus/static/img/transportation/lane-blocks-light.png new file mode 100644 index 00000000..7ed92324 Binary files /dev/null and b/docusaurus/static/img/transportation/lane-blocks-light.png differ diff --git a/docusaurus/static/img/transportation/lane-blocks.svg b/docusaurus/static/img/transportation/lane-blocks.svg deleted file mode 100644 index 83b57adb..00000000 --- a/docusaurus/static/img/transportation/lane-blocks.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
Segment 1
Segment 1
Segment 2
Segment 2
Lane Block 1
(Segment 1)
Lane Block 1<br>(Segment 1)
Lane Block 2
(Segment 1)
Lane Block 2<br>(Segment 1)
lanes[0]
lanes[0]
lanes[1]
lanes[1]
lanes[2]
lanes[2]
lanes[1]
lanes[1]
lanes[0]
lanes[0]
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/lane-number-01-west-dark.png b/docusaurus/static/img/transportation/lane-number-01-west-dark.png new file mode 100644 index 00000000..6aaa98e4 Binary files /dev/null and b/docusaurus/static/img/transportation/lane-number-01-west-dark.png differ diff --git a/docusaurus/static/img/transportation/lane-number-01-west-light.png b/docusaurus/static/img/transportation/lane-number-01-west-light.png new file mode 100644 index 00000000..3ea4a8fb Binary files /dev/null and b/docusaurus/static/img/transportation/lane-number-01-west-light.png differ diff --git a/docusaurus/static/img/transportation/lane-number-01-west.svg b/docusaurus/static/img/transportation/lane-number-01-west.svg deleted file mode 100644 index 6dea0a17..00000000 --- a/docusaurus/static/img/transportation/lane-number-01-west.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
lanes[0]
lanes[0]
lanes[1]
lanes[1]
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/lane-number-02-north-dark.png b/docusaurus/static/img/transportation/lane-number-02-north-dark.png new file mode 100644 index 00000000..2c575cbb Binary files /dev/null and b/docusaurus/static/img/transportation/lane-number-02-north-dark.png differ diff --git a/docusaurus/static/img/transportation/lane-number-02-north-light.png b/docusaurus/static/img/transportation/lane-number-02-north-light.png new file mode 100644 index 00000000..a1eca4e4 Binary files /dev/null and b/docusaurus/static/img/transportation/lane-number-02-north-light.png differ diff --git a/docusaurus/static/img/transportation/lane-number-02-north.svg b/docusaurus/static/img/transportation/lane-number-02-north.svg deleted file mode 100644 index 662f754b..00000000 --- a/docusaurus/static/img/transportation/lane-number-02-north.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
lanes[0]
lanes[0]
lanes[1]
lanes[1]
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/lane-number-03-east-dark.png b/docusaurus/static/img/transportation/lane-number-03-east-dark.png new file mode 100644 index 00000000..f375d969 Binary files /dev/null and b/docusaurus/static/img/transportation/lane-number-03-east-dark.png differ diff --git a/docusaurus/static/img/transportation/lane-number-03-east-light.png b/docusaurus/static/img/transportation/lane-number-03-east-light.png new file mode 100644 index 00000000..f158e546 Binary files /dev/null and b/docusaurus/static/img/transportation/lane-number-03-east-light.png differ diff --git a/docusaurus/static/img/transportation/lane-number-03-east.svg b/docusaurus/static/img/transportation/lane-number-03-east.svg deleted file mode 100644 index dae0fadf..00000000 --- a/docusaurus/static/img/transportation/lane-number-03-east.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
lanes[0]
lanes[0]
lanes[1]
lanes[1]
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/lane-number-04-south-dark.png b/docusaurus/static/img/transportation/lane-number-04-south-dark.png new file mode 100644 index 00000000..92f5ba17 Binary files /dev/null and b/docusaurus/static/img/transportation/lane-number-04-south-dark.png differ diff --git a/docusaurus/static/img/transportation/lane-number-04-south-light.png b/docusaurus/static/img/transportation/lane-number-04-south-light.png new file mode 100644 index 00000000..bf66a814 Binary files /dev/null and b/docusaurus/static/img/transportation/lane-number-04-south-light.png differ diff --git a/docusaurus/static/img/transportation/lane-number-04-south.svg b/docusaurus/static/img/transportation/lane-number-04-south.svg deleted file mode 100644 index a7d005de..00000000 --- a/docusaurus/static/img/transportation/lane-number-04-south.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
lanes[0]
lanes[0]
lanes[1]
lanes[1]
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/level-dark.png b/docusaurus/static/img/transportation/level-dark.png new file mode 100644 index 00000000..69eb3c62 Binary files /dev/null and b/docusaurus/static/img/transportation/level-dark.png differ diff --git a/docusaurus/static/img/transportation/level-light.png b/docusaurus/static/img/transportation/level-light.png new file mode 100644 index 00000000..08e7f758 Binary files /dev/null and b/docusaurus/static/img/transportation/level-light.png differ diff --git a/docusaurus/static/img/transportation/levels.svg b/docusaurus/static/img/transportation/levels.svg deleted file mode 100644 index 397f2559..00000000 --- a/docusaurus/static/img/transportation/levels.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
A
A
level: 0
level: 0
level: -1
level: -1
B
B
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/network-dark.png b/docusaurus/static/img/transportation/network-dark.png new file mode 100644 index 00000000..e4fa45c3 Binary files /dev/null and b/docusaurus/static/img/transportation/network-dark.png differ diff --git a/docusaurus/static/img/transportation/network-light.png b/docusaurus/static/img/transportation/network-light.png new file mode 100644 index 00000000..b5458a8f Binary files /dev/null and b/docusaurus/static/img/transportation/network-light.png differ diff --git a/docusaurus/static/img/transportation/network.svg b/docusaurus/static/img/transportation/network.svg deleted file mode 100644 index 428c345a..00000000 --- a/docusaurus/static/img/transportation/network.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/docusaurus/static/img/transportation/oriented-east-dark.svg b/docusaurus/static/img/transportation/oriented-east-dark.svg new file mode 100644 index 00000000..5a2bc449 --- /dev/null +++ b/docusaurus/static/img/transportation/oriented-east-dark.svg @@ -0,0 +1,4 @@ + + + +
[1, 0]
[1, 0]
[0, 0]
[0, 0]
[-1, 0]
[-1, 0]
Text is not SVG - cannot display
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/oriented-east.svg b/docusaurus/static/img/transportation/oriented-east-light.svg similarity index 100% rename from docusaurus/static/img/transportation/oriented-east.svg rename to docusaurus/static/img/transportation/oriented-east-light.svg diff --git a/docusaurus/static/img/transportation/oriented-west-dark.svg b/docusaurus/static/img/transportation/oriented-west-dark.svg new file mode 100644 index 00000000..f59ecfd2 --- /dev/null +++ b/docusaurus/static/img/transportation/oriented-west-dark.svg @@ -0,0 +1,4 @@ + + + +
[1, 0]
[1, 0]
[0, 0]
[0, 0]
[-1, 0]
[-1, 0]
Text is not SVG - cannot display
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/oriented-west.svg b/docusaurus/static/img/transportation/oriented-west-light.svg similarity index 100% rename from docusaurus/static/img/transportation/oriented-west.svg rename to docusaurus/static/img/transportation/oriented-west-light.svg diff --git a/docusaurus/static/img/transportation/roads-lane-numbering-dark.png b/docusaurus/static/img/transportation/roads-lane-numbering-dark.png new file mode 100644 index 00000000..51a67774 Binary files /dev/null and b/docusaurus/static/img/transportation/roads-lane-numbering-dark.png differ diff --git a/docusaurus/static/img/transportation/travel-modes-dark.png b/docusaurus/static/img/transportation/travel-modes-dark.png new file mode 100644 index 00000000..6b1b997c Binary files /dev/null and b/docusaurus/static/img/transportation/travel-modes-dark.png differ diff --git a/docusaurus/static/img/transportation/travel-modes-legend.svg b/docusaurus/static/img/transportation/travel-modes-legend.svg deleted file mode 100644 index 1f2073a5..00000000 --- a/docusaurus/static/img/transportation/travel-modes-legend.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
Legend
[Not supported by viewer]
[group]
[group]
mode
mode
Conceptual grouping only, not present in schema
Conceptual grouping only, not present in schema
Supported travel mode
Supported travel mode
a
a
b
b
Mode b is contained in mode a
[Not supported by viewer]
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/travel-modes-light.png b/docusaurus/static/img/transportation/travel-modes-light.png new file mode 100644 index 00000000..28d7db7b Binary files /dev/null and b/docusaurus/static/img/transportation/travel-modes-light.png differ diff --git a/docusaurus/static/img/transportation/travel-modes-taxonomy.svg b/docusaurus/static/img/transportation/travel-modes-taxonomy.svg deleted file mode 100644 index 0364bdb4..00000000 --- a/docusaurus/static/img/transportation/travel-modes-taxonomy.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
[any]
[any]
foot
foot
vehicle
vehicle
bicycle
bicycle
motorVehicle
motorVehicle
motorcycle
motorcycle
car
car
hov
hov
hgv
hgv
bus
bus
emergency
emergency
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/turn-restriction-01-dark.png b/docusaurus/static/img/transportation/turn-restriction-01-dark.png new file mode 100644 index 00000000..0d6c1e40 Binary files /dev/null and b/docusaurus/static/img/transportation/turn-restriction-01-dark.png differ diff --git a/docusaurus/static/img/transportation/turn-restriction-01-light.png b/docusaurus/static/img/transportation/turn-restriction-01-light.png new file mode 100644 index 00000000..12b58562 Binary files /dev/null and b/docusaurus/static/img/transportation/turn-restriction-01-light.png differ diff --git a/docusaurus/static/img/transportation/turn-restriction-01.svg b/docusaurus/static/img/transportation/turn-restriction-01.svg deleted file mode 100644 index e7c0a57a..00000000 --- a/docusaurus/static/img/transportation/turn-restriction-01.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
1
1
3
3
2
2
target segment
target segment
source segment
source segment
right turn prohibited
right turn prohibited
exit segment
(allowed)
[Not supported by viewer]
\ No newline at end of file diff --git a/docusaurus/static/img/transportation/turn-restriction-02-dark.png b/docusaurus/static/img/transportation/turn-restriction-02-dark.png new file mode 100644 index 00000000..95061bb5 Binary files /dev/null and b/docusaurus/static/img/transportation/turn-restriction-02-dark.png differ diff --git a/docusaurus/static/img/transportation/turn-restriction-02-light.png b/docusaurus/static/img/transportation/turn-restriction-02-light.png new file mode 100644 index 00000000..4937f81f Binary files /dev/null and b/docusaurus/static/img/transportation/turn-restriction-02-light.png differ diff --git a/docusaurus/static/img/transportation/turn-restriction-02.svg b/docusaurus/static/img/transportation/turn-restriction-02.svg deleted file mode 100644 index 500c67e5..00000000 --- a/docusaurus/static/img/transportation/turn-restriction-02.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
source segment
source segment
via segment
via segment
target segment
target segment
U-turn prohibited
U-turn prohibited
2
2
1
1
\ No newline at end of file diff --git a/examples/buildings/building-part-basic.yaml b/examples/buildings/building-part-basic.yaml new file mode 100644 index 00000000..664784ba --- /dev/null +++ b/examples/buildings/building-part-basic.yaml @@ -0,0 +1,34 @@ +--- +id: overture:buildings:part:1234 +type: Feature +geometry: + type: Polygon + coordinates: [[ + [-77.036873, 38.897804], + [-77.036873, 38.897559], + [-77.036260, 38.897559], + [-77.036260, 38.897804], + [-77.036873, 38.897804] + ]] +properties: + # Custom user properties. + extFoo: I am a customer user property. + extBar: Me too! + # Overture properties + theme: buildings + type: part + version: 1 + level: 1 + updateTime: "2023-06-06T10:30:00-08:00" + buildingId: abc123 + height: 21.34 + numFloors: 4 + minHeight: 15.0 + roofShape: dome + roofOrientation: across + roofDirection: 23.4 + sources: + - property: "" + dataset: microsoftMLBuildings + - property: /properties/height + dataset: metaLidarExtractions diff --git a/examples/buildings/osm/outline.yaml b/examples/buildings/osm/outline.yaml new file mode 100644 index 00000000..a497dbb4 --- /dev/null +++ b/examples/buildings/osm/outline.yaml @@ -0,0 +1,33 @@ +# https://www.openstreetmap.org/way/30407741 +id: overture:buildings:building:1234 +type: Feature +geometry: + type: Polygon + coordinates: [[ + [-117.1710888, 32.7238481], + [-117.1711025, 32.7239038], + [-117.1711923, 32.7238882], + [-117.1712198, 32.724], + [-117.1712713, 32.7242091], + [-117.1706665, 32.7243145], + [-117.1705738, 32.7239379], + [-117.1707783, 32.7239022], + [-117.1710888, 32.7238481] + ]] +properties: + extFoo: I am a customer user property. + extBar: Me too! + theme: buildings + type: building + version: 1 + level: 1 + updateTime: '2023-06-06T10:30:00-08:00' + names: + common: + - value: Valentina by Alta + language: local + numFloors: 8 + class: commercial + sources: + - property: '' + dataset: OpenStreetMap diff --git a/examples/buildings/osm/part1.yaml b/examples/buildings/osm/part1.yaml new file mode 100644 index 00000000..a835667a --- /dev/null +++ b/examples/buildings/osm/part1.yaml @@ -0,0 +1,30 @@ +id: overture:buildings:part:100 +type: Feature +geometry: + type: Polygon + coordinates: [[ + [-117.1707971, 32.7240658], + [-117.1712198, 32.724], + [-117.1712713, 32.7242091], + [-117.1706665, 32.7243145], + [-117.1705738, 32.7239379], + [-117.1707783, 32.7239022], + [-117.1707949, 32.7240226], + [-117.1707279, 32.7240319], + [-117.1707635, 32.7241786], + [-117.1708208, 32.7241677], + [-117.1707971, 32.7240658] + ]] +properties: + buildingId: '1234' + extFoo: I am a customer user property. + extBar: Me too! + theme: buildings + type: part + version: 1 + level: 1 + updateTime: '2023-06-06T10:30:00-08:00' + numFloors: 8 + sources: + - property: '' + dataset: OpenStreetMap diff --git a/examples/buildings/osm/part2.yaml b/examples/buildings/osm/part2.yaml new file mode 100644 index 00000000..a43e54d0 --- /dev/null +++ b/examples/buildings/osm/part2.yaml @@ -0,0 +1,30 @@ +id: overture:buildings:part:101 +type: Feature +geometry: + type: Polygon + coordinates: [[ + [-117.1712198, 32.724], + [-117.1711923, 32.7238882], + [-117.1711025, 32.7239038], + [-117.1710888, 32.7238481], + [-117.1707783, 32.7239022], + [-117.1707949, 32.7240226], + [-117.1707279, 32.7240319], + [-117.1707635, 32.7241786], + [-117.1708208, 32.7241677], + [-117.1707971, 32.7240658], + [-117.1712198, 32.724] + ]] +properties: + buildingId: '1234' + extFoo: I am a customer user property. + extBar: Me too! + theme: buildings + type: part + version: 1 + level: 1 + updateTime: '2023-06-06T10:30:00-08:00' + numFloors: 3 + sources: + - property: '' + dataset: OpenStreetMap diff --git a/examples/transportation/segment/road/road-with-lr-name.yaml b/examples/transportation/segment/road/road-with-lr-name.yaml index e9184335..aebcf5d0 100644 --- a/examples/transportation/segment/road/road-with-lr-name.yaml +++ b/examples/transportation/segment/road/road-with-lr-name.yaml @@ -20,7 +20,7 @@ properties: roadNames: - at: - 0 - - 50 + - 0.5 common: - value: Common Road Name 1 language: local @@ -28,8 +28,8 @@ properties: - value: SRN1 language: local - at: - - 50 - - 100 + - 0.5 + - 1 common: - value: Common Road Name 2 language: local diff --git a/examples/transportation/segment/road/sidewalk.yaml b/examples/transportation/segment/road/sidewalk.yaml new file mode 100644 index 00000000..df06969c --- /dev/null +++ b/examples/transportation/segment/road/sidewalk.yaml @@ -0,0 +1,16 @@ +--- +id: overture:transportation:segment:999 +type: Feature +geometry: + type: LineString + coordinates: [[0, 0], [1, 1]] +properties: + theme: transportation + type: segment + updateTime: "2023-11-13T00:02:30-08:00" + version: 0 + subType: road + connectors: [fooConnector, barConnector] + road: + class: sidewalk + surface: paved diff --git a/schema/base/landUse.yaml b/schema/base/landUse.yaml index 7d472e6f..732c24e2 100644 --- a/schema/base/landUse.yaml +++ b/schema/base/landUse.yaml @@ -32,7 +32,7 @@ properties: - airport - aquaculture - campground - - cemetary + - cemetery - conservation - construction - developed diff --git a/schema/buildings/building.yaml b/schema/buildings/building.yaml index 9ec6b712..15e00747 100644 --- a/schema/buildings/building.yaml +++ b/schema/buildings/building.yaml @@ -19,18 +19,11 @@ properties: properties: unevaluatedProperties: false allOf: + - "$ref": ./defs.yaml#/shapeContainer - "$ref": ../defs.yaml#/$defs/propertyContainers/overtureFeaturePropertiesContainer - "$ref": ../defs.yaml#/$defs/propertyContainers/levelContainer properties: names: { "$ref": "../defs.yaml#/$defs/propertyDefinitions/names" } - height: - description: Height of the building in meters - type: number - exclusiveMinimum: 0 - numFloors: - description: Number of above-ground floors of the building - type: integer - exclusiveMinimum: 0 class: description: >- A broad category of the building type / purpose. When the current use of the building does not match the built purpose, the class should @@ -50,3 +43,6 @@ properties: - medical - entertainment - military + hasParts: + description: Flag indicating whether the building has parts + type: boolean diff --git a/schema/buildings/defs.yaml b/schema/buildings/defs.yaml new file mode 100644 index 00000000..069c87c4 --- /dev/null +++ b/schema/buildings/defs.yaml @@ -0,0 +1,92 @@ +--- +"$schema": https://json-schema.org/draft/2020-12/schema +title: Overture Maps Shared Building Properties +description: Common schema definitions shared by building footprints and building parts +shapeContainer: + title: Shape + description: Properties of the buildings shape, such as height or roof type. + properties: + height: + description: >- + Height of the building or part in meters. The height is the distance from the lowest point to the highest point. + type: number + exclusiveMinimum: 0 + numFloors: + description: >- + Number of above-ground floors of the building or part. + type: integer + exclusiveMinimum: 0 + minHeight: + description: >- + The height of the bottom part of building in meters. Used if a building or part of building starts above the ground level. + type: number + facadeColor: + description: >- + The color (name or color triplet) of the facade of a building or building part in hexadecimal + type: string + facadeMaterial: + description: >- + The outer surface material of building facade. + type: string + enum: + - brick + - cement_block + - concrete + - glass + - metal + - mud + - plaster + - plastic + - stone + - wood + roofMaterial: + description: >- + The outermost material of the roof. + type: string + enum: + - concrete + - copper + - eternit + - glass + - grass + - metal + - plastic + - roof_tiles + - slate + - tar_paper + - thatch + - wood + roofShape: + description: The shape of the roof + type: string + enum: + - dome + - flat + - gable + - gambrel + - half-hip + - hip + - mansard + - onion + - pyramid + - round + - spherical + roofDirection: + description: >- + Bearing of the roof ridge line. + type: number + exclusiveMinimum: 0 + exclusiveMaximum: 360 + roofOrientation: + description: >- + Orientation of the roof shape relative to the footprint shape. Either "along" or "across". + type: string + enum: + - across + - along + roofColor: + description: The color (name or color triplet) of the roof of a building or building part in hexadecimal + type: string + eaveHeight: + description: The height of the building eave in meters + type: number diff --git a/schema/buildings/part.yaml b/schema/buildings/part.yaml new file mode 100644 index 00000000..2e8264b7 --- /dev/null +++ b/schema/buildings/part.yaml @@ -0,0 +1,26 @@ +--- +"$schema": https://json-schema.org/draft/2020-12/schema +title: Building Part Schema +description: >- + A single building part. Parts describe their shape and color and other properties. Each + building part must contain the building with which it is associated. +type: object +properties: + geometry: + description: >- + The part's geometry. It must be a polygon or multipolygon. + unevaluatedProperties: false + oneOf: + - "$ref": https://geojson.org/schema/Polygon.json + - "$ref": https://geojson.org/schema/MultiPolygon.json + properties: + unevaluatedProperties: false + allOf: + - "$ref": ./defs.yaml#/shapeContainer + - "$ref": ../defs.yaml#/$defs/propertyContainers/overtureFeaturePropertiesContainer + - "$ref": ../defs.yaml#/$defs/propertyContainers/levelContainer + required: [buildingId] + properties: + buildingId: + description: The building ID to which this part belongs + type: string diff --git a/schema/defs.yaml b/schema/defs.yaml index c0566e85..71ad04a9 100644 --- a/schema/defs.yaml +++ b/schema/defs.yaml @@ -22,6 +22,7 @@ description: Common schema definitions shared by all themes - land - landUse - locality + - part - place - segment - water @@ -105,7 +106,7 @@ description: Common schema definitions shared by all themes center-line segment. type: number minimum: 0 - maxiumum: 1 + maximum: 1 "$comment": >- One possible advantage to using percentages over absolute distances is being able to trivially validate that the position @@ -231,15 +232,14 @@ description: Common schema definitions shared by all themes address: type: object unevaluatedProperties: false - required: [freeform] properties: - freeform: # TODO: Should probably be renamed freeForm, as free-form is a two-word hyphenated construct. + freeform: description: Free-form address that contains street name, house number and other address info type: string locality: description: Name of the City or Neighborhood where the address is located type: string - postCode: + postcode: description: Post code where the address is located type: string region: diff --git a/schema/schema.yaml b/schema/schema.yaml index f3a753e2..cbfdfe89 100644 --- a/schema/schema.yaml +++ b/schema/schema.yaml @@ -42,6 +42,14 @@ oneOf: type: { enum: [building] } then: { "$ref": buildings/building.yaml } else: { propertyNames: false } + - if: + properties: + properties: + properties: + theme: { enum: [buildings] } + type: { enum: [part] } + then: { "$ref": buildings/part.yaml } + else: { propertyNames: false } - if: properties: properties: diff --git a/schema/transportation/segment.yaml b/schema/transportation/segment.yaml index 5dd337f7..f86ee4c9 100644 --- a/schema/transportation/segment.yaml +++ b/schema/transportation/segment.yaml @@ -133,6 +133,8 @@ properties: - driveway # service road intended for deliveries - pedestrian - footway + - sidewalk + - crosswalk - steps - track - cycleway diff --git a/task-force-docs/places/overture_categories.csv b/task-force-docs/places/overture_categories.csv index e15052bf..2c1c22b9 100644 --- a/task-force-docs/places/overture_categories.csv +++ b/task-force-docs/places/overture_categories.csv @@ -128,7 +128,7 @@ buffet_restaurant;[eat_and_drink,restaurant,buffet_restaurant] barbecue_restaurant;[eat_and_drink,restaurant,barbecue_restaurant] burger_restaurant;[eat_and_drink,restaurant,burger_restaurant] canteen;[eat_and_drink,restaurant,canteen] -cafetaria;[eat_and_drink,restaurant,cafetaria] +cafeteria;[eat_and_drink,restaurant,cafeteria] cheesesteak_restaurant;[eat_and_drink,restaurant,cheesesteak_restaurant] chicken_restaurant;[eat_and_drink,restaurant,chicken_restaurant] chicken_wings_restaurant;[eat_and_drink,restaurant,chicken_wings_restaurant]