Implement green-public-spaces-present and fix uplift

data/cityjson-uplift.yml

@@ -56,6 +56,8 @@ context:
     id: dct:identifier
     version: city:version
 
+    attributes: '@nest'
+
     CityObjects:
       '@id': city:hasObject
       '@context':
@@ -97,6 +99,9 @@ context:
         _AbstractCityObject: city:_AbstractCityObject
         _AbstractTransportationComplex: city:_AbstractTransportationComplex
         '+GenericCityObject': https://www.cityjson.org/extensions/download/generic.ext.json#GenericCityObject
+
+        function: city:hasFunction
+        usage: city:hasUsage
 
         geometry:
           '@id': city:hasGeometry
@@ -147,9 +152,6 @@ context:
               '@id': city:boundaries
               '@container': '@list'
               '@type': '@id'
-            function: city:hasFunction
-            usage: city:hasUsage
-        attributes: '@nest'
         parents:
           '@id': city:hasParent
           '@type': '@id'

data/shapes/ascoli-piceno.shacl

@@ -33,7 +33,7 @@ ex:
   ], [
     sh:prefix "attr" ;
     sh:namespace "http://example.com/vocab/city/attr#"^^xsd:anyURI ;
-  ];
+  ] ;
 .
 
 :BuildingOfInterestPresent

data/shapes/green-public-spaces-present.shacl

@@ -29,22 +29,27 @@ ex:
   ], [
     sh:prefix "sd" ;
     sh:namespace "https://w3id.org/okn/o/sd#"^^xsd:anyURI ;
-  ];
+  ], [
+    sh:prefix "attr" ;
+    sh:namespace "http://example.com/vocab/city/attr#"^^xsd:anyURI ;
+  ] ;
 .
 
 :GreenPublicSpaces
     a sh:NodeShape ;
     sh:targetNode chek:document ;
-    sh:not [
-        sh:sparql [
-          sh:prefixes ex: ;
-          sh:select """
-            SELECT $this (rdf:type as ?path) (city:Road as ?value) WHERE {
-              ?s a city:Road
-            } LIMIT 1
-        """ ;
-        ] ;
-      ] ;
-    sh:message "Dataset contains no Road objects" ;
+    sh:sparql [
+      sh:prefixes ex: ;
+      sh:select """
+        SELECT $this (rdf:type as ?path) ("LandUse objects with function 1110, 3010 or 3030" as ?value) WHERE {
+          FILTER NOT EXISTS {
+            ?s a city:LandUse ;
+              city:hasFunction ?function .
+            FILTER(?function IN ("1110", "3010", "3030"))
+          }
+        } LIMIT 1
+    """ ;
+    ] ;
+    sh:message "Dataset contains no green public spaces" ;
     sh:severity sh:Violation ;
 .

data/shapes/roads-present.shacl

@@ -29,7 +29,10 @@ ex:
   ], [
     sh:prefix "sd" ;
     sh:namespace "https://w3id.org/okn/o/sd#"^^xsd:anyURI ;
-  ];
+  ], [
+    sh:prefix "attr" ;
+    sh:namespace "http://example.com/vocab/city/attr#"^^xsd:anyURI ;
+  ] ;
 .
 
 :RoadsPresent