Commit 78a5a9aa authored by David Diederich's avatar David Diederich
Browse files

Merge remote-tracking branch 'origin/master' into dependency-upgrade

parents edc45ba2 2a9431bd
Pipeline #102547 failed with stages
in 237 minutes and 42 seconds
......@@ -362,7 +362,7 @@ The following software have components provided under the terms of this license:
- Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
- Jakarta Bean Validation API (from https://beanvalidation.org)
- Java Libraries for Amazon Simple WorkFlow (from https://aws.amazon.com/sdkforjava)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna, https://repo1.maven.org/maven2/net/java/dev/jna/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
- Javassist (from http://www.javassist.org/)
......@@ -724,7 +724,7 @@ LGPL-2.1-only
========================================================================
The following software have components provided under the terms of this license:
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna, https://repo1.maven.org/maven2/net/java/dev/jna/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/)
- Logback Classic Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
......
curl -X DELETE -u $IBM_QA_DB_USER:$IBM_QA_DB_PASSWORD $IBM_QA_DB_URL/oc-cpd-dataecosystem-opendes-schema2
curl -X DELETE -u $IBM_QA_DB_USER:$IBM_QA_DB_PASSWORD $IBM_QA_DB_URL/oc-cpd-dataecosystem-common-schema2
export IBM_SCHEMA_URL=$IBM_SCHEMA_HOST/api/schema-service/v1/schema
BEARER_TOKEN=`python $IBM_DEPLOYMENTS_SUBDIR/Token.py`
export BEARER_TOKEN=$BEARER_TOKEN
......
......@@ -38,7 +38,7 @@
"description": "The CRS reference into the CoordinateReferenceSystem catalog.",
"type": "string",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-CoordinateReferenceSystem:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"example": "namespace:reference-data--CoordinateReferenceSystem:BoundCRS.SLB.32021.15851:",
"example": "namespace:reference-data--CoordinateReferenceSystem:BoundProjected:EPSG::32021_EPSG::15851:",
"x-osdu-relationship": [
{
"GroupType": "reference-data",
......@@ -51,7 +51,7 @@
"description": "The explicit VerticalCRS reference into the CoordinateReferenceSystem catalog. This property stays empty for 2D geometries. Absent or empty values for 3D geometries mean the context may be provided by a CompoundCRS in 'CoordinateReferenceSystemID' or implicitly EPSG:5714 MSL height",
"type": "string",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-CoordinateReferenceSystem:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"example": "namespace:reference-data--CoordinateReferenceSystem:VerticalCRS.EPSG.5773:",
"example": "namespace:reference-data--CoordinateReferenceSystem:Vertical:EPSG::5714:",
"x-osdu-relationship": [
{
"GroupType": "reference-data",
......@@ -63,13 +63,13 @@
"type": "string",
"title": "CRS Reference",
"description": "The CRS reference as persistableReference string. If populated, the CoordinateReferenceSystemID takes precedence.",
"example": "{\"lateBoundCRS\":{\"wkt\":\"PROJCS[\\\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],PROJECTION[\\\"Lambert_Conformal_Conic\\\"],PARAMETER[\\\"False_Easting\\\",2000000.0],PARAMETER[\\\"False_Northing\\\",0.0],PARAMETER[\\\"Central_Meridian\\\",-100.5],PARAMETER[\\\"Standard_Parallel_1\\\",46.1833333333333],PARAMETER[\\\"Standard_Parallel_2\\\",47.4833333333333],PARAMETER[\\\"Latitude_Of_Origin\\\",45.6666666666667],UNIT[\\\"Foot_US\\\",0.304800609601219],AUTHORITY[\\\"EPSG\\\",32021]]\",\"ver\":\"PE_10_3_1\",\"name\":\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"32021\"},\"type\":\"LBC\"},\"singleCT\":{\"wkt\":\"GEOGTRAN[\\\"NAD_1927_To_WGS_1984_79_CONUS\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],METHOD[\\\"NADCON\\\"],PARAMETER[\\\"Dataset_conus\\\",0.0],AUTHORITY[\\\"EPSG\\\",15851]]\",\"ver\":\"PE_10_3_1\",\"name\":\"NAD_1927_To_WGS_1984_79_CONUS\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"15851\"},\"type\":\"ST\"},\"ver\":\"PE_10_3_1\",\"name\":\"NAD27 * OGP-Usa Conus / North Dakota South [32021,15851]\",\"authCode\":{\"auth\":\"SLB\",\"code\":\"32021079\"},\"type\":\"EBC\"}"
"example": "{\"authCode\":{\"auth\":\"OSDU\",\"code\":\"32021079\"},\"lateBoundCRS\":{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"32021\"},\"name\":\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\",\"type\":\"LBC\",\"ver\":\"PE_10_9_1\",\"wkt\":\"PROJCS[\\\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],PROJECTION[\\\"Lambert_Conformal_Conic\\\"],PARAMETER[\\\"False_Easting\\\",2000000.0],PARAMETER[\\\"False_Northing\\\",0.0],PARAMETER[\\\"Central_Meridian\\\",-100.5],PARAMETER[\\\"Standard_Parallel_1\\\",46.18333333333333],PARAMETER[\\\"Standard_Parallel_2\\\",47.48333333333333],PARAMETER[\\\"Latitude_Of_Origin\\\",45.66666666666666],UNIT[\\\"Foot_US\\\",0.3048006096012192],AUTHORITY[\\\"EPSG\\\",32021]]\"},\"name\":\"NAD27 * OGP-Usa Conus / North Dakota CS27 South zone [32021,15851]\",\"singleCT\":{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"15851\"},\"name\":\"NAD_1927_To_WGS_1984_79_CONUS\",\"type\":\"ST\",\"ver\":\"PE_10_9_1\",\"wkt\":\"GEOGTRAN[\\\"NAD_1927_To_WGS_1984_79_CONUS\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],METHOD[\\\"NADCON\\\"],PARAMETER[\\\"Dataset_conus\\\",0.0],OPERATIONACCURACY[5.0],AUTHORITY[\\\"EPSG\\\",15851]]\"},\"type\":\"EBC\",\"ver\":\"PE_10_9_1\"}"
},
"persistableReferenceVerticalCrs": {
"type": "string",
"title": "Vertical CRS Reference",
"description": "The VerticalCRS reference as persistableReference string. If populated, the VerticalCoordinateReferenceSystemID takes precedence. The property is null or empty for 2D geometries. For 3D geometries and absent or null persistableReferenceVerticalCrs the vertical CRS is either provided via persistableReferenceCrs's CompoundCRS or it is implicitly defined as EPSG:5714 MSL height.",
"example": "{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"5773\"},\"type\":\"LBC\",\"ver\":\"PE_10_3_1\",\"name\":\"EGM96_Geoid\",\"wkt\":\"VERTCS[\\\"EGM96_Geoid\\\",VDATUM[\\\"EGM96_Geoid\\\"],PARAMETER[\\\"Vertical_Shift\\\",0.0],PARAMETER[\\\"Direction\\\",1.0],UNIT[\\\"Meter\\\",1.0],AUTHORITY[\\\"EPSG\\\",5773]]\"}"
"example": "{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"5714\"},\"name\":\"MSL_Height\",\"type\":\"LBC\",\"ver\":\"PE_10_9_1\",\"wkt\":\"VERTCS[\\\"MSL_Height\\\",VDATUM[\\\"Mean_Sea_Level\\\"],PARAMETER[\\\"Vertical_Shift\\\",0.0],PARAMETER[\\\"Direction\\\",1.0],UNIT[\\\"Meter\\\",1.0],AUTHORITY[\\\"EPSG\\\",5714]]\"}"
},
"persistableReferenceUnitZ": {
"type": "string",
......
......@@ -15,6 +15,7 @@
},
"schema": {
"x-osdu-license": "Copyright 2022, The Open Group \\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.",
"x-osdu-review-status": "Accepted",
"$id": "https://schema.osdu.opengroup.org/json/abstract/AbstractBusinessRule.1.0.0.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"x-osdu-schema-source": "osdu:wks:AbstractBusinessRule:1.0.0",
......@@ -23,13 +24,20 @@
"type": "object",
"properties": {
"DataRuleSets": {
"description": "The list of data rule sets that is relevant for this business process. Each data rule set reference is associated with a run-status.",
"type": "array",
"title": "Data Rule Sets",
"description": "The list of data rule sets that is relevant for this business process. Each data rule set reference is associated with a run-status.",
"x-osdu-indexing": {
"type": "nested"
},
"items": {
"type": "object",
"title": "DataRuleSets",
"description": "The list of data rule sets that is relevant for this business process. Each data rule set reference is associated with a run-status.",
"properties": {
"DataRuleSetID": {
"type": "string",
"title": "DataRuleSet ID",
"description": "The relationship to the QualityDataRuleSet.",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-QualityDataRuleSet:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
......@@ -40,20 +48,28 @@
]
},
"DataRuleSetRunStatus": {
"description": "True if data ruleset rule has passed, False if data ruleset rule dit not pass.",
"type": "boolean"
"type": "boolean",
"title": "DataRuleSet Run Status",
"description": "True if data ruleset rule has passed, False if data ruleset rule dit not pass."
}
}
}
},
"DataRules": {
"description": "The list of individual data rules that is relevant for this business process. Each data rule reference is associated with a run-status.",
"type": "array",
"title": "Date Rules",
"description": "The list of individual data rules that is relevant for this business process. Each data rule reference is associated with a run-status.",
"x-osdu-indexing": {
"type": "nested"
},
"items": {
"type": "object",
"title": "DataRules",
"description": "The list of individual data rules that is relevant for this business process. Each data rule reference is associated with a run-status.",
"properties": {
"DataRuleID": {
"type": "string",
"title": "DataRule ID",
"description": "The relationship to the individual QualityDataRule.",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-QualityDataRule:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
......@@ -64,8 +80,9 @@
]
},
"DataRuleRunStatus": {
"description": "True if data rule has passed, False if data rule did not pass.",
"type": "boolean"
"type": "boolean",
"title": "DataRule Run Status",
"description": "True if data rule has passed, False if data rule did not pass."
}
}
}
......
{
"schemaInfo": {
"schemaIdentity": {
"authority": "{{schema-authority}}",
"source": "wks",
"entityType": "AbstractColumnBasedTable",
"schemaVersionMajor": 1,
"schemaVersionMinor": 0,
"schemaVersionPatch": 0,
"id": "{{schema-authority}}:wks:AbstractColumnBasedTable:1.0.0"
},
"createdBy": "OSDU Data Definition Group",
"scope": "SHARED",
"status": "DEVELOPMENT"
},
"schema": {
"x-osdu-license": "Copyright 2022, The Open Group \\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.",
"x-osdu-review-status": "Accepted",
"$id": "https://schema.osdu.opengroup.org/json/abstract/AbstractColumnBasedTable.1.0.0.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"x-osdu-schema-source": "osdu:wks:AbstractColumnBasedTable:1.0.0",
"title": "AbstractColumnBasedTable",
"description": "The ColumnBasedTable is a set of columns, which have equal length (data.ColumnSize) included by types carrying embedded table properties. Columns have a Property Kind, UnitOfMeasure and Facet. There are KeyColumns (index columns) and Columns (for look-up values). Examples are KrPc, PVT and Facies tables.",
"type": "object",
"properties": {
"KeyColumns": {
"type": "array",
"title": "Key columns",
"description": "A column whose values are considered as keys/indices. Do not use this attribute if you want to follow a given ColumnBasedTableType.",
"x-osdu-indexing": {
"type": "nested"
},
"items": {
"$ref": "{{schema-authority}}:wks:AbstractReferencePropertyType:1.1.0"
}
},
"Columns": {
"type": "array",
"title": "Common columns",
"description": "A common column storing values of a particular property kind. Do not use this attribute if you want to follow a given ColumnBasedTableType.",
"x-osdu-indexing": {
"type": "nested"
},
"items": {
"$ref": "{{schema-authority}}:wks:AbstractReferencePropertyType:1.1.0"
}
},
"ColumnSize": {
"type": "integer",
"title": "Size of columns",
"description": "The count of elements in each column",
"example": 5
},
"ColumnValues": {
"type": "array",
"title": "The values of each column",
"description": "First column values are related to first key column, second column values are related to the second key column, etc\u2026\nColumn values at index KeyColumns count are related to first (non key) column, Column values at index KeyColumns count + 1 are related to second (non key) column, etc...",
"items": {
"type": "object",
"title": "ColumnValues",
"description": "Value of the column. Generally only one of the attribute should be instantiated.",
"properties": {
"BooleanColumn": {
"type": "array",
"title": "Boolean Column",
"description": "A column of only boolean values",
"example": [
true,
false,
true,
true,
false
],
"items": {
"type": "boolean"
}
},
"IntegerColumn": {
"type": "array",
"title": "Integer Column",
"description": "A column of only integer values",
"format": "integer",
"pattern": "^[0-9]+$",
"example": [
0,
1,
2,
3,
4
],
"items": {
"type": "integer"
}
},
"NumberColumn": {
"type": "array",
"title": "Number Column",
"description": "A column of only number values",
"example": [
0.1,
2.3,
4.5,
6.7,
8.9
],
"items": {
"type": "number"
}
},
"StringColumn": {
"type": "array",
"title": "String Column",
"description": "A column of only string values",
"example": [
"foo",
"bar",
"foo again",
"bar again",
"foo bar"
],
"items": {
"type": "string"
}
},
"UndefinedValueRows": {
"type": "array",
"title": "Undefined value rows",
"description": "The row indexes for which the values are flagged as undefined.",
"format": "integer",
"pattern": "^[0-9]+$",
"example": [
3,
4
],
"items": {
"type": "integer"
}
}
}
}
},
"ColumnBasedTableType": {
"type": "string",
"title": "The type of the column based table",
"description": "Quickly indicate the type of the column based table (KrPc, PVT, Facies, ...) and its standard columns definition. It is supposed to be used when you don't use KeyColumns neither Columns as attributes of this WPC.",
"format": "uri-reference",
"example": "namespace:reference-data--ColumnBasedTableType:Facies:",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-ColumnBasedTableType:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
{
"GroupType": "reference-data",
"EntityType": "ColumnBasedTableType"
}
]
}
},
"x-osdu-inheriting-from-kind": []
}
}
\ No newline at end of file
{
"schemaInfo": {
"schemaIdentity": {
"authority": "{{schema-authority}}",
"source": "wks",
"entityType": "AbstractIjkGridFlowSimulationBoundaryConnection",
"schemaVersionMajor": 1,
"schemaVersionMinor": 0,
"schemaVersionPatch": 0,
"id": "{{schema-authority}}:wks:AbstractIjkGridFlowSimulationBoundaryConnection:1.0.0"
},
"createdBy": "OSDU Data Definition Group",
"scope": "SHARED",
"status": "DEVELOPMENT"
},
"schema": {
"x-osdu-license": "Copyright 2022, The Open Group \\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.",
"x-osdu-review-status": "Accepted",
"$id": "https://schema.osdu.opengroup.org/json/abstract/AbstractIjkGridFlowSimulationBoundaryConnection.1.0.0.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"x-osdu-schema-source": "osdu:wks:AbstractIjkGridFlowSimulationBoundaryConnection:1.0.0",
"title": "AbstractIjkGridFlowSimulationBoundaryConnection",
"description": "This structure intends to define the reservoir boundary connection in an IJK grid such as aquifer connection. It can be reused in various Ijk Grid flow simulation related representations which need some boundary connections.",
"type": "object",
"properties": {
"GridID": {
"type": "string",
"title": "Grid ID",
"description": "The grid which is in connection",
"format": "uri-reference",
"example": "namespace:work-product-component--IjkGridRepresentation:85348741-3433-406B-9189-22B298C3E2D2:",
"pattern": "^[\\w\\-\\.]+:work-product-component\\-\\-IjkGridRepresentation:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
{
"GroupType": "work-product-component",
"EntityType": "IjkGridRepresentation"
}
]
},
"LowerI": {
"type": "integer",
"title": "Lower I index",
"description": "The lower included I index of the box of the grid in connection",
"example": 5
},
"UpperI": {
"type": "integer",
"title": "Upper I index",
"description": "The upper included I index of the box of the grid in connection",
"example": 10
},
"LowerJ": {
"type": "integer",
"title": "Lower J index",
"description": "The lower included J index of the box of the grid in connection",
"example": 1
},
"UpperJ": {
"type": "integer",
"title": "Upper J index",
"description": "The upper included J index of the box of the grid in connection",
"example": 1
},
"LowerK": {
"type": "integer",
"title": "Lower K index",
"description": "The lower included K index of the box of the grid in connection",
"example": 1
},
"UpperK": {
"type": "integer",
"title": "Upper K index",
"description": "The upper included K index of the box of the grid in connection",
"example": 10
},
"Face": {
"type": "string",
"title": "Face",
"description": "The faces of the box of the grid which are in connection",
"format": "uri-reference",
"example": "namespace:reference-data--IjkCellFace:J_MINUS:",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-IjkCellFace:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
{
"GroupType": "reference-data",
"EntityType": "IjkCellFace"
}
]
},
"TransmissibilityMultiplier": {
"type": "number",
"title": "Transmissibility multiplier",
"description": "The transmissibility multiplier of the connection",
"example": 0.75,
"x-osdu-frame-of-reference": "UOM:dimensionless"
}
},
"x-osdu-inheriting-from-kind": []
}
}
\ No newline at end of file
......@@ -85,19 +85,19 @@
"title": "CRS Name",
"description": "The name of the CRS.",
"type": "string",
"example": "NAD27 * OGP-Usa Conus / North Dakota South [32021,15851]"
"example": "WGS 84 / UTM zone 15N"
},
"persistableReference": {
"title": "CRS Persistable Reference",
"description": "The self-contained, persistable reference string uniquely identifying the CRS.",
"type": "string",
"example": "{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"32615\"},\"type\":\"LBC\",\"ver\":\"PE_10_3_1\",\"name\":\"WGS_1984_UTM_Zone_15N\",\"wkt\":\"PROJCS[\\\"WGS_1984_UTM_Zone_15N\\\",GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],PROJECTION[\\\"Transverse_Mercator\\\"],PARAMETER[\\\"False_Easting\\\",500000.0],PARAMETER[\\\"False_Northing\\\",0.0],PARAMETER[\\\"Central_Meridian\\\",-93.0],PARAMETER[\\\"Scale_Factor\\\",0.9996],PARAMETER[\\\"Latitude_Of_Origin\\\",0.0],UNIT[\\\"Meter\\\",1.0],AUTHORITY[\\\"EPSG\\\",32615]]\"}"
"example": "{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"32615\"},\"name\":\"WGS_1984_UTM_Zone_15N\",\"type\":\"LBC\",\"ver\":\"PE_10_9_1\",\"wkt\":\"PROJCS[\\\"WGS_1984_UTM_Zone_15N\\\",GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],PROJECTION[\\\"Transverse_Mercator\\\"],PARAMETER[\\\"False_Easting\\\",500000.0],PARAMETER[\\\"False_Northing\\\",0.0],PARAMETER[\\\"Central_Meridian\\\",-93.0],PARAMETER[\\\"Scale_Factor\\\",0.9996],PARAMETER[\\\"Latitude_Of_Origin\\\",0.0],UNIT[\\\"Meter\\\",1.0],AUTHORITY[\\\"EPSG\\\",32615]]\"}"
},
"coordinateReferenceSystemID": {
"description": "SRN to CRS reference.",
"type": "string",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-CoordinateReferenceSystem:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"example": "namespace:reference-data--CoordinateReferenceSystem:EPSG.32615:",
"example": "namespace:reference-data--CoordinateReferenceSystem:Projected:EPSG::32615:",
"x-osdu-relationship": [
{
"GroupType": "reference-data",
......
......@@ -34,7 +34,7 @@
"type": "string",
"title": "Vertical Coordinate Reference System ID",
"description": "The relationship to the vertical CRS defining the absolute reference surface.",
"example": "namespace:reference-data--CoordinateReferenceSystem:VerticalCRS.EPSG.5714:",
"example": "namespace:reference-data--CoordinateReferenceSystem:Vertical:EPSG::5714:",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-CoordinateReferenceSystem:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
{
......
......@@ -28,7 +28,7 @@
"title": "ID of the interpretation",
"description": "Allow to link an interpretation with this representation",
"format": "uri-reference",
"pattern": "^[\\w\\-\\.]+:(work-product-component\\-\\-EarthModelInterpretation|work-product-component\\-\\-GeobodyBoundaryInterpretation|work-product-component\\-\\-GeobodyInterpretation|work-product-component\\-\\-HorizonInterpretation|work-product-component\\-\\-RockFluidOrganizationInterpretation|work-product-component\\-\\-RockFluidUnitInterpretation|work-product-component\\-\\-StratigraphicUnitInterpretation|work-product-component\\-\\-StructuralOrganizationInterpretation|work-product-component\\-\\-FaultInterpretation):[\\w\\-\\.\\:\\%]+:[0-9]*$",
"pattern": "^[\\w\\-\\.]+:(work-product-component\\-\\-EarthModelInterpretation|work-product-component\\-\\-GeobodyBoundaryInterpretation|work-product-component\\-\\-GeobodyInterpretation|work-product-component\\-\\-HorizonInterpretation|work-product-component\\-\\-RockFluidOrganizationInterpretation|work-product-component\\-\\-RockFluidUnitInterpretation|work-product-component\\-\\-StratigraphicUnitInterpretation|work-product-component\\-\\-StructuralOrganizationInterpretation|work-product-component\\-\\-FaultInterpretation|work-product-component\\-\\-AquiferInterpretation):[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
{
"GroupType": "work-product-component",
......@@ -65,6 +65,10 @@
{
"GroupType": "work-product-component",
"EntityType": "FaultInterpretation"
},
{
"GroupType": "work-product-component",
"EntityType": "AquiferInterpretation"
}
]
},
......
......@@ -27,7 +27,7 @@
"type": "string",
"title": "Coordinate Reference System ID",
"description": "The CRS reference into the CoordinateReferenceSystem reference list.",
"example": "namespace:reference-data--CoordinateReferenceSystem:BoundCRS.OSDU::32021::15851:",
"example": "namespace:reference-data--CoordinateReferenceSystem:BoundProjected:EPSG::32021_EPSG::15851:",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-CoordinateReferenceSystem:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
{
......@@ -40,7 +40,7 @@
"type": "string",
"title": "Vertical Coordinate Reference System ID",
"description": "The explicit VerticalCRS reference into the CoordinateReferenceSystem reference list. This property stays empty for 2D geometries. Absent or empty values for 3D geometries mean the context may be provided by a CompoundCRS in 'CoordinateReferenceSystemID' or implicitly EPSG:5714 MSL height",
"example": "namespace:reference-data--CoordinateReferenceSystem:VerticalCRS::EPSG::5714:",
"example": "namespace:reference-data--CoordinateReferenceSystem:Vertical:EPSG::5714:",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-CoordinateReferenceSystem:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
{
......@@ -53,13 +53,13 @@
"type": "string",
"title": "CRS Reference",
"description": "The CRS reference as persistableReference string. If populated, the CoordinateReferenceSystemID takes precedence.",
"example": "{\"lateBoundCRS\":{\"wkt\":\"PROJCS[\\\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],PROJECTION[\\\"Lambert_Conformal_Conic\\\"],PARAMETER[\\\"False_Easting\\\",2000000.0],PARAMETER[\\\"False_Northing\\\",0.0],PARAMETER[\\\"Central_Meridian\\\",-100.5],PARAMETER[\\\"Standard_Parallel_1\\\",46.1833333333333],PARAMETER[\\\"Standard_Parallel_2\\\",47.4833333333333],PARAMETER[\\\"Latitude_Of_Origin\\\",45.6666666666667],UNIT[\\\"Foot_US\\\",0.304800609601219],AUTHORITY[\\\"EPSG\\\",32021]]\",\"ver\":\"PE_10_3_1\",\"name\":\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"32021\"},\"type\":\"LBC\"},\"singleCT\":{\"wkt\":\"GEOGTRAN[\\\"NAD_1927_To_WGS_1984_79_CONUS\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],METHOD[\\\"NADCON\\\"],PARAMETER[\\\"Dataset_conus\\\",0.0],AUTHORITY[\\\"EPSG\\\",15851]]\",\"ver\":\"PE_10_3_1\",\"name\":\"NAD_1927_To_WGS_1984_79_CONUS\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"15851\"},\"type\":\"ST\"},\"ver\":\"PE_10_3_1\",\"name\":\"NAD27 * OGP-Usa Conus / North Dakota South [32021,15851]\",\"authCode\":{\"auth\":\"OSDU\",\"code\":\"32021079\"},\"type\":\"EBC\"}"
"example": "{\"authCode\":{\"auth\":\"OSDU\",\"code\":\"32021079\"},\"lateBoundCRS\":{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"32021\"},\"name\":\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\",\"type\":\"LBC\",\"ver\":\"PE_10_9_1\",\"wkt\":\"PROJCS[\\\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],PROJECTION[\\\"Lambert_Conformal_Conic\\\"],PARAMETER[\\\"False_Easting\\\",2000000.0],PARAMETER[\\\"False_Northing\\\",0.0],PARAMETER[\\\"Central_Meridian\\\",-100.5],PARAMETER[\\\"Standard_Parallel_1\\\",46.18333333333333],PARAMETER[\\\"Standard_Parallel_2\\\",47.48333333333333],PARAMETER[\\\"Latitude_Of_Origin\\\",45.66666666666666],UNIT[\\\"Foot_US\\\",0.3048006096012192],AUTHORITY[\\\"EPSG\\\",32021]]\"},\"name\":\"NAD27 * OGP-Usa Conus / North Dakota CS27 South zone [32021,15851]\",\"singleCT\":{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"15851\"},\"name\":\"NAD_1927_To_WGS_1984_79_CONUS\",\"type\":\"ST\",\"ver\":\"PE_10_9_1\",\"wkt\":\"GEOGTRAN[\\\"NAD_1927_To_WGS_1984_79_CONUS\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],METHOD[\\\"NADCON\\\"],PARAMETER[\\\"Dataset_conus\\\",0.0],OPERATIONACCURACY[5.0],AUTHORITY[\\\"EPSG\\\",15851]]\"},\"type\":\"EBC\",\"ver\":\"PE_10_9_1\"}"
},
"PersistableReferenceVerticalCRS": {
"type": "string",
"title": "Vertical CRS Reference",
"description": "The VerticalCRS reference as persistableReference string. If populated, the VerticalCoordinateReferenceSystemID takes precedence. The property is null or empty for 2D geometries. For 3D geometries and absent or null persistableReferenceVerticalCrs the vertical CRS is either provided via persistableReferenceCrs's CompoundCRS or it is implicitly defined as EPSG:5714 MSL height.",
"example": "{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"5714\"},\"name\":\"MSL_Height\",\"type\":\"LBC\",\"ver\":\"PE_10_3_1\",\"wkt\":\"VERTCS[\\\"MSL_Height\\\",VDATUM[\\\"Mean_Sea_Level\\\"],PARAMETER[\\\"Vertical_Shift\\\",0.0],PARAMETER[\\\"Direction\\\",1.0],UNIT[\\\"Meter\\\",1.0],AUTHORITY[\\\"EPSG\\\",5714]]\"}"
"example": "{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"5714\"},\"name\":\"MSL_Height\",\"type\":\"LBC\",\"ver\":\"PE_10_9_1\",\"wkt\":\"VERTCS[\\\"MSL_Height\\\",VDATUM[\\\"Mean_Sea_Level\\\"],PARAMETER[\\\"Vertical_Shift\\\",0.0],PARAMETER[\\\"Direction\\\",1.0],UNIT[\\\"Meter\\\",1.0],AUTHORITY[\\\"EPSG\\\",5714]]\"}"
},
"PersistableReferenceUnitZ": {
"type": "string",
......
......@@ -121,7 +121,7 @@
"type": "string",
"title": "Coordinate Reference System ID",
"description": "The OSDU Platform CRS reference into the CoordinateReferenceSystem catalog matching the inlined geospatial definition. This CRS can also be a BoundCRS, which provides the transformation to WGS 84.",
"example": "namespace:reference-data--CoordinateReferenceSystem:BoundCRS.SLB.32021.15851:",
"example": "namespace:reference-data--CoordinateReferenceSystem:BoundProjected:EPSG::32012_EPSG::15851:",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-CoordinateReferenceSystem:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
{
......@@ -134,7 +134,7 @@
"type": "string",
"title": "Vertical Coordinate Reference System ID",
"description": "The explicit VerticalCRS reference into the CoordinateReferenceSystem catalog. This property stays empty for 2D geometries. Absent or empty values for 3D geometries mean the context may be provided by a CompoundCRS in 'CoordinateReferenceSystemID' or implicitly EPSG:5714 MSL height",
"example": "namespace:reference-data--CoordinateReferenceSystem:VerticalCRS.EPSG.5773:",
"example": "namespace:reference-data--CoordinateReferenceSystem:Vertical:EPSG::5714:",
"pattern": "^[\\w\\-\\.]+:reference-data\\-\\-CoordinateReferenceSystem:[\\w\\-\\.\\:\\%]+:[0-9]*$",
"x-osdu-relationship": [
{
......@@ -147,13 +147,13 @@
"type": "string",
"title": "CRS Reference",
"description": "The OSDU Platform CRS reference as persistableReference string. If populated, the CoordinateReferenceSystemID takes precedence. This CRS can also be a BoundCRS, which provides the transformation to WGS 84.",
"example": "{\"lateBoundCRS\":{\"wkt\":\"PROJCS[\\\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],PROJECTION[\\\"Lambert_Conformal_Conic\\\"],PARAMETER[\\\"False_Easting\\\",2000000.0],PARAMETER[\\\"False_Northing\\\",0.0],PARAMETER[\\\"Central_Meridian\\\",-100.5],PARAMETER[\\\"Standard_Parallel_1\\\",46.1833333333333],PARAMETER[\\\"Standard_Parallel_2\\\",47.4833333333333],PARAMETER[\\\"Latitude_Of_Origin\\\",45.6666666666667],UNIT[\\\"Foot_US\\\",0.304800609601219],AUTHORITY[\\\"EPSG\\\",32021]]\",\"ver\":\"PE_10_3_1\",\"name\":\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"32021\"},\"type\":\"LBC\"},\"singleCT\":{\"wkt\":\"GEOGTRAN[\\\"NAD_1927_To_WGS_1984_79_CONUS\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],GEOGCS[\\\"GCS_WGS_1984\\\",DATUM[\\\"D_WGS_1984\\\",SPHEROID[\\\"WGS_1984\\\",6378137.0,298.257223563]],PRIMEM[\\\"Greenwich\\\",0.0],UNIT[\\\"Degree\\\",0.0174532925199433]],METHOD[\\\"NADCON\\\"],PARAMETER[\\\"Dataset_conus\\\",0.0],AUTHORITY[\\\"EPSG\\\",15851]]\",\"ver\":\"PE_10_3_1\",\"name\":\"NAD_1927_To_WGS_1984_79_CONUS\",\"authCode\":{\"auth\":\"EPSG\",\"code\":\"15851\"},\"type\":\"ST\"},\"ver\":\"PE_10_3_1\",\"name\":\"NAD27 * OGP-Usa Conus / North Dakota South [32021,15851]\",\"authCode\":{\"auth\":\"SLB\",\"code\":\"32021079\"},\"type\":\"EBC\"}"
"example": "{\"authCode\":{\"auth\":\"OSDU\",\"code\":\"32021079\"},\"lateBoundCRS\":{\"authCode\":{\"auth\":\"EPSG\",\"code\":\"32021\"},\"name\":\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\",\"type\":\"LBC\",\"ver\":\"PE_10_9_1\",\"wkt\":\"PROJCS[\\\"NAD_1927_StatePlane_North_Dakota_South_FIPS_3302\\\",GEOGCS[\\\"GCS_North_American_1927\\\",DATUM[\\\"D_North_American_1927\\\",SPHEROID[\\\"Clarke_1866\\\",6378206.4,294.9786982]],PRIMEM[\\