1849 show more trajectory information

Agents/SensorLoggerMobileAppAgent/Dockerfile

@@ -25,7 +25,7 @@ WORKDIR /root/sensorloggermobileappagent
 
 # #==================================================================================================
 # Copy the compiled jar from the builder
-COPY --from=builder /root/sensorloggermobileappagent/output/SensorLoggerMobileAppAgent##5.0.0.war $CATALINA_HOME/webapps/
+COPY --from=builder /root/sensorloggermobileappagent/output/SensorLoggerMobileAppAgent##*.war $CATALINA_HOME/webapps/
 COPY ./docker/entrypoint.sh entrypoint.sh
 
 # Port for Java debugging

Agents/SensorLoggerMobileAppAgent/sensorloggermobileappagent/src/main/resources/functions.sql

@@ -40,3 +40,17 @@ BEGIN
     RETURN CONCAT('https://www.theworldavatar.com/kg/sensorloggerapp/sessionID_', device_id);
 END;
 $$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION get_activity_type_iri(device_id VARCHAR)
+RETURNS VARCHAR AS $$
+BEGIN
+    RETURN CONCAT('https://www.theworldavatar.com/kg/sensorloggerapp/activity_type_', device_id);
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION get_confidence_level_iri(device_id VARCHAR)
+RETURNS VARCHAR AS $$
+BEGIN
+    RETURN CONCAT('https://www.theworldavatar.com/kg/sensorloggerapp/confidence_level_', device_id);
+END;
+$$ LANGUAGE plpgsql;

Agents/SensorLoggerMobileAppAgent/sensorloggermobileappagent/src/main/resources/ontop.obda

@@ -155,4 +155,4 @@ target      sensorloggerapp:smartphone_{device_id} ontodevice:detectedByDevice s
             sensorloggerapp:activity_type_{device_id} a ontodevice:ActivityType .
             sensorloggerapp:confidence_level_{device_id} a ontodevice:ConfidenceLevel .
 source      SELECT device_id, sensor_class FROM devices WHERE sensor_class='Activity'
-]]
+]]

Agents/TrajectoryQueryAgent/Dockerfile

@@ -25,7 +25,7 @@ WORKDIR /root/trajectoryqueryagent
 
 # #==================================================================================================
 # Copy the compiled jar from the builder
-COPY --from=builder /root/trajectoryqueryagent/output/trajectoryqueryagent##1.0.2.war $CATALINA_HOME/webapps/
+COPY --from=builder /root/trajectoryqueryagent/output/trajectoryqueryagent##*.war $CATALINA_HOME/webapps/
 COPY ./docker/entrypoint.sh entrypoint.sh
 
 # Port for Java debugging

Agents/TrajectoryQueryAgent/docker-compose.yml

@@ -1,4 +1,4 @@
 services:
   trajectoryqueryagent:
-    image: ghcr.io/cambridge-cares/trajectoryqueryagent:4.1.1
+    image: ghcr.io/cambridge-cares/trajectoryqueryagent:4.2.0
     build: .

Agents/TrajectoryQueryAgent/stack-manager-config/inputs/config/services/trajectoryqueryagent-debug.json

