1849 show more trajectory information

Agents/SensorLoggerMobileAppAgent/docker-compose.yml

@@ -1,3 +1,3 @@
 services:
   sensorloggermobileappagent:
-    image: ghcr.io/cambridge-cares/sensorloggermobileappagent:5.0.0-activity-data-SNAPSHOT
+    image: ghcr.io/cambridge-cares/sensorloggermobileappagent:5.1.0

Agents/SensorLoggerMobileAppAgent/sensorloggermobileappagent/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>uk.ac.cam.cares.jps</groupId>
     <artifactId>SensorLoggerMobileAppAgent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
     <packaging>war</packaging>
 
     <properties>

Agents/TrajectoryQueryAgent/docker-compose.yml

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

Agents/TrajectoryQueryAgent/trajectoryqueryagent/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>uk.ac.cam.cares.jps</groupId>
     <artifactId>trajectoryqueryagent</artifactId>
-    <version>1.0.2</version>
+    <version>5.0.0</version>
     <packaging>war</packaging>
 
     <properties>

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

@@ -80,7 +80,6 @@ public JSONObject processRequestParameters(JSONObject requestParams, HttpServlet
      * 3) Create geoserver layer
      * 4) Return pointIRI to application as response
      *
-     * @param requestParams
      * @return
      */
     public JSONObject createLayer() {

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

@@ -9,11 +9,13 @@ BEGIN
     FROM time_series_quantities
     WHERE data_iri = iri;
 
+
     RETURN column_name_result;
 END;
 $$
 LANGUAGE plpgsql;
 
+
 CREATE OR REPLACE FUNCTION get_table_name(iri VARCHAR)
 RETURNS VARCHAR AS
 $$
@@ -25,11 +27,13 @@ BEGIN
     FROM time_series_quantities
     WHERE data_iri = iri;
 
+
     RETURN table_name_result;
 END;
 $$
 LANGUAGE plpgsql;
 
+
 CREATE OR REPLACE FUNCTION get_time_series(iri VARCHAR)
 RETURNS VARCHAR AS
 $$
@@ -41,11 +45,13 @@ BEGIN
     FROM time_series_quantities
     WHERE data_iri = iri;
 
+
     RETURN time_series_result;
 END;
 $$
 LANGUAGE plpgsql;
 
+
 CREATE OR REPLACE FUNCTION get_user_id(device TEXT)
 RETURNS VARCHAR AS
 $$
@@ -54,15 +60,15 @@ DECLARE
 BEGIN
     -- Check if the schema 'timeline' exists
     IF EXISTS (
-        SELECT 1 
-        FROM pg_catalog.pg_namespace 
+        SELECT 1
+        FROM pg_catalog.pg_namespace
         WHERE nspname = 'timeline'
     ) THEN
         -- Check if the table 'smartPhone' exists in the 'timeline' schema
         IF EXISTS (
-            SELECT 1 
-            FROM pg_catalog.pg_tables 
-            WHERE schemaname = 'timeline' 
+            SELECT 1
+            FROM pg_catalog.pg_tables
+            WHERE schemaname = 'timeline'
               AND tablename = 'smartPhone'
         ) THEN
             -- Perform the query to get the user_id
@@ -79,57 +85,56 @@ BEGIN
         RETURN NULL;
     END IF;
 
+
     RETURN user_result;
 END;
 $$
 LANGUAGE plpgsql;
 
 
+
+
 CREATE OR REPLACE FUNCTION get_location_table(
     device_id_array TEXT[]
 )
 RETURNS TABLE (
-    "time" bigint, 
-    "geom" geometry, 
-    "speed" double precision, 
-    "altitude" double precision, 
+    "time" bigint,
+    "geom" geometry,
+    "speed" double precision,
+    "altitude" double precision,
     "bearing" double precision,
     "session_id" character varying,
     "device_id" TEXT,
     "user_id" TEXT
 ) AS $$
 DECLARE
     query TEXT := '';
-    processed_array TEXT[] := ARRAY[]::TEXT[];
 BEGIN
     FOR i IN 1..array_length(device_id_array, 1) LOOP
-        IF get_column_name(get_point_iri(device_id_array[i])) IS NOT NULL THEN
-            processed_array := array_append(processed_array, device_id_array[i]);
-        END IF;
-    END LOOP;
-
-    FOR i IN 1..array_length(processed_array, 1) LOOP
         IF i > 1 THEN
             query := query || ' UNION ALL ';
         END IF;
 
+
         query := query || format(
             'SELECT time, %I AS geom, %I AS speed, %I AS altitude, %I AS bearing, %I AS session_id, %L AS device_id, %L AS user_id FROM %I WHERE time_series_iri=%L',
-            get_column_name(get_point_iri(processed_array[i])),
-            get_column_name(get_speed_iri(processed_array[i])),
-            get_column_name(get_altitude_iri(processed_array[i])),
-            get_column_name(get_bearing_iri(processed_array[i])),
-            get_column_name(get_session_iri(processed_array[i])),
-            processed_array[i],
-            get_user_id(processed_array[i]),
-            get_table_name(get_point_iri(processed_array[i])),
-            get_time_series(get_point_iri(processed_array[i]))
+            get_column_name(get_point_iri(device_id_array[i])),
+            get_column_name(get_speed_iri(device_id_array[i])),
+            get_column_name(get_altitude_iri(device_id_array[i])),
+            get_column_name(get_bearing_iri(device_id_array[i])),
+            get_column_name(get_session_iri(device_id_array[i])),
+            device_id_array[i],
+            get_user_id(device_id_array[i]),
+            get_table_name(get_point_iri(device_id_array[i])),
+            get_time_series(get_point_iri(device_id_array[i]))
         );
     END LOOP;
 
+
     RETURN QUERY EXECUTE query;
 END $$ LANGUAGE plpgsql;
 
+
 CREATE OR REPLACE FUNCTION get_activity_table(
     device_id_array TEXT[]
 )
@@ -148,9 +153,12 @@ BEGIN
             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)),
@@ -162,10 +170,13 @@ BEGIN
         );
     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
@@ -179,54 +190,61 @@ BEGIN
     FROM timeline."smartPhone" sp
     WHERE sp.user_id = id
     AND EXISTS (
-        SELECT 1 
+        SELECT 1
         FROM devices d
         WHERE d.device_id = sp.phone_id
     );
 
+
     RETURN phone_id_list;
 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; 
+    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;  
+            EXIT;
         END IF;
     END LOOP;
 
+
     FOREACH activity IN ARRAY activity_types
     LOOP
         IF activity <> 'others' THEN
-            last_valid := activity;  
+            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]; 
+        RETURN QUERY SELECT activity_time, result[i];
     END LOOP;
 
-    RETURN; 
+
+    RETURN;
 END;
 $$
-LANGUAGE plpgsql
+LANGUAGE plpgsql