Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
78 changes: 42 additions & 36 deletions json-schema/MF-JSON_Prism.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,16 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "http://www.opengis.net/spec/movingfeatures/json/1.0/prism/MF-JSON_Prism.schema.json",
"title": "OGC Moving Feature JSON Prism schema",
"oneOf":[
{"$ref": "#/definitions/temporalGeometry"},
{"$ref": "#/definitions/temporalProperties"},
{"$ref": "#/definitions/crs"},
{"$ref": "#/definitions/trs"},
{"$ref": "#/definitions/movingFeature"},
{"$ref": "#/definitions/movingFeatureCollection"},
{"$ref": "#/definitions/time"},
{"$ref": "#/definitions/bbox"},
{"$ref": "#/definitions/geometry"},
{"$ref": "#/definitions/geometryInterpolation"}
],
"type": "object",
"$ref": "#/definitions/mfjsonPrism",
"definitions": {
"mfjsonPrism": {
"$id": "#/definitions/mfjsonPrism",
"oneOf": [
{"$ref": "#/definitions/movingFeature"},
{"$ref": "#/definitions/movingFeatureCollection"}
]
},
"temporalGeometry": {
"$id": "#/definitions/temporalGeometry",
"title": "TemporalGeometry Object",
Expand All @@ -34,7 +31,7 @@
"title": "Coordinate Reference System",
"type": "object",
"required": ["type", "properties"],
"oneOf":[
"oneOf": [
{"$ref": "#/definitions/namedCRS"},
{"$ref": "#/definitions/linkedCRS"}
]
Expand All @@ -44,7 +41,7 @@
"title": "Temporal Coordinate Reference System",
"type": "object",
"required": ["type", "properties"],
"oneOf":[
"oneOf": [
{"$ref": "#/definitions/namedTRS"},
{"$ref": "#/definitions/linkedCRS"}
]
Expand All @@ -63,8 +60,8 @@
"crs": {"$ref": "#/definitions/crs"},
"trs": {"$ref": "#/definitions/trs"},
"temporalProperties": {"$ref": "#/definitions/temporalProperties"},
"bbox": {"$ref": "#/definitions/bbox"},
"time": {"$ref": "#/definitions/time"},
"bbox": {"$ref": "#/definitions/boundingBox"},
"time": {"$ref": "#/definitions/lifeSpan"},
"geometry": {"$ref": "#/definitions/geometry"},
"properties": {"$ref": "#/definitions/properties"},
"id": {
Expand Down Expand Up @@ -93,13 +90,13 @@
},
"crs": {"$ref": "#/definitions/crs"},
"trs": {"$ref": "#/definitions/trs"},
"bbox": {"$ref": "#/definitions/bbox"},
"time": {"$ref": "#/definitions/time"},
"bbox": {"$ref": "#/definitions/boundingBox"},
"time": {"$ref": "#/definitions/lifeSpan"},
"label": {"type": ["null", "string"]}
}
},
"lifeSpan": {
"$id": "#/definitions/time",
"$id": "#/definitions/lifeSpan",
"title": "LifeSpan Object",
"type": ["null", "array"],
"minItems": 2,
Expand All @@ -108,7 +105,7 @@
"items": {"type": "string"}
},
"boundingBox": {
"$id": "#/definitions/bbox",
"$id": "#/definitions/boundingBox",
"title": "BoundingBox Object",
"type": ["null", "array"],
"minItems": 4,
Expand Down Expand Up @@ -189,9 +186,9 @@
}
]
},
"interpolation": {"$ref": "#/definitions/geometryInterpolation"},
"interpolation": {"$ref": "#/definitions/motionCurve"},
"base": {
"oneOf":[
"oneOf": [
{"type": "null"},
{
"type": "object",
Expand All @@ -212,9 +209,9 @@
}
},
"motionCurve": {
"$id": "#/definitions/geometryInterpolation",
"$id": "#/definitions/motionCurve",
"title": "Interpolation method for TemporalPrimitiveGeometry",
"oneOf":[
"oneOf": [
{
"type": "string",
"enum": ["Discrete", "Step", "Linear", "Quadratic", "Cubic"],
Expand All @@ -241,7 +238,7 @@
"trs": {"$ref": "#/definitions/trs"}
}
},
"orientation":{
"orientation": {
"$id": "#/definitions/orientation",
"type": "object",
"required": ["scales", "angles"],
Expand All @@ -258,14 +255,14 @@
"maxItems": 3,
"items": {"type": "number"}
}
},
}
},
"prametricValues": {
"$id": "#/definitions/prametricValues",
"type": "object",
"required": ["datetimes"],
"properties": {
"datetimes": {"$ref": "#/definitions/datetimes"}
"datetimes": {"$ref": "#/definitions/prametricValuesDatetimes"}
},
"patternProperties": {
"^S_": {
Expand All @@ -277,20 +274,29 @@
}
}
},
"prametricValuesDatetimes": {
"$id": "#/definitions/prametricValuesDatetimes",
"type": [ "null", "array" ],
"uniqueItems": true,
"minItems": 1,
"items": {
"type": "string"
}
},
"measureType": {
"$id": "#/definitions/measureType",
"type": "object",
"required": ["type", "values"],
"properties": {
"type": {"type": "string", "enum": ["Measure"]},
"values": {"type": "array", "items": {"type": ["null", "number"]}},
"values": {"type": ["null", "array"], "items": {"type": ["null", "number"]}},
"interpolation": {"$ref": "#/definitions/propertyInterpolation"},
"form": {
"oneOf": [
{"type": "string", "minLength": 3, "maxLength": 3},
{"type": "string", "format": "uri"}
]
},
"oneOf": [
{"type": "string", "minLength": 3, "maxLength": 3},
{"type": "string", "format": "uri"}
]
},
"description": {"type": "string"}
}
},
Expand All @@ -300,7 +306,7 @@
"required": ["type", "values"],
"properties": {
"type": {"type": "string", "enum": ["Text"]},
"values": {"type": "array", "items": {"type": ["null", "string", "boolean"]}},
"values": {"type": ["null", "array"], "items": {"type": ["null", "string", "boolean"]}},
"interpolation": {"$ref": "#/definitions/propertyInterpolation"},
"description": {"type": "string"}
}
Expand All @@ -311,7 +317,7 @@
"required": ["type", "values"],
"properties": {
"type": {"type": "string", "enum": ["Image"]},
"values": {"type": "array", "items": {"type": ["null", "string"]}},
"values": {"type": ["null", "array"], "items": {"type": ["null", "string"]}},
"interpolation": {
"$ref": "#/definitions/propertyInterpolation"
},
Expand All @@ -321,7 +327,7 @@
"propertyInterpolation": {
"$id": "#/definitions/propertyInterpolation",
"title": "Interpolation method for ParametricValues",
"oneOf":[
"oneOf": [
{
"type": "string",
"enum": ["Discrete", "Step", "Linear", "Regression"],
Expand Down
12 changes: 8 additions & 4 deletions json-schema/MF-JSON_Trajectory.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
"type": "object",
"title": "OGC Moving Feature JSON Trajecotry schema",
"required": [ "type" ],
"oneOf":[
{"$ref": "#/definitions/feature"},
{"$ref": "#/definitions/featureCollection"}
],
"$ref": "#/definitions/mfjsonTrajectory",
"definitions": {
"mfjsonTrajectory": {
"$id": "#/definitions/mfjsonTrajectory",
"oneOf":[
{"$ref": "#/definitions/feature"},
{"$ref": "#/definitions/featureCollection"}
],
},
"feature": {
"title": "Feature",
"description": "A MF-JSON trajectory feature",
Expand Down
2 changes: 1 addition & 1 deletion json-schema/mf_prism_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"base": {
"type": "glTF",
"href": "http://www.opengis.net/spec/movingfeatures/json/1.0/prism/example/car3dmodel.gltf"
},
}
},
"temporalProperties": [
{
Expand Down