@@ -3,7 +3,7 @@
         "Name": "trajectoryqueryagent",
         "TaskTemplate": {
             "ContainerSpec": {
-                "Image": "ghcr.io/cambridge-cares/trajectoryqueryagent:4.0.0",
+                "Image": "ghcr.io/cambridge-cares/trajectoryqueryagent:4.2.0",
                 "Env": [
                     "KEYCLOAK_SERVER=http://host.docker.internal:8080",
                     "KEYCLOAK_REALM=twa-test",

Agents/TrajectoryQueryAgent/stack-manager-config/inputs/config/services/trajectoryqueryagent.json

@@ -3,7 +3,7 @@
         "Name": "trajectoryqueryagent",
         "TaskTemplate": {
             "ContainerSpec": {
-                "Image": "ghcr.io/cambridge-cares/trajectoryqueryagent:4.0.0",
+                "Image": "ghcr.io/cambridge-cares/trajectoryqueryagent:4.2.0",
                 "Env": [
                     "KEYCLOAK_SERVER=http://host.docker.internal:8080",
                     "KEYCLOAK_REALM=twa-test"

Agents/TrajectoryQueryAgent/trajectoryqueryagent/src/main/java/uk/ac/cam/cares/jps/agent/trajectoryqueryagent/TrajectoryQueryAgent.java

@@ -108,7 +108,7 @@ public JSONObject getDatesWithData(String timezone, String userId) {
             response.put("message", "Succeed");
             response.put("result", result);
         } else {
-            response.put("message", "Faile");
+            response.put("message", "Failed");
         }
 
         return response;
@@ -236,6 +236,32 @@ private void createGeoserver() {
             geoServerClient.createPostGISLayer(workspaceName, dbName, "trajectoryUserIdLineSegments",
                     geoServerVectorSettings);
         }
+
+
+        String lineLayerUserIdByActivity = null;
+        try (InputStream is = new ClassPathResource("line_layer_user_id_by_activity.sql").getInputStream()) {
+            lineLayerUserIdByActivity = IOUtils.toString(is, StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            LOGGER.error("failed to read line_layer_user_id_by_activity.sql");
+            LOGGER.error(e.getMessage());
+        }
+
+        if (lineLayerUserIdByActivity != null) {
+            geoServerClient.createWorkspace(workspaceName);
+            UpdatedGSVirtualTableEncoder virtualTable = new UpdatedGSVirtualTableEncoder();
+            GeoServerVectorSettings geoServerVectorSettings = new GeoServerVectorSettings();
+            virtualTable.setSql(lineLayerUserIdByActivity);
+            virtualTable.setEscapeSql(true);
+            virtualTable.setName("line_layer_user_id_by_activity_table");
+            virtualTable.addVirtualTableGeometry("geom", "Geometry", "4326");
+            virtualTable.addVirtualTableParameter("user_id", "null", ".*");
+            virtualTable.addVirtualTableParameter("upperbound", "0", "^(0|[1-9][0-9]*)$");
+            virtualTable.addVirtualTableParameter("lowerbound", "0", "^(0|[1-9][0-9]*)$");
+            geoServerVectorSettings.setVirtualTable(virtualTable);
+            geoServerClient.createPostGISDataStore(workspaceName, "trajectory", dbName, schema);
+            geoServerClient.createPostGISLayer(workspaceName, dbName, "trajectoryUserIdByActivity", geoServerVectorSettings);
+        }
+
     }
 
     /**

Agents/TrajectoryQueryAgent/trajectoryqueryagent/src/main/resources/functions.sql

@@ -130,6 +130,42 @@ BEGIN
     RETURN QUERY EXECUTE query;
 END $$ LANGUAGE plpgsql;
 
+CREATE OR REPLACE FUNCTION get_activity_table(
+    device_id_array TEXT[]
+)
+RETURNS TABLE (
+    "time" bigint,
+    "activity_type" VARCHAR,
+    "confidence_level" integer,
+    "device_id" TEXT,
+    "user_id" TEXT
+) AS $$
+DECLARE
+    query TEXT := '';
+BEGIN
+    FOR i IN 1..array_length(device_id_array, 1) LOOP
+        IF i > 1 THEN
+            query := query || ' UNION ALL ';
+        END IF;
+
+        device_id := device_id_array[i];
+
+
+        query := query || format(
+            'SELECT time, %I AS activity_type, %I ::INTEGER AS confidence_level, %L AS device_id, %L AS user_id FROM %I WHERE time_series_iri = %L',
+            get_column_name(get_activity_type_iri(device_id)),
+            get_column_name(get_confidence_level_iri(device_id)),
+            device_id,
+            get_user_id(device_id),
+            get_table_name(get_activity_type_iri(device_id)),
+            get_time_series(get_activity_type_iri(device_id))
+        );
+    END LOOP;
+
+     RETURN QUERY EXECUTE query;
+END $$ LANGUAGE plpgsql;
+
+
 -- used by timeline app only
 CREATE OR REPLACE FUNCTION get_device_ids(id VARCHAR)
 RETURNS TEXT AS
@@ -152,3 +188,45 @@ BEGIN
 END;
 $$
 LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION fill_activity_types(activity_types varchar[], times bigint[])
+RETURNS TABLE (
+    "time" bigint,
+    "activity_type" VARCHAR
+) AS $$
+DECLARE
+    result varchar[] := '{}'; 
+    last_valid varchar := ''; 
+    activity varchar; 
+    activity_time bigint; 
+    i integer := 1; 
+BEGIN
+
+    FOREACH activity IN ARRAY activity_types
+    LOOP
+        IF activity <> 'others' THEN
+            last_valid := activity;
+            EXIT;  
+        END IF;
+    END LOOP;
+
+    FOREACH activity IN ARRAY activity_types
+    LOOP
+        IF activity <> 'others' THEN
+            last_valid := activity;  
+        END IF;
+
+        result := array_append(result, last_valid);
+    END LOOP;
+
+    FOR i IN 1..array_length(times, 1)
+    LOOP
+        activity_time := times[i];
+        RETURN QUERY SELECT activity_time, result[i]; 
+    END LOOP;
+
+    RETURN; 
+END;
+$$
+LANGUAGE plpgsql

Agents/TrajectoryQueryAgent/trajectoryqueryagent/src/main/resources/line_layer_user_id.sql

@@ -21,13 +21,20 @@ timeseries AS (
 )
 
 SELECT 
+    MIN(time) AS start_time,  
+    MAX(time) AS end_time,
     ST_MakeLine(geom) as geom, 
-    CONCAT('https://w3id.org/MON/person.owl#person_', '%user_id%') AS iri
+    CONCAT('https://w3id.org/MON/person.owl#person_', '%user_id%') AS iri,
+    session_id AS session_id,
+    1 AS id,
+    ST_Length(ST_Transform(ST_MakeLine(ARRAY_AGG(geom ORDER BY time)), 3857))::INTEGER AS distance_traveled
 FROM 
     timeseries ts
 WHERE
     ('%user_id%' = '' OR user_id = '%user_id%')
-    AND (%lowerbound% = 0 OR time > %lowerbound%)
-    AND (%upperbound% = 0 OR time < %upperbound%)
+AND ('%lowerbound%' = '0' OR ts.time > '%lowerbound%'::BIGINT)
+AND ('%upperbound%' = '0' OR ts.time < '%upperbound%'::BIGINT)
 GROUP BY
     ts.session_id
+ORDER BY start_time
+

Agents/TrajectoryQueryAgent/trajectoryqueryagent/src/main/resources/line_layer_user_id_by_activity.sql

@@ -0,0 +1,128 @@
+WITH distinct_devices AS (
+    SELECT 
+        array_agg(device_id::text) AS device_list
+    FROM 
+        (SELECT DISTINCT device_id 
+         FROM devices 
+         WHERE sensor_class = 'Activity') AS distinct_devices
+),
+
+timeseries AS (
+    SELECT
+        *
+    FROM
+        public.get_location_table((SELECT device_list FROM distinct_devices)) AS timeseries
+    ORDER BY time
+),
+
+activity_data AS (
+    SELECT
+        *
+    FROM
+        public.get_activity_table((SELECT device_list FROM distinct_devices)) AS activity_data
+    ORDER BY time
+),
+
+joined_data AS (
+    SELECT 
+        t.*, 
+        a.activity_type,
+        a.confidence_level,
+        LAG(t.time) OVER (PARTITION BY t.user_id ORDER BY t.time) AS prev_time
+    FROM 
+        timeseries t
+    LEFT JOIN 
+        activity_data a 
+    ON 
+        ABS(t.time - a.time) <= 5000 
+    ORDER BY t.time
+),
+
+fixed_activity_data AS (
+    SELECT 
+        time,
+        speed,
+        altitude,
+        geom,
+        bearing,
+        session_id,
+        user_id,
+        confidence_level,
+        COALESCE(activity_type, 'others') AS activity_type
+    FROM joined_data
+    WHERE time <> prev_time  
+),
+
+temp_activity_table AS (
+    SELECT * FROM fill_activity_types(
+        (SELECT array_agg(activity_type ORDER BY time) FROM fixed_activity_data),  
+        (SELECT array_agg(time ORDER BY time) FROM fixed_activity_data) 
+    )
+),
+
+filled_activity_data AS (
+    SELECT
+        fixed.time AS time,
+        fixed.speed AS speed,
+        fixed.altitude AS altitude,
+        fixed.geom AS geom,
+        fixed.bearing AS bearing,
+        fixed.session_id AS session_id,
+        fixed.user_id AS user_id,
+        temp.activity_type AS activity_type,
+        fixed.confidence_level AS confidence_level
+    FROM fixed_activity_data AS fixed
+    JOIN temp_activity_table AS temp 
+    ON fixed.time = temp.time
+    ORDER BY time
+),
+
+change_marked AS (
+    SELECT
+        *,
+        CASE
+            WHEN
+                LAG(activity_type) OVER (PARTITION BY user_id ORDER BY time) IS DISTINCT FROM activity_type
+            THEN 1
+            ELSE 0 
+        END AS change_flag
+    FROM filled_activity_data
+),
+
+change_marked_union AS (
+    SELECT * FROM change_marked
+    UNION ALL
+    SELECT time, speed, altitude, geom, bearing, session_id, user_id,
+        LAG(activity_type) OVER (PARTITION BY user_id ORDER BY time), confidence_level, 0
+    FROM change_marked WHERE change_flag = 1
+    ORDER BY time, change_flag
+),
+
+numbered_activity_data AS (
+    SELECT 
+        *,
+        SUM(change_flag) OVER (PARTITION BY user_id ORDER BY time ROWS UNBOUNDED PRECEDING) AS id
+    FROM change_marked_union cm
+    WHERE activity_type IS NOT NULL
+    ORDER BY cm.time, cm.change_flag
+)
+
+SELECT
+    id,
+    MIN(na.time) AS start_time,
+    MAX(na.time) AS end_time,
+    user_id,
+    activity_type,
+    session_id,
+    ST_MakeLine(geom) as geom,
+    ST_Length(ST_Transform(ST_MakeLine(geom), 3857))::INTEGER AS distance_traveled,
+    CONCAT('https://w3id.org/MON/person.owl#person_', user_id) AS iri
+FROM
+    numbered_activity_data na
+WHERE
+('%user_id%' = '' OR user_id = '%user_id%')
+AND ('%lowerbound%' = '0' OR na.time > '%lowerbound%'::BIGINT)
+AND ('%upperbound%' = '0' OR na.time < '%upperbound%'::BIGINT)
+GROUP BY
+    na.id, na.activity_type, na.user_id, na.session_id
+ORDER BY start_time