From 4e7d9f831f9f61dcce44aa0802b07ee64a5e3e04 Mon Sep 17 00:00:00 2001 From: Mirco Date: Sat, 12 Oct 2024 10:19:13 +0200 Subject: [PATCH 1/5] sh:or for georeference:codeEPSG (int) or georeference:coordinateSystemName (string) Signed-off-by: Mirco --- georeference/georeference_instance.json | 4 ++-- georeference/georeference_shacl.ttl | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/georeference/georeference_instance.json b/georeference/georeference_instance.json index 145ffe9..744756e 100644 --- a/georeference/georeference_instance.json +++ b/georeference/georeference_instance.json @@ -51,9 +51,9 @@ }, "georeference:geodeticReferenceSystem": { "@type": "georeference:GeodeticReferenceSystem", - "georeference:coordinateSystem": { + "georeference:codeEPSG": { "@value": "32632", - "@type": "xsd:string" + "@type": "xsd:int" }, "georeference:origin": { "@type": "georeference:Coordinate2D", diff --git a/georeference/georeference_shacl.ttl b/georeference/georeference_shacl.ttl index 6b484c5..0ed2edf 100644 --- a/georeference/georeference_shacl.ttl +++ b/georeference/georeference_shacl.ttl @@ -17,6 +17,8 @@ georeference:GeoreferenceShape a sh:NodeShape ; sh:targetClass georeference:Georeference . georeference:GeodeticReferenceSystemShape a sh:NodeShape ; + sh:or ( [ sh:minCount 1 ; sh:path georeference:codeEPSG ] + [ sh:minCount 1 ; sh:path georeference:coordinateSystemName ] ) ; sh:property [ skos:example "Lat: 1.234; Lon 45.23" ; sh:description "World coordinates of map origin"@en ; sh:message "Validation of origin failed!"@en ; @@ -26,15 +28,22 @@ georeference:GeodeticReferenceSystemShape a sh:NodeShape ; sh:maxCount 1 ; sh:order 0 ; sh:path georeference:origin ], - [ skos:example "EPSG::32632" ; - sh:datatype xsd:string ; + [ skos:example "32632" ; + sh:datatype xsd:int ; sh:description "EPSG code of the map"@en ; - sh:minCount 0 ; - sh:maxCount 1 ; - sh:message "Validation of coordinateSystem failed!"@en ; - sh:name "coordinateSystem"@en ; + sh:message "Validation of codeEPSG failed!"@en ; + sh:name "EPSG code"@en ; + sh:maxCount 1 ; + sh:order 0 ; + sh:path georeference:codeEPSG ], + [ skos:example "UTM, None" ; + sh:datatype xsd:string ; + sh:description "coordinate system name of the map"@en ; + sh:message "Validation of coordinateSystemName failed!"@en ; + sh:name "coordinate system name"@en ; + sh:maxCount 1 ; sh:order 0 ; - sh:path georeference:coordinateSystem ], + sh:path georeference:coordinateSystemName ], [ skos:example "Ellipsodial height" ; sh:datatype xsd:string ; sh:description "Ellipsodial height or orthometric height"@en ; From 1e46502acec2fb80bd1914ee4064ed20ac123353 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 12 Oct 2024 08:19:59 +0000 Subject: [PATCH 2/5] Add VARIABLES.md files Signed-off-by: GitHub Action --- georeference/VARIABLES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/georeference/VARIABLES.md b/georeference/VARIABLES.md index 40a300e..801722c 100644 --- a/georeference/VARIABLES.md +++ b/georeference/VARIABLES.md @@ -11,7 +11,8 @@ | GeoreferenceShape | georeference | projectLocation | 1 | 1 | | | georeference_shacl.ttl | | GeoreferenceShape | georeference | geodeticReferenceSystem | 1 | 1 | | | georeference_shacl.ttl | | GeodeticReferenceSystemShape | georeference | origin | 1 | 1 | World coordinates of map origin | | georeference_shacl.ttl | -| GeodeticReferenceSystemShape | georeference | coordinateSystem | 0 | 1 | EPSG code of the map | | georeference_shacl.ttl | +| GeodeticReferenceSystemShape | georeference | codeEPSG | | 1 | EPSG code of the map | | georeference_shacl.ttl | +| GeodeticReferenceSystemShape | georeference | coordinateSystemName | | 1 | coordinate system name of the map | | georeference_shacl.ttl | | GeodeticReferenceSystemShape | georeference | heightSystem | | 1 | Ellipsodial height or orthometric height | | georeference_shacl.ttl | | BoundingBoxShape | georeference | yMin | | 1 | | | georeference_shacl.ttl | | BoundingBoxShape | georeference | yMax | | 1 | | | georeference_shacl.ttl | From c761beb7899b61bbca388d1ece5391b3fe7207bd Mon Sep 17 00:00:00 2001 From: Mirco Date: Thu, 24 Oct 2024 11:02:21 +0200 Subject: [PATCH 3/5] fix order, min,max count rename Coordinate2DShape to LatLonCoordinateShape with lat/lon values add optional viewPoint Signed-off-by: Mirco --- georeference/georeference_shacl.ttl | 50 +++++++++++++++++++---------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/georeference/georeference_shacl.ttl b/georeference/georeference_shacl.ttl index 21034b2..a97694b 100644 --- a/georeference/georeference_shacl.ttl +++ b/georeference/georeference_shacl.ttl @@ -6,6 +6,7 @@ georeference:GeoreferenceShape a sh:NodeShape ; sh:property [ sh:maxCount 1 ; sh:minCount 1 ; + sh:maxCount 1 ; sh:node georeference:ProjectLocationShape ; sh:name "projectLocation object" ; sh:description "projectLocation object with property for locations and description" ; @@ -13,6 +14,7 @@ georeference:GeoreferenceShape a sh:NodeShape ; sh:path georeference:projectLocation ], [ sh:maxCount 1 ; sh:minCount 1 ; + sh:maxCount 1 ; sh:node georeference:GeodeticReferenceSystemShape ; sh:name "geodeticReferenceSystem object" ; sh:description "geodeticReferenceSystem object with properties for projection informations" ; @@ -27,18 +29,26 @@ georeference:GeodeticReferenceSystemShape a sh:NodeShape ; sh:description "World coordinates of map origin"@en ; sh:message "Validation of origin failed!"@en ; sh:name "origin"@en ; - sh:node georeference:Coordinate2DShape ; + sh:node georeference:LatLonCoordinateShape ; sh:minCount 1 ; sh:maxCount 1 ; sh:order 0 ; sh:path georeference:origin ], + [ skos:example "Lat: 1.234; Lon 45.23" ; + sh:description "World coordinates of view point"@en ; + sh:message "Validation of view point failed!"@en ; + sh:name "view point"@en ; + sh:node georeference:LatLonCoordinateShape ; + sh:maxCount 1 ; + sh:order 1 ; + sh:path georeference:viewPoint ], [ skos:example "32632" ; sh:datatype xsd:int ; sh:description "EPSG code of the map"@en ; sh:message "Validation of codeEPSG failed!"@en ; sh:name "EPSG code"@en ; sh:maxCount 1 ; - sh:order 0 ; + sh:order 2 ; sh:path georeference:codeEPSG ], [ skos:example "UTM, None" ; sh:datatype xsd:string ; @@ -46,7 +56,7 @@ georeference:GeodeticReferenceSystemShape a sh:NodeShape ; sh:message "Validation of coordinateSystemName failed!"@en ; sh:name "coordinate system name"@en ; sh:maxCount 1 ; - sh:order 0 ; + sh:order 3 ; sh:path georeference:coordinateSystemName ], [ skos:example "Ellipsodial height" ; sh:datatype xsd:string ; @@ -55,7 +65,7 @@ georeference:GeodeticReferenceSystemShape a sh:NodeShape ; sh:maxCount 1 ; sh:message "Validation of heightSystem failed!"@en ; sh:name "heightSystem"@en ; - sh:order 1 ; + sh:order 4 ; sh:path georeference:heightSystem ] ; sh:targetClass georeference:GeodeticReferenceSystem . @@ -63,43 +73,49 @@ georeference:BoundingBoxShape a sh:NodeShape ; sh:property [ sh:datatype xsd:float ; sh:message "Validation of yMin failed!"@en ; sh:name "yMin"@en ; - sh:maxCount 1 ; + sh:minCount 1 ; + sh:maxCount 1 ; sh:order 1 ; sh:path georeference:yMin ], [ sh:datatype xsd:float ; sh:message "Validation of yMax failed!"@en ; sh:name "yMax"@en ; - sh:maxCount 1 ; + sh:minCount 1 ; + sh:maxCount 1 ; sh:order 3 ; sh:path georeference:yMax ], [ sh:datatype xsd:float ; sh:message "Validation of xMin failed!"@en ; sh:name "xMin"@en ; - sh:maxCount 1 ; + sh:minCount 1 ; + sh:maxCount 1 ; sh:order 0 ; sh:path georeference:xMin ], [ sh:datatype xsd:float ; sh:message "Validation of xMax failed!"@en ; sh:name "xMax"@en ; + sh:minCount 1 ; sh:maxCount 1 ; sh:order 2 ; sh:path georeference:xMax ] ; sh:targetClass georeference:BoundingBox . -georeference:Coordinate2DShape a sh:NodeShape ; +georeference:LatLonCoordinateShape a sh:NodeShape ; sh:property [ sh:datatype xsd:float ; - sh:message "Validation of x failed!"@en ; - sh:name "x"@en ; - sh:maxCount 1 ; + sh:message "Validation of lat failed!"@en ; + sh:name "lat"@en ; + sh:minCount 1 ; + sh:maxCount 1 ; sh:order 0 ; - sh:path georeference:x ], + sh:path georeference:lat ], [ sh:datatype xsd:float ; - sh:message "Validation of y failed!"@en ; - sh:name "y"@en ; - sh:maxCount 1 ; + sh:message "Validation of lon failed!"@en ; + sh:name "lon"@en ; + sh:minCount 1 ; + sh:maxCount 1 ; sh:order 1 ; - sh:path georeference:y ] ; - sh:targetClass georeference:Coordinate2D . + sh:path georeference:lon ] ; + sh:targetClass georeference:LatLonCoordinate . georeference:ProjectLocationShape a sh:NodeShape ; sh:property [ skos:example "DE-BY" ; From c0538fc8ca04619572c1cee032fd5c2cae01f1ea Mon Sep 17 00:00:00 2001 From: Mirco Date: Thu, 24 Oct 2024 11:47:26 +0200 Subject: [PATCH 4/5] update instance.json --- georeference/georeference_instance.json | 27 +++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/georeference/georeference_instance.json b/georeference/georeference_instance.json index 744756e..33d3963 100644 --- a/georeference/georeference_instance.json +++ b/georeference/georeference_instance.json @@ -32,19 +32,19 @@ "georeference:boundingBox": { "@type": "georeference:BoundingBox", "georeference:xMin": { - "@value": "0", + "@value": "10.720740862799195", "@type": "xsd:float" }, "georeference:yMin": { - "@value": "0", + "@value": "52.29672229543727", "@type": "xsd:float" }, "georeference:xMax": { - "@value": "5", + "@value": "10.730432209669724", "@type": "xsd:float" }, "georeference:yMax": { - "@value": "5", + "@value": "52.31580272353997", "@type": "xsd:float" } } @@ -57,12 +57,23 @@ }, "georeference:origin": { "@type": "georeference:Coordinate2D", - "georeference:x": { - "@value": "2.5", + "georeference:lat": { + "@value": "52.275329463992996", "@type": "xsd:float" }, - "georeference:y": { - "@value": "2.5", + "georeference:lon": { + "@value": "10.685571633942278", + "@type": "xsd:float" + } + }, + "georeference:viewPoint": { + "@type": "georeference:LatLonCoordinate", + "georeference:lat": { + "@value": "52.30626250948862", + "@type": "xsd:float" + }, + "georeference:lon": { + "@value": "10.72558653623446", "@type": "xsd:float" } }, From 018c00ac19dac47f81c8e309dd2d4b36fd81c6f8 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 24 Oct 2024 09:48:26 +0000 Subject: [PATCH 5/5] Add VARIABLES.md files Signed-off-by: GitHub Action --- georeference/VARIABLES.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/georeference/VARIABLES.md b/georeference/VARIABLES.md index 328cd21..b57e329 100644 --- a/georeference/VARIABLES.md +++ b/georeference/VARIABLES.md @@ -11,15 +11,16 @@ | GeoreferenceShape | georeference | projectLocation | 1 | 1 | projectLocation object with property for locations and description | | georeference_shacl.ttl | | GeoreferenceShape | georeference | geodeticReferenceSystem | 1 | 1 | geodeticReferenceSystem object with properties for projection informations | | georeference_shacl.ttl | | GeodeticReferenceSystemShape | georeference | origin | 1 | 1 | World coordinates of map origin | | georeference_shacl.ttl | +| GeodeticReferenceSystemShape | georeference | viewPoint | | 1 | World coordinates of view point | | georeference_shacl.ttl | | GeodeticReferenceSystemShape | georeference | codeEPSG | | 1 | EPSG code of the map | | georeference_shacl.ttl | | GeodeticReferenceSystemShape | georeference | coordinateSystemName | | 1 | coordinate system name of the map | | georeference_shacl.ttl | | GeodeticReferenceSystemShape | georeference | heightSystem | | 1 | Ellipsodial height or orthometric height | | georeference_shacl.ttl | -| BoundingBoxShape | georeference | yMin | | 1 | | | georeference_shacl.ttl | -| BoundingBoxShape | georeference | yMax | | 1 | | | georeference_shacl.ttl | -| BoundingBoxShape | georeference | xMin | | 1 | | | georeference_shacl.ttl | -| BoundingBoxShape | georeference | xMax | | 1 | | | georeference_shacl.ttl | -| Coordinate2DShape | georeference | x | | 1 | | | georeference_shacl.ttl | -| Coordinate2DShape | georeference | y | | 1 | | | georeference_shacl.ttl | +| BoundingBoxShape | georeference | yMin | 1 | 1 | | | georeference_shacl.ttl | +| BoundingBoxShape | georeference | yMax | 1 | 1 | | | georeference_shacl.ttl | +| BoundingBoxShape | georeference | xMin | 1 | 1 | | | georeference_shacl.ttl | +| BoundingBoxShape | georeference | xMax | 1 | 1 | | | georeference_shacl.ttl | +| LatLonCoordinateShape | georeference | lat | 1 | 1 | | | georeference_shacl.ttl | +| LatLonCoordinateShape | georeference | lon | 1 | 1 | | | georeference_shacl.ttl | | ProjectLocationShape | georeference | state | | 1 | Code of federal state or province as ISO 3166-2 | | georeference_shacl.ttl | | ProjectLocationShape | georeference | city | | 1 | Main city of project area | | georeference_shacl.ttl | | ProjectLocationShape | georeference | region | | 1 | Region of project area | | georeference_shacl.ttl |