fix: crowdscan version

Informatievlaanderen · Nov 8, 2023 · f9e33d8 · f9e33d8
1 parent db69874
commit f9e33d8
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 71 deletions.
diff --git a/demonstrator.env b/demonstrator.env
@@ -27,6 +27,7 @@ LDES_STREAMS_CROWDSCAN_TIMESTAMPPATH=http://www.w3.org/ns/prov#generatedAtTime
 LDES_STREAMS_CROWDSCAN_VERSIONOFPATH=http://purl.org/dc/terms/isVersionOf
 LDES_STREAMS_CROWDSCAN_GEOLOCATIONPATH=<http://def.isotc211.org/iso19156/2011/SamplingSurface#SF_SamplingSurface.shape>/<http://www.opengis.net/ont/geosparql#asWKT>
 LDES_STREAMS_CROWDSCAN_PROPERTYPREDICATES_DENSITY=http://schema.org/value
+LDES_STREAMS_CROWDSCAN_PROPERTYPREDICATES_ZONENAME=http://www.w3.org/2000/01/rdf-schema#label
 GRAPHDB_URL=http://rdf4j-server:8080/rdf4j-server/repositories/
 GRAPHDB_REPOSITORYID=test
 SERVER_PORT=8080
diff --git a/frontend/src/components/map/composables/usePopup.js b/frontend/src/components/map/composables/usePopup.js
@@ -32,6 +32,7 @@ export function usePopup(collection, properties) {
 </div>`
         case "crowdscan":
             return `<div class="popup-grid body body-xxsmall-regular">
+<span class="popup-title body-small-regular">${properties.zonename}</span>
 <span>personen dichtheid: ${properties.density}</span>
 </div>`
 

diff --git a/gipod.config.yml b/gipod.config.yml
@@ -2,75 +2,75 @@ server:
   port: 8082
 orchestrator:
   pipelines:
-    - name: gipod
-      input:
-        name: be.vlaanderen.informatievlaanderen.ldes.ldi.client.LdioLdesClient
-        config:
-          url: https://private-api.gipod.vlaanderen.be/api/v1/ldes/mobility-hindrances?generatedAtTime=2024-10-05T10:28:37.923Z
-          sourceFormat: application/ld+json
-      outputs:
-        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.RepositoryMaterialiser
-          config:
-            sparql-host: http://rdf4j-server:8080/rdf4j-server
-            repository-id: test
-            named-graph: http://gipod
-        - name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpOut
-          config:
-            content-type: application/n-quads
-            endpoint: http://host.docker.internal:8084/api/gipod/members
-    - name: verkeersmetingen-pipeline
-      description: "Simple http in, version creation, http out pipeline allowing to pause output."
-      input:
-        name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpInPoller
-        config:
-          url: http://miv.opendata.belfla.be/miv/verkeersdata
-          interval: PT10S
-        adapter:
-          name: be.vlaanderen.informatievlaanderen.ldes.ldi.RmlAdapter
-          config:
-            mapping: /ldio/rml/verkeersmetingen.ttl
-      transformers:
-        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.SparqlConstructTransformer
-          config:
-            query: /ldio/sparql/meting.to-oslo.rq
-        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.VersionObjectCreator
-          config:
-            member-type: https://data.vlaanderen.be/ns/verkeersmetingen#Verkeersmeting
-            delimiter: "/"
-            date-observed-property: "<http://def.isotc211.org/iso19156/2011/CountObservation#OM_CountObservation.phenomenonTime>/<http://www.w3.org/2006/time#hasBeginning>/<http://www.w3.org/2006/time#inXSDDateTimeStamp>"
-            generatedAt-property: http://www.w3.org/ns/prov#generatedAtTime
-            versionOf-property: http://purl.org/dc/terms/isVersionOf
-      outputs:
-        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.RepositoryMaterialiser
-          config:
-            sparql-host: http://rdf4j-server:8080/rdf4j-server
-            repository-id: test
-            named-graph: http://verkeersmeting
-        - name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpOut
-          config:
-            endpoint: http://host.docker.internal:8084/api/verkeersmeting/members
-            content-type: application/n-quads
-    - name: stations-pipeline
-      description: "HTTP polling, OSLO transformation, version creation & HTTP sending."
-      input:
-        name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpInPoller
-        config:
-          url: https://api.blue-bike.be/pub/location
-          interval: PT2M
-        adapter:
-          name: be.vlaanderen.informatievlaanderen.ldes.ldi.RmlAdapter
-          config:
-            mapping: /ldio/rml/stations.ttl
-      outputs:
-        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.RepositoryMaterialiser
-          config:
-            sparql-host: http://rdf4j-server:8080/rdf4j-server
-            repository-id: test
-            named-graph: http://bluebikes
-        - name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpOut
-          config:
-            endpoint: http://host.docker.internal:8084/api/bluebikes/members
-            content-type: application/n-quads
+#    - name: gipod
+#      input:
+#        name: be.vlaanderen.informatievlaanderen.ldes.ldi.client.LdioLdesClient
+#        config:
+#          url: https://private-api.gipod.vlaanderen.be/api/v1/ldes/mobility-hindrances?generatedAtTime=2024-10-05T10:28:37.923Z
+#          sourceFormat: application/ld+json
+#      outputs:
+#        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.RepositoryMaterialiser
+#          config:
+#            sparql-host: http://rdf4j-server:8080/rdf4j-server
+#            repository-id: test
+#            named-graph: http://gipod
+#        - name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpOut
+#          config:
+#            content-type: application/n-quads
+#            endpoint: http://host.docker.internal:8084/api/gipod/members
+#    - name: verkeersmetingen-pipeline
+#      description: "Simple http in, version creation, http out pipeline allowing to pause output."
+#      input:
+#        name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpInPoller
+#        config:
+#          url: http://miv.opendata.belfla.be/miv/verkeersdata
+#          interval: PT10S
+#        adapter:
+#          name: be.vlaanderen.informatievlaanderen.ldes.ldi.RmlAdapter
+#          config:
+#            mapping: /ldio/rml/verkeersmetingen.ttl
+#      transformers:
+#        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.SparqlConstructTransformer
+#          config:
+#            query: /ldio/sparql/meting.to-oslo.rq
+#        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.VersionObjectCreator
+#          config:
+#            member-type: https://data.vlaanderen.be/ns/verkeersmetingen#Verkeersmeting
+#            delimiter: "/"
+#            date-observed-property: "<http://def.isotc211.org/iso19156/2011/CountObservation#OM_CountObservation.phenomenonTime>/<http://www.w3.org/2006/time#hasBeginning>/<http://www.w3.org/2006/time#inXSDDateTimeStamp>"
+#            generatedAt-property: http://www.w3.org/ns/prov#generatedAtTime
+#            versionOf-property: http://purl.org/dc/terms/isVersionOf
+#      outputs:
+#        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.RepositoryMaterialiser
+#          config:
+#            sparql-host: http://rdf4j-server:8080/rdf4j-server
+#            repository-id: test
+#            named-graph: http://verkeersmeting
+#        - name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpOut
+#          config:
+#            endpoint: http://host.docker.internal:8084/api/verkeersmeting/members
+#            content-type: application/n-quads
+#    - name: stations-pipeline
+#      description: "HTTP polling, OSLO transformation, version creation & HTTP sending."
+#      input:
+#        name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpInPoller
+#        config:
+#          url: https://api.blue-bike.be/pub/location
+#          interval: PT2M
+#        adapter:
+#          name: be.vlaanderen.informatievlaanderen.ldes.ldi.RmlAdapter
+#          config:
+#            mapping: /ldio/rml/stations.ttl
+#      outputs:
+#        - name: be.vlaanderen.informatievlaanderen.ldes.ldi.RepositoryMaterialiser
+#          config:
+#            sparql-host: http://rdf4j-server:8080/rdf4j-server
+#            repository-id: test
+#            named-graph: http://bluebikes
+#        - name: be.vlaanderen.informatievlaanderen.ldes.ldio.LdioHttpOut
+#          config:
+#            endpoint: http://host.docker.internal:8084/api/bluebikes/members
+#            content-type: application/n-quads
     - name: crowdscan-observations-pipeline
       input:
         name: be.vlaanderen.informatievlaanderen.ldes.ldi.client.LdioLdesClient

diff --git a/sparql/crowdscan.add-query.rq b/sparql/crowdscan.add-query.rq
@@ -19,7 +19,7 @@ CONSTRUCT {
   ?obs prov:generatedAtTime ?obstime .
 
 
-  bind(concat(replace(replace(str(?loc), "www.crowdscan.be", "crowdscan.be"),"box4","beacon"), "/") as ?locpart) .
+  bind(concat(replace(replace(str(?loc), "www.crowdscan.be", "crowdscan.be"),"box4","scewc23"), "/") as ?locpart) .
 
   # set HTTP request parameters
   bind(bnode() as ?request) .

diff --git a/sparql/crowdscan.remove-query.rq b/sparql/crowdscan.remove-query.rq
@@ -11,5 +11,5 @@ WHERE {
     WHERE {
         ?request a :HttpRequest .
     }}
-    FILTER(?s != ?request)
+    FILTER(?s != ?request && !(?p = <http://purl.org/dc/terms/isVersionOf> && regex(str(?o),".*zone.*")))
 }