resolve comments

Author: abbybernstein

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

@@ -261,7 +261,7 @@ private void createGeoserver() {
             geoServerClient.createPostGISDataStore(workspaceName, "trajectory", dbName, schema);
             geoServerClient.createPostGISLayer(workspaceName, dbName, "trajectoryUserIdByActivity", geoServerVectorSettings);
         }
-
+        
     }
 
     /**

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,20 +85,23 @@ 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,
@@ -106,6 +115,7 @@ BEGIN
             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(device_id_array[i])),
@@ -120,9 +130,11 @@ BEGIN
         );
     END LOOP;
 
+
     RETURN QUERY EXECUTE query;
 END $$ LANGUAGE plpgsql;
 
+
 CREATE OR REPLACE FUNCTION get_activity_table(
     device_id_array TEXT[]
 )
@@ -141,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)),
@@ -155,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
@@ -172,30 +190,33 @@ 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
@@ -204,22 +225,26 @@ BEGIN
         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]; 
+        RETURN QUERY SELECT activity_time, result[i];
     END LOOP;
 
-    RETURN; 
+
+    RETURN;
 END;
 $$
-LANGUAGE plpgsql
+LANGUAGE plpgsql

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

@@ -1,12 +1,13 @@
 WITH distinct_devices AS (
-    SELECT 
+    SELECT
         array_agg(device_id::text) AS device_list
-    FROM 
-        (SELECT DISTINCT device_id 
-         FROM devices 
+    FROM
+        (SELECT DISTINCT device_id
+         FROM devices
          WHERE sensor_class = 'Activity') AS distinct_devices
 ),
 
+
 timeseries AS (
     SELECT
         *
@@ -15,6 +16,7 @@ timeseries AS (
     ORDER BY time
 ),
 
+
 activity_data AS (
     SELECT
         *
@@ -23,23 +25,25 @@ activity_data AS (
     ORDER BY time
 ),
 
+
 joined_data AS (
-    SELECT 
-        t.*, 
+    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 
+    FROM
         timeseries t
-    LEFT JOIN 
-        activity_data a 
-    ON 
-        ABS(t.time - a.time) <= 5000 
+    LEFT JOIN
+        activity_data a
+    ON
+        ABS(t.time - a.time) <= 5000
     ORDER BY t.time
 ),
 
+
 fixed_activity_data AS (
-    SELECT 
+    SELECT
         time,
         speed,
         altitude,
@@ -48,18 +52,20 @@ fixed_activity_data AS (
         session_id,
         user_id,
         confidence_level,
-        COALESCE(activity_type, 'others') AS activity_type
+        COALESCE(activity_type, 'unknown') 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) 
+        (SELECT array_agg(time ORDER BY time) FROM fixed_activity_data)
     )
 ),
 
+
 filled_activity_data AS (
     SELECT
         fixed.time AS time,
@@ -72,23 +78,25 @@ filled_activity_data AS (
         temp.activity_type AS activity_type,
         fixed.confidence_level AS confidence_level
     FROM fixed_activity_data AS fixed
-    JOIN temp_activity_table AS temp 
+    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 
+            ELSE 0
         END AS change_flag
     FROM filled_activity_data
 ),
 
+
 change_marked_union AS (
     SELECT * FROM change_marked
     UNION ALL
@@ -98,15 +106,17 @@ change_marked_union AS (
     ORDER BY time, change_flag
 ),
 
+
 numbered_activity_data AS (
-    SELECT 
+    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,

Agents/utils/GeoServerJwtProxy/src/main/java/uk/ac/cam/cares/GeoServerJwtProxy.java

@@ -39,7 +39,7 @@ public class GeoServerJwtProxy extends HttpServlet {
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         String token = null;
-
+        System.out.println(request);
         Iterator<String> headerIterator = request.getHeaders("Authorization").asIterator();
         while (headerIterator.hasNext() && token == null) {
             String headerValue = headerIterator.next();