Update migration 202412:

- Update api.export_logbooks_geojson_point_trips_fn,
- Update export_logbook_geojson_trip_fn, update geojson from trip to geojson with more properties

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .env
+docker-compose.mm.yml
 initdb/*.csv
 initdb/*.no
 initdb/*.jwk

docs/ERD/postgsail.md

@@ -13,17 +13,29 @@ erDiagram
         timestamp_with_time_zone _to_time 
         boolean active 
         double_precision avg_speed 
-        numeric distance "in NM"
-        interval duration "Best to use standard ISO 8601"
-        jsonb extra "computed signalk metrics of interest, runTime, currentLevel, etc"
+        numeric distance "Distance in nautical miles (NM)"
+        interval duration "Duration in ISO 8601 format"
+        jsonb extra "Computed SignalK metrics such as runtime, current level, etc."
         integer id "{NOT_NULL}"
         double_precision max_speed 
         double_precision max_wind_speed 
         text name 
         text notes 
-        geography track_geog "postgis geography type default SRID 4326 Unit: degres"
-        jsonb track_geojson "store generated geojson with track metrics data using with LineString and Point features, we can not depend api.metrics table"
-        geometry track_geom "postgis geometry type EPSG:4326 Unit: degres"
+        tgeogpoint trip "MobilityDB trajectory"
+        tfloat trip_batt_charge "Battery Charge"
+        tfloat trip_batt_voltage "Battery Voltage"
+        tfloat trip_cog "courseovergroundtrue"
+        tfloat trip_depth "Depth"
+        tfloat trip_hum_out "Humidity outside"
+        ttext trip_notes 
+        tfloat trip_pres_out "Pressure outside"
+        tfloat trip_sog "speedoverground"
+        ttext trip_status 
+        tfloat trip_temp_out "Temperature outside"
+        tfloat trip_temp_water "Temperature water"
+        tfloat trip_twa "windspeedapparent"
+        tfloat trip_twd "truewinddirection"
+        tfloat trip_tws "truewindspeed"
         text vessel_id "{NOT_NULL}"
     }
 
@@ -74,9 +86,7 @@ erDiagram
         jsonb nominatim 
         text notes 
         jsonb overpass 
-        integer reference_count 
         integer stay_code "Link api.stays_at with api.moorages via FOREIGN KEY and REFERENCES"
-        interval stay_duration "Best to use standard ISO 8601"
         text vessel_id "{NOT_NULL}"
     }
 
@@ -187,6 +197,13 @@ erDiagram
         numeric id 
     }
 
+    public_mobilitydb_opcache {
+        integer ltypnum 
+        oid opid 
+        integer opnum 
+        integer rtypnum 
+    }
+
     public_ne_10m_geography_marine_polys {
         text changed 
         text featurecla 
@@ -249,6 +266,8 @@ erDiagram
     api_logbook }o--|| api_metadata : ""
     api_logbook }o--|| api_moorages : ""
     api_logbook }o--|| api_moorages : ""
+    api_logbook }o--|| api_moorages : ""
+    api_logbook }o--|| api_moorages : ""
     api_metadata }o--|| auth_vessels : ""
     api_metrics }o--|| api_metadata : ""
     api_moorages }o--|| api_metadata : ""

docs/README.md

@@ -115,16 +115,23 @@ Then connect to the web UI on port HTTP/5050.
 
 #### Step 3. Start frontend (web)
 
-Then launch the web frontend, execute:
+Last build and launch the web frontend, execute:
 
 ```bash
-$ docker compose up web
+docker compose build web
+docker compose up web
 ```
-This step can take some time as it will first do a build to generate the static website based on your settings.
+
+The first step can take some time as it will first run a build to generate the static website based on your settings.
+
+The frontend is a SPA (Single-Page Application). With SPA, the server provides the user with an empty HTML page and Javascript. The latter is where the magic happens. When the browser receives the HTML + Javascript, it loads the Javascript. Once loaded, the JS takes place and, through a set of operations in the DOM, renders the necessary components to the page. The routing is then handled by the browser itself, not hitting the server. 
 
 The frontend should be accessible via port HTTP/8080.
 
-Users are collaborating on an installation guide, [Self-hosted-installation-guide](https://github.com/xbgmsharp/postgsail/wiki/Self-hosted-installation-guide)
+Users are collaborating on two installation guide:
+- [Self-hosted-installation-guide](https://github.com/xbgmsharp/postgsail/blob/main/docs/install_guide.md)
+- [Self-hosted-installation-guide on AWS EC2](https://github.com/xbgmsharp/postgsail/blob/main/docs/Self%E2%80%90hosted-installation-guide%20on%20AWS.md)
+- [Self-hosted-installation-guide](https://github.com/xbgmsharp/postgsail/blob/main/docs/Self%E2%80%90hosted-installation-guide.md)
 
 ### SQL Configuration
 

docs/Self‐hosted-installation-guide on AWS.md

@@ -0,0 +1,288 @@
+## Self AWS cloud hosted setup example
+
+In this guide we install, setup and run a postgsail project on an AWS instance in the cloud.
+
+## On AWS Console
+***Launch an instance on AWS EC2***
+With the following settings:
++ Ubuntu
++ Instance type: t2.small
++ Create a new key pair: 
+    + key pair type: RSA
+    + Private key file format: .pem
++ The key file is stored for later use
+
++ Allow SSH traffic from: Anywhere
++ Allow HTTPS traffic from the internet
++ Allow HTTP traffic from the internet
+
+Configure storage:
+The standard storage of 8GiB is too small so change this to 16GiB.
+
+Create a new security group
++ Go to: EC2>Security groups>Create security group
+Add inbound rules for the following ports:443, 8080, 80, 3000, 5432, 22, 5050
++ Go to your instance>select your instance>Actions>security>change security group
++ And add the correct security group to the instance.
+
+## Connect to instance with SSH
+
++ Copy the key file in your default SSH configuration file location (the one VSCode will use)
++ In terminal, go to the folder and run this command to ensure your key is not publicly viewable: 
+```
+chmod 600 "privatekey.pem"
+```
+
+We are using VSCode to connect to the instance: 
++ Install the Remote - SSH Extension for VSCode
++ Open the Command Palette (Ctrl+Shift+P) and type Remote-SSH: Add New SSH Host:
+```
+ssh -i "privatekey.pem" ubuntu@ec2-111-22-33-44.eu-west-1.compute.amazonaws.com
+```
+When prompted, select the default SSH configuration file location.
+Open the config file and add the location:
+```
+xIdentityFile ~/.ssh/privatekey.pem
+```
+
+
+## Install Docker on your instance
+To install Docker on your new EC2 Ubuntu instance via SSH, follow these steps:
+
+Update your package list:
+```
+sudo apt-get update
+```
+Install required dependencies:
+```
+sudo apt-get install apt-transport-https ca-certificates curl software-properties-common
+```
+Add Docker's official GPG key:
+```
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+```
+Add Docker's official repository:
+```
+echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+```
+Update the package list again:
+```
+sudo apt-get update
+```
+Install Docker:
+```
+sudo apt-get install docker-ce docker-ce-cli containerd.io
+```
+Verify Docker installation:
+```
+sudo docker --version
+```
+Add your user to the docker group to run Docker without sudo:
+```
+sudo usermod -aG docker ubuntu
+```
+Then, log out and back in or use the following to apply the changes:
+```
+newgrp docker
+```
+
+
+
+## Install Postgsail 
+Git clone the postgsail repo:
+```
+git clone https://github.com/xbgmsharp/postgsail.git
+```
+
+## Edit environment variables
+Copy the example.env file and edit the environment variables:
+```
+cd postgsail
+cp .env.example .env
+nano .env
+```
+
++ POSTGRES_USER
+Come up with a unique username for the database user. This will be used in the docker image when it’s started up. Nothing beyond creating a unique username and password is required here.
+This environment variable is used in conjunction with `POSTGRES_PASSWORD` to set a user and its password. This variable will create the specified user with superuser power and a database with the same name.
+
+https://github.com/docker-library/docs/blob/master/postgres/README.md
+
++ POSTGRES_PASSWORD
+This should be a good password. It will be used for the postgres user above. Again this is used in the docker image.
+This environment variable is required for you to use the PostgreSQL image. It must not be empty or undefined. This environment variable sets the superuser password for PostgreSQL. The default superuser is defined by the POSTGRES_USER environment variable.
+
++ POSTGRES_DB
+This is the name of the database within postgres. You can leave it named postgres but give it a unique name if you like. The schema will be loaded into this database and all data will be stored within it. Since this is used inside the docker image the name really doesn’t matter. If you plan to run additional databases within the image, then you might care.
+This environment variable can be used to define a different name for the default database that is created when the image is first started. If it is not specified, then the value of `POSTGRES_USER` will be used.
+
++ PGSAIL_APP_URL
+This is the webapp (webui) entrypoint, typically the public DNS or IP
+```
+PGSAIL_APP_URL=http://localhost:8080
+```
+
+
++ PGSAIL_API_URL
+This is the URL to your API on your instance on port 3000:
+```
+PGSAIL_API_URL=PGSAIL_API_URL=http://localhost:3000
+```
+
++ PGSAIL_AUTHENTICATOR_PASSWORD
+This password is used as part of the database access configuration. It’s used as part of the access URI later on. (Put the same password in both lines.)
+
++ PGSAIL_GRAFANA_PASSWORD
+This password is used for the grafana service
+
++ PGSAIL_GRAFANA_AUTH_PASSWORD
+??This password is used for user authentication on grafana?
+
++ PGSAIL_EMAIL_FROM - PGSAIL_EMAIL_SERVER - PGSAIL_EMAIL_USER - PGSAIL_EMAIL_PASS Pgsail does not include a built in email service - only hooks to send email via an existing server.
+We use gmail as a third party email service:
+```
+PGSAIL_EMAIL_FROM=email@gmail.com
+PGSAIL_EMAIL_SERVER=smtp.gmail.com
+PGSAIL_EMAIL_USER=email@gmail.com
+```
+You need to get the PGSAIL_EMAIL_PASS from your gmail account security settings: it is not the account password, instead you need to make an "App password"
+
++ PGRST_JWT_SECRET
+This secret key must be at least 32 characters long, you can create a random key with the following command:
+```
+cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w 42 | head -n 1
+```
+
++ Other ENV variables
+```
+PGSAIL_PUSHOVER_APP_TOKEN
+PGSAIL_PUSHOVER_APP
+PGSAIL_TELEGRAM_BOT_TOKEN
+PGSAIL_AUTHENTICATOR_PASSWORD=password
+PGSAIL_GRAFANA_PASSWORD=password
+PGSAIL_GRAFANA_AUTH_PASSWORD=password
+#PGSAIL_PUSHOVER_APP_TOKEN= Comment if not used
+#PGSAIL_PUSHOVER_APP_URL= Comment if not used
+#PGSAIL_TELEGRAM_BOT_TOKEN= Comment if not used
+```
+
+## Run the project
+If needed, add your user to the docker group to run Docker without sudo:
+```
+sudo usermod -aG docker ubuntu
+```
+Then, log out and back in or use the following to apply the changes:
+```
+newgrp docker
+```
+
+
+Step 1. Import the SQL schema, execute:
+```
+docker compose up db
+```
+Step 2. Launch the full backend stack (db, api), execute:
+```
+docker compose up db api
+```
+Step 3. Launch the frontend webapp
+```
+docker compose up web
+```
+
+Open browser and navigate to your PGSAIL_APP_URL, you should see the postgsail login screen now:
+```
+http://ec2-11-234-567-890.eu-west-1.compute.amazonaws.com::8080
+```
+
+## Additional database setup
+Aditional setup will be required.
+There is no useraccount yet, also cronjobs need to be activated.
+We'll do that by using pgadmin.
+
+### Run Pgadmin & connect to database
+First add two more vars to your env. file:
+```
+PGADMIN_DEFAULT_EMAIL=setup@setup.com
+PGADMIN_DEFAULT_PASSWORD=123456
+```
+
+Pgadmin is defined in docker-compose.dev.yml so we need to start the service:
+```
+docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d pgadmin
+```
+
+All services should be up now: api, db, web and pgadmin. Check all services running by:
+```
+docker ps
+```
+
+To open Pgadmin, navigate to your aws-url and port 5050:
+```
+http://ec2-11-234-567-890.eu-west-1.compute.amazonaws.com::5050
+```
+
+<p>
+You are now able to login with your credentials: PGADMIN_DEFAULT_EMAIL & PGADMIN_DEFAULT_PASSWORD.<br>
+</p>
+<p>
+In the right-side panel you will see "Servers(1)"; by clicking you'll see the Server: "PostgSail dev db"<br>
+</p>
+<p>
+**Warning:** A dialog box will open, prompting to input the password, but stating the wrong username (postgres) , you have to change this username by right-clicking on the server  "PostgSail dev db" > Properties > Connection > enter username: POSTGRES_USER > Save
+</p>
+<p>
+Now right-click and Connect to Server and enter your password: POSTGRES_PASSWORD
+</p>
+<p>
+You'll see 2 databases: "postgres" and "signalk"
+</p>
+
+### Enabling cron jobs by SQL query
+<p>
+Cron jobs are not active by default because if you don't have the correct settings set (for SMTP, PushOver, Telegram), you might enter in a loop with errors and you could be blocked or banned from the external services.
+</p>
+<p>
+Once you have setup the services correctly (entered credentials in .env file) you can activate the cron jobs. (We are only using the SMTP email service in this example) in the "postgres" database:
+</p>
++ Right-click on "postgres" database and select "Query Tool"
++ Execute the following SQL query:
+
+```
+UPDATE cron.job SET active = True;
+```
+
+### Adding a user by SQL query
+I was not able to create a new user through the web application (still figuring out what is going on). Therefore I added a new user by SQL in the "signalk" database.
++ Right-click on "signalk" database and select "Query Tool"
++ Check the current users in your database executing the query: 
+```
+SELECT * FROM auth.accounts;
+```
+
+
+
++ To add a new user executing the query:
+
+```
+INSERT INTO auth.accounts (
+email, first, last, pass, role) VALUES (
+'your.email@domain.com'::citext, 'Test'::text, 'your_username'::text, 'your_password'::text, 'user_role'::name)
+ returning email;
+```
+
+When SMTP is correctly setup, you will receive two emails: "Welcome" and "Email verification".
+<p>
+You will be able to login with these credentials on the web
+</p>
+<p>
+Each time you login, you will receive an email: "Email verification". This is the OTP process, you can bypass this process by updating the json key value of "Preferences":
+</p>
+
+```
+UPDATE auth.accounts
+SET preferences='{"email_valid": true}'::jsonb || preferences
+WHERE email='your.email@domain.com';
+```
+
+Now you are able to use PostGSail on the web on your own AWS server!

docs/Self‐hosted-installation-guide.md

@@ -0,0 +1,166 @@
+# Self hosted setup example environment:
+
+Virtual machine with Ubuntu 22.04 LTS minimal server installation.
+
+Install openssh, update and install docker-ce manually (ubuntu docker repo is lame)
+The following ports are exposed to the internet either using a static public IP address or port forwarding via your favorite firewall platform. (not need by default docker will expose all ports to all IPs)
+The base install uses ports 5432 (db) and 3000 (api) and 8080 (web).
+
+We’ll add https using Apache or Nginx proxy once everything is tested. At that point you’ll want to open 443 or whatever other port you want to use for secure communication.
+
+For docker-ce installation, this is a decent guide to installation:
+https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-20-04
+
+Third party services and options:
+Emails
+For email notifications you may want to install a local email handler like postfix or use a third party service like gmail.
+
+Pushover
+Add more here
+
+Telegram Bot
+Add more here
+
+
+```
+$ git clone https://github.com/xbgmsharp/postgsail
+cd postgsail
+cp .env.example .env
+nano .env
+```
+
+Login to your docker host once it’s setup.
+Clone the repo to your user directory:
+
+Copy the example file and edit the environment variables
+
+The example has the following:
+```
+# POSTGRESQL ENV Settings
+POSTGRES_USER=username
+POSTGRES_PASSWORD=password
+POSTGRES_DB=postgres
+# PostgSail ENV Settings
+PGSAIL_AUTHENTICATOR_PASSWORD=password
+PGSAIL_GRAFANA_PASSWORD=password
+PGSAIL_GRAFANA_AUTH_PASSWORD=password
+# SMTP server settings
+PGSAIL_EMAIL_FROM=root@localhost
+PGSAIL_EMAIL_SERVER=localhost
+#PGSAIL_EMAIL_USER= Comment if not use
+#PGSAIL_EMAIL_PASS= Comment if not use
+# Pushover settings
+#PGSAIL_PUSHOVER_APP_TOKEN= Comment if not use
+#PGSAIL_PUSHOVER_APP_URL= Comment if not use
+# TELEGRAM BOT, ask BotFather
+#PGSAIL_TELEGRAM_BOT_TOKEN= Comment if not use
+# webapp entrypoint, typically the public DNS or IP
+PGSAIL_APP_URL=http://localhost:8080
+# API entrypoint from the webapp, typically the public DNS or IP
+PGSAIL_API_URL=http://localhost:3000
+# 
+POSTGREST ENV Settings
+PGRST_DB_URI=postgres://authenticator:${PGSAIL_AUTHENTICATOR_PASSWORD}@db:5432/signalk
+# % cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w 42 | head -n 1
+PGRST_JWT_SECRET=_at_least_32__char__long__random
+# Grafana ENV Settings
+GF_SECURITY_ADMIN_PASSWORD=password
+```
+
+All of these need to be configured.
+
+Step by step:
+
+## POSTGRESQL ENV Settings
+
+***POSTGRES_USER***
+Come up with a unique username for the database user. This will be used in the docker image when it’s started up. Nothing beyond creating a unique username and password is required here.
+This environment variable is used in conjunction with `POSTGRES_PASSWORD` to set a user and its password. This variable will create the specified user with superuser power and a database with the same name.
+
+https://github.com/docker-library/docs/blob/master/postgres/README.md
+
+***POSTGRES_PASSWORD***
+This should be a good password. It will be used for the postgres user above. Again this is used in the docker image.
+This environment variable is required for you to use the PostgreSQL image. It must not be empty or undefined. This environment variable sets the superuser password for PostgreSQL. The default superuser is defined by the POSTGRES_USER environment variable.
+
+***POSTGRES_DB***
+This is the name of the database within postgres. Give it a unique name if you like. The schema will be loaded into this database and all data will be stored within it. Since this is used inside the docker image the name really doesn’t matter. If you plan to run additional databases within the image, then you might care.
+This environment variable can be used to define a different name for the default database that is created when the image is first started. If it is not specified, then the value of `POSTGRES_USER` will be used.
+
+
+```
+# PostgSail ENV Settings
+PGSAIL_AUTHENTICATOR_PASSWORD=password
+PGSAIL_GRAFANA_PASSWORD=password
+PGSAIL_GRAFANA_AUTH_PASSWORD=password
+PGSAIL_EMAIL_FROM=root@localhost
+PGSAIL_EMAIL_SERVER=localhost
+#PGSAIL_EMAIL_USER= Comment if not use
+#PGSAIL_EMAIL_PASS= Comment if not use
+#PGSAIL_PUSHOVER_APP_TOKEN= Comment if not use
+#PGSAIL_PUSHOVER_APP_URL= Comment if not use
+#PGSAIL_TELEGRAM_BOT_TOKEN= Comment if not use
+PGSAIL_APP_URL=http://localhost:8080
+PGSAIL_API_URL=http://localhost:3000
+```
+
+PGSAIL_AUTHENTICATOR_PASSWORD
+This password is used as part of the database access configuration. It’s used as part of the access URI later on. (Put the same password in both lines.)
+
+PGSAIL_GRAFANA_PASSWORD
+This password is used for the grafana service
+
+PGSAIL_GRAFANA_AUTH_PASSWORD
+??This password is used for user authentication on grafana?
+
+PGSAIL_EMAIL_FROM
+PGSAIL_EMAIL_SERVER
+Pgsail does not include a built in email service - only hooks to send email via an existing server.
+You can install an email service on the ubuntu host or use a third party service like gmail. If you chose to use a local service, be aware that some email services will filter it as spam unless you’ve properly configured it.
+
+PGSAIL_PUSHOVER_APP_TOKEN
+PGSAIL_PUSHOVER_APP
+PGSAIL_TELEGRAM_BOT_TOKEN
+
+Add more info here
+PGSAIL_APP_URL
+This is the full url (with domain name or IP) that you access PGSAIL via. Once nginx ssl proxy is added this may need to be updated. (Service restart required after changing?)
+
+
+PGSAIL_API_URL
+This is the API URL that’s used for the boat and user access. Once apache or nginx ssl proxy is added this may need to be updated. (same restart?)
+
+Network configuration example:
+It is a docker question but in general no special network config should be need, docker created and assign one automatically. all images will be bind to all IPs on the host.
+The volume can be on disk or should be a docker volume prefer.
+```
+# docker compose -f docker-compose.yml -f docker-compose.dev.yml ps -a
+NAME       IMAGE                              COMMAND                                                                  SERVICE    CREATED        STATUS                  PORTS
+api        postgrest/postgrest                "/bin/postgrest"                                                         api        2 months ago   Up 2 months             0.0.0.0:3000->3000/tcp, :::3000->3000/tcp, 0.0.0.0:3003->3003/tcp, :::3003->3003/tcp
+app        grafana/grafana:latest             "/run.sh"                                                                app        3 months ago   Up 12 days              0.0.0.0:3001->3000/tcp, :::3001->3000/tcp
+db         xbgmsharp/timescaledb-postgis      "docker-entrypoint.sh postgres"                                          db         2 months ago   Up 2 months (healthy)   0.0.0.0:5432->5432/tcp, :::5432->5432/tcp
+```
+All services (db,api,web) will be accessible via localhost and others IPs, hence the default configuration.
+
+```bash
+# telnet localhost 5432
+```
+and 
+```bash
+# curl  localhost:3000
+```
+
+```bash
+# docker network ls
+NETWORK ID     NAME                DRIVER    SCOPE
+...
+14f30223ebf2   postgsail_default   bridge    local
+```
+
+Volumes:
+```bash
+% docker volume ls    
+DRIVER    VOLUME NAME
+local     postgsail_grafana-data
+local     postgsail_postgres-data
+```

docs/install_guide.md

@@ -0,0 +1,84 @@
+
+## Connect to the server
+```bash
+% ssh root@my.server.com
+```
+
+# Clone the git repo
+```bash
+% git clone https://github.com/xbgmsharp/postgsail
+Cloning into 'postgsail'...
+...
+```
+
+## Edit the configuration
+```bash
+% cd postgsail
+% cp .env.example .env
+% cat /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w 42 | head -n 1
+..
+% nano .env
+```
+
+## Install Docker
+From https://docs.docker.com/engine/install/ubuntu/
+```bash
+% apt-get update
+...
+% apt-get install -y ca-certificates curl
+...
+% install -m 0755 -d /etc/apt/keyrings
+% curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+% chmod a+r /etc/apt/keyrings/docker.asc
+% echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+% apt-get update
+...
+% apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+...
+```
+
+## Init the database
+```bash
+% docker compose up db
+...
+Gracefully stopping... (press Ctrl+C again to force)
+[+] Stopping 1/1
+ ✔ Container db  Stopped
+```
+
+## Start the db with the api
+```bash
+% docker compose pull api
+...
+% docker compose up -d db api
+```
+
+## Checks
+Making sure it works.
+```bash
+% telnet localhost 5432
+...
+telnet> quit
+Connection closed.
+% curl localhost:3000
+...
+% docker ps
+...
+% docker logs api
+...
+```
+
+# Run the web instance
+```bash
+% docker compose -f docker-compose.yml -f docker-compose.dev.yml build web (be patient)
+...
+
+% docker compose -f docker-compose.yml -f docker-compose.dev.yml up web (be patient)
+...
+web | 
+web  |   ➜  Local:   http://localhost:8080/
+web  |   ➜  Network: http://172.18.0.4:8080/
+```

initdb/99_migrations_202410.sql

@@ -0,0 +1,253 @@
+---------------------------------------------------------------------------
+-- Copyright 2021-2024 Francois Lacroix <xbgmsharp@gmail.com>
+-- This file is part of PostgSail which is released under Apache License, Version 2.0 (the "License").
+-- See file LICENSE or go to http://www.apache.org/licenses/LICENSE-2.0 for full license details.
+--
+-- Migration October 2024
+--
+-- List current database
+select current_database();
+
+-- connect to the DB
+\c signalk
+
+\echo 'Timing mode is enabled'
+\timing
+
+\echo 'Force timezone, just in case'
+set timezone to 'UTC';
+
+-- Update moorages map, export more properties (notes,reference_count) from moorages tbl
+CREATE OR REPLACE FUNCTION api.export_moorages_geojson_fn(OUT geojson jsonb)
+ RETURNS jsonb
+ LANGUAGE plpgsql
+AS $function$
+    DECLARE
+    BEGIN
+        SELECT jsonb_build_object(
+            'type', 'FeatureCollection',
+            'features',
+                ( SELECT
+                    json_agg(ST_AsGeoJSON(m.*)::JSON) as moorages_geojson
+                    FROM
+                    ( SELECT
+                        id,name,stay_code,notes,reference_count,
+                        EXTRACT(DAY FROM justify_hours ( stay_duration )) AS Total_Stay,
+                        geog
+                        FROM api.moorages
+                        WHERE geog IS NOT NULL
+                    ) AS m
+                )
+            ) INTO geojson;
+    END;
+$function$
+;
+
+COMMENT ON FUNCTION api.export_moorages_geojson_fn(out jsonb) IS 'Export moorages as geojson';
+
+-- Update mapgl_fn, update moorages map sub query to export more properties (notes,reference_count) from moorages tbl
+DROP FUNCTION IF EXISTS api.mapgl_fn;
+CREATE OR REPLACE FUNCTION api.mapgl_fn(start_log integer DEFAULT NULL::integer, end_log integer DEFAULT NULL::integer, start_date text DEFAULT NULL::text, end_date text DEFAULT NULL::text, OUT geojson jsonb)
+ RETURNS jsonb
+AS $mapgl$
+    DECLARE
+        _geojson jsonb;
+    BEGIN
+        -- Using sub query to force id order by time
+        -- Extract GeoJSON LineString and merge into a new GeoJSON
+        --raise WARNING 'input % % %' , start_log, end_log, public.isnumeric(end_log::text);
+        IF start_log IS NOT NULL AND end_log IS NULL THEN
+            end_log := start_log;
+        END IF;
+        IF start_date IS NOT NULL AND end_date IS NULL THEN
+            end_date := start_date;
+        END IF;
+        --raise WARNING 'input % % %' , start_log, end_log, public.isnumeric(end_log::text);
+        IF start_log IS NOT NULL AND public.isnumeric(start_log::text) AND public.isnumeric(end_log::text) THEN
+            SELECT jsonb_agg(
+                        jsonb_build_object('type', 'Feature',
+                                            'properties', f->'properties',
+                                            'geometry', jsonb_build_object( 'coordinates', f->'geometry'->'coordinates', 'type', 'LineString'))
+                    ) INTO _geojson
+            FROM (
+                SELECT jsonb_array_elements(track_geojson->'features') AS f
+                    FROM api.logbook l
+                    WHERE l.id >= start_log
+                        AND l.id <= end_log
+                        AND l.track_geojson IS NOT NULL
+                    ORDER BY l._from_time ASC
+            ) AS sub
+            WHERE (f->'geometry'->>'type') = 'LineString';
+        ELSIF start_date IS NOT NULL AND public.isdate(start_date::text) AND public.isdate(end_date::text) THEN
+            SELECT jsonb_agg(
+                        jsonb_build_object('type', 'Feature',
+                                            'properties', f->'properties',
+                                            'geometry', jsonb_build_object( 'coordinates', f->'geometry'->'coordinates', 'type', 'LineString'))
+                    ) INTO _geojson
+            FROM (
+                SELECT jsonb_array_elements(track_geojson->'features') AS f
+                    FROM api.logbook l
+                    WHERE l._from_time >= start_date::TIMESTAMPTZ
+                        AND l._to_time <= end_date::TIMESTAMPTZ + interval '23 hours 59 minutes'
+                        AND l.track_geojson IS NOT NULL
+                    ORDER BY l._from_time ASC
+            ) AS sub
+            WHERE (f->'geometry'->>'type') = 'LineString';
+        ELSE
+            SELECT jsonb_agg(
+                        jsonb_build_object('type', 'Feature',
+                                            'properties', f->'properties',
+                                            'geometry', jsonb_build_object( 'coordinates', f->'geometry'->'coordinates', 'type', 'LineString'))
+                    ) INTO _geojson
+            FROM (
+                SELECT jsonb_array_elements(track_geojson->'features') AS f
+                    FROM api.logbook l
+                    WHERE l.track_geojson IS NOT NULL
+                    ORDER BY l._from_time ASC
+            ) AS sub
+            WHERE (f->'geometry'->>'type') = 'LineString';
+        END IF;
+        -- Generate the GeoJSON with all moorages
+        SELECT jsonb_build_object(
+            'type', 'FeatureCollection',
+            'features', _geojson ||                 ( SELECT
+                    jsonb_agg(ST_AsGeoJSON(m.*)::JSONB) as moorages_geojson
+                    FROM
+                    ( SELECT
+                        id,name,stay_code,notes,reference_count,
+                        EXTRACT(DAY FROM justify_hours ( stay_duration )) AS Total_Stay,
+                        geog
+                        FROM api.moorages
+                        WHERE geog IS NOT null
+                    ) AS m
+                ) ) INTO geojson;
+    END;
+$mapgl$ LANGUAGE plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    api.mapgl_fn
+    IS 'Generate a geojson with all logs as geometry LineString with moorages as geometry Point to be process by DeckGL';
+
+-- Update logbook_update_geojson_fn, fix corrupt linestring properties
+CREATE OR REPLACE FUNCTION public.logbook_update_geojson_fn(_id integer, _start text, _end text, OUT _track_geojson json)
+ RETURNS json
+ LANGUAGE plpgsql
+AS $function$
+    declare
+     log_geojson jsonb;
+     metrics_geojson jsonb;
+     _map jsonb;
+    begin
+        -- GeoJson Feature Logbook linestring
+        SELECT
+            ST_AsGeoJSON(log.*) into log_geojson
+        FROM
+           ( SELECT
+                id,name,
+                distance,
+                duration,
+                avg_speed,
+                max_speed,
+                max_wind_speed,
+                _from_time,
+                _to_time,
+                _from_moorage_id,
+                _to_moorage_id,
+                notes,
+                extra['avg_wind_speed'] as avg_wind_speed,
+                track_geom
+                FROM api.logbook
+                WHERE id = _id
+           ) AS log;
+        -- GeoJson Feature Metrics point
+        SELECT
+            json_agg(ST_AsGeoJSON(t.*)::json) into metrics_geojson
+        FROM (
+            ( SELECT
+                time,
+                courseovergroundtrue,
+                speedoverground,
+                windspeedapparent,
+                longitude,latitude,
+                '' AS notes,
+                coalesce(metersToKnots((metrics->'environment.wind.speedTrue')::NUMERIC), null) as truewindspeed,
+                coalesce(radiantToDegrees((metrics->'environment.wind.directionTrue')::NUMERIC), null) as truewinddirection,
+                coalesce(status, null) as status,
+                st_makepoint(longitude,latitude) AS geo_point
+                FROM api.metrics m
+                WHERE m.latitude IS NOT NULL
+                    AND m.longitude IS NOT NULL
+                    AND time >= _start::TIMESTAMPTZ
+                    AND time <= _end::TIMESTAMPTZ
+                    AND vessel_id = current_setting('vessel.id', false)
+                ORDER BY m.time ASC
+            )
+        ) AS t;
+
+        -- Merge jsonb
+        SELECT log_geojson::jsonb || metrics_geojson::jsonb into _map;
+        -- output
+        SELECT
+            json_build_object(
+                'type', 'FeatureCollection',
+                'features', _map
+            ) into _track_geojson;
+    END;
+$function$
+;
+COMMENT ON FUNCTION public.logbook_update_geojson_fn(in int4, in text, in text, out json) IS 'Update log details with geojson';
+
+-- Add trigger to update logbook stats from user edit geojson
+DROP FUNCTION IF EXISTS public.update_logbook_with_geojson_trigger_fn;
+CREATE OR REPLACE FUNCTION public.update_logbook_with_geojson_trigger_fn() RETURNS TRIGGER AS $$
+DECLARE
+    geojson JSONB;
+    feature JSONB;
+BEGIN
+    -- Parse the incoming GeoJSON data from the track_geojson column
+    geojson := NEW.track_geojson::jsonb;
+
+    -- Extract the first feature (assume it is the LineString)
+    feature := geojson->'features'->0;
+
+	IF geojson IS NOT NULL AND feature IS NOT NULL AND (feature->'properties' ? 'x-update') THEN
+
+	    -- Get properties from the feature to extract avg_speed, and max_speed
+	    NEW.avg_speed := (feature->'properties'->>'avg_speed')::FLOAT;
+	    NEW.max_speed := (feature->'properties'->>'max_speed')::FLOAT;
+        NEW.max_wind_speed := (feature->'properties'->>'max_wind_speed')::FLOAT;
+	    NEW.extra := jsonb_set( NEW.extra,
+				      '{avg_wind_speed}',
+				      to_jsonb((feature->'properties'->>'avg_wind_speed')::FLOAT),
+				      true  -- this flag means it will create the key if it does not exist
+				    );
+
+	    -- Calculate the LineString's actual spatial distance
+	    NEW.track_geom := ST_GeomFromGeoJSON(feature->'geometry'::text);
+	    NEW.distance := TRUNC (ST_Length(NEW.track_geom,false)::INT * 0.0005399568, 4);  -- convert to NM
+
+	END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+-- Description
+COMMENT ON FUNCTION
+    public.update_logbook_with_geojson_trigger_fn
+    IS 'Extracts specific properties (distance, duration, avg_speed, max_speed) from a geometry LINESTRING part of a GeoJSON FeatureCollection, and then updates a column in a table named logbook';
+
+-- Add trigger on logbook update to update metrics from track_geojson
+CREATE TRIGGER update_logbook_with_geojson_trigger_fn
+    BEFORE UPDATE OF track_geojson ON api.logbook
+    FOR EACH ROW
+    WHEN (NEW.track_geojson IS DISTINCT FROM OLD.track_geojson)
+    EXECUTE FUNCTION public.update_logbook_with_geojson_trigger_fn();
+
+-- Refresh user_role permissions
+GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA api TO user_role;
+
+-- Update version
+UPDATE public.app_settings
+	SET value='0.7.8'
+	WHERE "name"='app.version';
+
+\c postgres

initdb/PGSAIL_VERSION

@@ -1 +1 @@
-0.7.7
+0.8.1

tests/index.js

@@ -89,7 +89,7 @@ const fs = require('fs');
       */
     ],
     user_fn: [
-      { url: '/rpc/timelapse_fn',
+      { url: '/rpc/export_logbooks_geojson_point_trips_fn',
         payload: {
               start_log: 1
             },
@@ -97,7 +97,7 @@ const fs = require('fs');
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_geojson_fn',
+      { url: '/rpc/export_logbook_geojson_trip_fn',
         payload: {
               _id: 1
             },
@@ -105,7 +105,15 @@ const fs = require('fs');
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_gpx_fn',
+      { url: '/rpc/export_logbook_gpx_trip_fn',
+        payload: {
+              _id: 1
+            },
+        res: {
+          obj_name: null
+        }
+      },
+      { url: '/rpc/export_logbook_kml_trip_fn',
         payload: {
               _id: 1
             },
@@ -228,15 +236,15 @@ const fs = require('fs');
       */
     ],
     user_fn: [
-      { url: '/rpc/timelapse_fn',
+      { url: '/rpc/export_logbooks_geojson_point_trips_fn',
         payload: {
-              start_log: 3
+              start_log: 1
             },
         res: {
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_geojson_fn',
+      { url: '/rpc/export_logbook_geojson_trip_fn',
         payload: {
               _id: 3
             },
@@ -244,7 +252,15 @@ const fs = require('fs');
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_gpx_fn',
+      { url: '/rpc/export_logbook_gpx_trip_fn',
+        payload: {
+              _id: 3
+            },
+        res: {
+          obj_name: null
+        }
+      },
+      { url: '/rpc/export_logbook_kml_trip_fn',
         payload: {
               _id: 3
             },
@@ -600,7 +616,7 @@ request.set('User-Agent', 'PostgSail unit tests');
     for (i = 0; i < test.vessel_metrics['metrics'].length; i++) {
       data[i] = test.vessel_metrics['metrics'][i];
       // Override time, -2h to allow to new data later without delay.
-      data[i]['time'] = moment.utc().subtract(2, 'hours').add(i, 'minutes').format();
+      data[i]['time'] = moment.utc().subtract(1, 'day').add(i, 'minutes').format();
       // Override client_id
       data[i]['client_id'] = test.vessel_metadata.client_id;
     }
@@ -611,6 +627,11 @@ request.set('User-Agent', 'PostgSail unit tests');
     // Force last valid entry to be back in time from previous, it should be ignore silently
     data.at(-1).time = moment.utc(data.at(-3).time).subtract(1, 'minutes').format();
     //console.log(data[0]);
+    // Force the -2 entry to be in the future add 1 year, it should be ignore silently
+    data.splice(i-2, 1, data.at(-2))
+    data.at(-3).time = moment.utc(data.at(-3).time).add(1, 'year').format();
+    //console.log(data.at(-2));
+    //console.log(data.at(-1));
 
     it('/metrics?select=time', function(done) {
       request = supertest.agent(test.cname);
@@ -629,6 +650,7 @@ request.set('User-Agent', 'PostgSail unit tests');
           res.header['content-type'].should.match(new RegExp('json','g'));
           res.header['server'].should.match(new RegExp('postgrest','g'));
           should.exist(res.body);
+          //console.log(res.body);
           res.body.length.should.match(test.vessel_metrics['metrics'].length-3);
           done(err);
         });

tests/index2.js

@@ -6,7 +6,7 @@
 *
 * npm install supertest should mocha mochawesome moment
 * alias mocha="./node_modules/mocha/bin/_mocha"
-* mocha index.js --reporter mochawesome --reporter-options reportDir=/mnt/postgsail/,reportFilename=report_api.html
+* mocha index2.js --reporter mochawesome --reporter-options reportDir=/mnt/postgsail/,reportFilename=report_api.html
 *
 */
 
@@ -77,7 +77,7 @@ const metrics_simulator = require('./metrics_sample_simulator.json');
       */
     ],
     user_fn: [
-      { url: '/rpc/timelapse_fn',
+      { url: '/rpc/export_logbooks_geojson_point_trips_fn',
         payload: {
               start_log: 4
             },
@@ -85,7 +85,7 @@ const metrics_simulator = require('./metrics_sample_simulator.json');
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_geojson_fn',
+      { url: '/rpc/export_logbook_geojson_trip_fn',
         payload: {
               _id: 4
             },
@@ -93,7 +93,15 @@ const metrics_simulator = require('./metrics_sample_simulator.json');
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_gpx_fn',
+      { url: '/rpc/export_logbook_gpx_trip_fn',
+        payload: {
+              _id: 4
+            },
+        res: {
+          obj_name: null
+        }
+      },
+      { url: '/rpc/export_logbook_kml_trip_fn',
         payload: {
               _id: 4
             },
@@ -432,11 +440,11 @@ request.set('User-Agent', 'PostgSail unit tests');
     for (i = 0; i < test.vessel_metrics['metrics'].length; i++) {
       data[i] = test.vessel_metrics['metrics'][i];
       // Override time, +1h because previous sample include 47 entry.
-      data[i]['time'] = moment().add(1, 'hour').add(i, 'minutes').format();
+      data[i]['time'] = moment.utc().subtract(2, 'hours').add(i, 'minutes').format();
       // Override client_id
       data[i]['client_id'] = test.vessel_metadata.client_id;
     }
-    console.log(data[0]);
+    //console.log(data[0]);
 
     it('/metrics?select=time', function(done) {
       request = supertest.agent(test.cname);

tests/index3.js

@@ -6,7 +6,7 @@
 *
 * npm install supertest should mocha mochawesome moment
 * alias mocha="./node_modules/mocha/bin/_mocha"
-* mocha index.js --reporter mochawesome --reporter-options reportDir=/mnt/postgsail/,reportFilename=report_api.html
+* mocha index3.js --reporter mochawesome --reporter-options reportDir=/mnt/postgsail/,reportFilename=report_api.html
 *
 */
 
@@ -79,7 +79,8 @@ var moment = require('moment');
       }
     ],
     user_fn: [
-      { url: '/rpc/timelapse_fn',
+      { //url: '/rpc/timelapse_fn',
+        url: '/rpc/export_logbooks_geojson_linestring_trips_fn',
         payload: {
               start_log: 2
             },
@@ -87,7 +88,17 @@ var moment = require('moment');
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_geojson_fn',
+      { //url: '/rpc/timelapse_fn',
+        url: '/rpc/export_logbooks_geojson_point_trips_fn',
+        payload: {
+              start_log: 2
+            },
+        res: {
+          obj_name: 'geojson'
+        }
+      },
+      { //url: '/rpc/export_logbook_geojson_fn',
+        url: '/rpc/export_logbook_geojson_trip_fn',
         payload: {
               _id: 2
             },
@@ -95,7 +106,8 @@ var moment = require('moment');
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_gpx_fn',
+      { //url: '/rpc/export_logbook_gpx_fn',
+        url: '/rpc/export_logbook_kml_trip_fn',
         payload: {
               _id: 2
             },
@@ -103,7 +115,8 @@ var moment = require('moment');
           obj_name: null
         }
       },
-      { url: '/rpc/export_logbook_kml_fn',
+      { //url: '/rpc/export_logbook_kml_fn',
+        url: '/rpc/export_logbook_kml_trip_fn',
         payload: {
               _id: 2
             },
@@ -123,6 +136,12 @@ var moment = require('moment');
           obj_name: null
         }
       },
+      { url: '/rpc/export_moorages_kml_fn',
+        payload: {},
+        res: {
+          obj_name: null
+        }
+      },
       { url: '/rpc/find_log_from_moorage_fn',
         payload: {
           _id: 2
@@ -277,7 +296,8 @@ var moment = require('moment');
       }
     ],
     user_fn: [
-      { url: '/rpc/timelapse_fn',
+      { //url: '/rpc/timelapse_fn',
+        url: '/rpc/export_logbooks_geojson_linestring_trips_fn',
         payload: {
               start_log: 4
             },
@@ -285,7 +305,17 @@ var moment = require('moment');
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_geojson_fn',
+      { //url: '/rpc/timelapse_fn',
+        url: '/rpc/export_logbooks_geojson_point_trips_fn',
+        payload: {
+              start_log: 4
+            },
+        res: {
+          obj_name: 'geojson'
+        }
+      },
+      { //url: '/rpc/export_logbook_geojson_fn',
+        url: '/rpc/export_logbook_geojson_trip_fn',
         payload: {
               _id: 4
             },
@@ -293,7 +323,8 @@ var moment = require('moment');
           obj_name: 'geojson'
         }
       },
-      { url: '/rpc/export_logbook_gpx_fn',
+      { //url: '/rpc/export_logbook_gpx_fn',
+        url: '/rpc/export_logbook_gpx_trip_fn',
         payload: {
               _id: 4
             },
@@ -301,7 +332,8 @@ var moment = require('moment');
           obj_name: null
         }
       },
-      { url: '/rpc/export_logbook_kml_fn',
+      { //url: '/rpc/export_logbook_kml_fn',
+        url: '/rpc/export_logbook_kml_trip_fn',
         payload: {
               _id: 4
             },
@@ -309,7 +341,8 @@ var moment = require('moment');
           obj_name: null
         }
       },
-      { url: '/rpc/export_logbooks_gpx_fn',
+      { //url: '/rpc/export_logbooks_gpx_fn',
+        url: '/rpc/export_logbooks_kml_trips_fn',
         payload: {
             start_log: 3,
             end_log: 4
@@ -318,7 +351,8 @@ var moment = require('moment');
           obj_name: null
         }
       },
-      { url: '/rpc/export_logbooks_kml_fn',
+      { //url: '/rpc/export_logbooks_kml_fn',
+        url: '/rpc/export_logbooks_kml_trips_fn',
         payload: {
             start_log: 3,
             end_log: 4
@@ -339,6 +373,12 @@ var moment = require('moment');
           obj_name: null
         }
       },
+      { url: '/rpc/export_moorages_kml_fn',
+        payload: {},
+        res: {
+          obj_name: null
+        }
+      },
       { url: '/rpc/find_log_from_moorage_fn',
         payload: {
           _id: 4

tests/index5.js

@@ -45,13 +45,22 @@ var moment = require("moment");
       res: {},
     },
     timelapse: {
-      url: "/rpc/timelapse_fn",
+      //url: "/rpc/timelapse_fn",
+      url: '/rpc/export_logbooks_geojson_linestring_trips_fn',
       header: { name: "x-is-public", value: btoa("kapla,public_timelapse,1") },
       payload: null,
       res: {},
     },
     timelapse_full: {
-      url: "/rpc/timelapse_fn",
+      //url: "/rpc/timelapse_fn",
+      url: '/rpc/export_logbooks_geojson_linestring_trips_fn',
+      header: { name: "x-is-public", value: btoa("kapla,public_timelapse,0") },
+      payload: null,
+      res: {},
+    },
+    replay_full: {
+      //url: "/rpc/timelapse_fn",
+      url: '/rpc/export_logbooks_geojson_point_trips_fn',
       header: { name: "x-is-public", value: btoa("kapla,public_timelapse,0") },
       payload: null,
       res: {},
@@ -69,7 +78,7 @@ var moment = require("moment");
       res: {},
     },
     export_gpx: {
-      url: "/rpc/export_logbook_gpx_fn",
+      url: "/rpc/export_logbook_gpx_trip_fn",
       header: { name: "x-is-public", value: btoa("kapla,public_logs,0") },
       payload: null,
       res: {},
@@ -97,13 +106,21 @@ var moment = require("moment");
       res: {},
     },
     timelapse: {
-      url: "/rpc/timelapse_fn",
+      //url: "/rpc/timelapse_fn",
+      url: '/rpc/export_logbooks_geojson_linestring_trips_fn',
       header: { name: "x-is-public", value: btoa("aava,public_timelapse,3") },
       payload: null,
       res: {},
     },
     timelapse_full: {
-      url: "/rpc/timelapse_fn",
+      //url: "/rpc/timelapse_fn",
+      url: '/rpc/export_logbooks_geojson_linestring_trips_fn',
+      header: { name: "x-is-public", value: btoa("aava,public_timelapse,0") },
+      payload: null,
+      res: {},
+    },
+    replay_full: {
+      url: '/rpc/export_logbooks_geojson_point_trips_fn',
       header: { name: "x-is-public", value: btoa("aava,public_timelapse,0") },
       payload: null,
       res: {},
@@ -121,7 +138,7 @@ var moment = require("moment");
       res: {},
     },
     export_gpx: {
-      url: "/rpc/export_logbook_gpx_fn",
+      url: "/rpc/export_logbook_gpx_trip_fn",
       header: { name: "x-is-public", value: btoa("aava,public_logs,0") },
       payload: null,
       res: {},
@@ -183,7 +200,7 @@ var moment = require("moment");
             done(err);
           });
       });
-      it("/rpc/timelapse_fn, api_anonymous no jwt token", function (done) {
+      it("/rpc/export_logbooks_geojson_linestring_trips_fn, api_anonymous no jwt token", function (done) {
         // Reset agent so we do not save cookies
         request = supertest.agent(test.cname);
         request
@@ -200,6 +217,23 @@ var moment = require("moment");
             done(err);
           });
       });
+      it("/rpc/export_logbooks_geojson_point_trips_fn, api_anonymous no jwt token", function (done) {
+        // Reset agent so we do not save cookies
+        request = supertest.agent(test.cname);
+        request
+          .post(test.replay_full.url)
+          .set(test.replay_full.header.name, test.replay_full.header.value)
+          .set("Accept", "application/json")
+          .end(function (err, res) {
+            console.log(res.text);
+            res.status.should.equal(200); // return 404 as it is not enable in user settings.
+            should.exist(res.header["content-type"]);
+            should.exist(res.header["server"]);
+            res.header["content-type"].should.match(new RegExp("json", "g"));
+            res.header["server"].should.match(new RegExp("postgrest", "g"));
+            done(err);
+          });
+      });
       it("/rpc/export_logbook_gpx_fn, api_anonymous no jwt token", function (done) {
         // Reset agent so we do not save cookies
         request = supertest.agent(test.cname);

tests/index6.js

@@ -1,13 +1,13 @@
 "use strict";
 /*
- * Unit test #5
+ * Unit test #6
  * Public/Anonymous access
  *
  * process.env.PGSAIL_API_URI = from inside the docker
  *
  * npm install supertest should mocha mochawesome moment
  * alias mocha="./node_modules/mocha/bin/_mocha"
- * mocha index5.js --reporter mochawesome --reporter-options reportDir=/mnt/postgsail/,reportFilename=report_api.html
+ * mocha index6.js --reporter mochawesome --reporter-options reportDir=/mnt/postgsail/,reportFilename=report_api.html
  *
  */
 
@@ -52,12 +52,17 @@ var moment = require("moment");
       res: {},
     },
     timelapse: {
-      url: "/rpc/timelapse_fn",
+      url: "/rpc/export_logbooks_geojson_linestring_trips_fn",
       payload: null,
       res: {},
     },
     timelapse_full: {
-      url: "/rpc/timelapse_fn",
+      url: "/rpc/export_logbooks_geojson_linestring_trips_fn",
+      payload: null,
+      res: {},
+    },
+    replay_full: {
+      url: "/rpc/export_logbooks_geojson_point_trips_fn",
       payload: null,
       res: {},
     },
@@ -72,7 +77,7 @@ var moment = require("moment");
       res: {},
     },
     export_gpx: {
-      url: "/rpc/export_logbook_gpx_fn",
+      url: "/rpc/export_logbook_gpx_trip_fn",
       payload: null,
       res: {},
     },
@@ -165,7 +170,7 @@ var moment = require("moment");
             done(err);
           });
       });
-      it("/rpc/timelapse_fn, api_anonymous no jwt token", function (done) {
+      it("/rpc/export_logbooks_geojson_linestring_trips_fn, api_anonymous no jwt token", function (done) {
         // Reset agent so we do not save cookies
         request = supertest.agent(test.cname);
         request
@@ -181,7 +186,23 @@ var moment = require("moment");
             done(err);
           });
       });
-      it("/rpc/export_logbook_gpx_fn, api_anonymous no jwt token", function (done) {
+      it("/rpc/export_logbooks_geojson_point_trips_fn, api_anonymous no jwt token", function (done) {
+        // Reset agent so we do not save cookies
+        request = supertest.agent(test.cname);
+        request
+          .post(test.replay_full.url)
+          .set("Accept", "application/json")
+          .end(function (err, res) {
+            console.log(res.text);
+            res.status.should.equal(200);
+            should.exist(res.header["content-type"]);
+            should.exist(res.header["server"]);
+            res.header["content-type"].should.match(new RegExp("json", "g"));
+            res.header["server"].should.match(new RegExp("postgrest", "g"));
+            done(err);
+          });
+      });
+      it("/rpc/export_logbook_gpx_trip_fn, api_anonymous no jwt token", function (done) {
         // Reset agent so we do not save cookies
         request = supertest.agent(test.cname);
         request

tests/metrics_sample_aava.json

@@ -180,6 +180,18 @@
 		"status" : "sailing",
 		"metrics" : {"navigation.log": 17441766, "navigation.trip.log": 80747, "navigation.headingTrue": 3.5972, "navigation.gnss.satellites": 10, "environment.depth.belowKeel": 20.948999999999998, "navigation.magneticVariation": 0.1414, "navigation.speedThroughWater": 3.47, "environment.water.temperature": 313.15, "electrical.batteries.1.current": 192.4, "electrical.batteries.1.voltage": 14.56, "navigation.gnss.antennaAltitude": 0.39, "network.n2k.ngt-1.130356.errorID": 0, "network.n2k.ngt-1.130356.modelID": 14, "environment.depth.belowTransducer": 20.95, "electrical.batteries.1.temperature": 299.82, "environment.depth.transducerToKeel": -0.001, "navigation.gnss.horizontalDilution": 0.8, "network.n2k.ngt-1.130356.ch1.rxLoad": 4, "network.n2k.ngt-1.130356.ch1.txLoad": 0, "network.n2k.ngt-1.130356.ch2.rxLoad": 0, "network.n2k.ngt-1.130356.ch2.txLoad": 64, "network.n2k.ngt-1.130356.ch1.deleted": 0, "network.n2k.ngt-1.130356.ch2.deleted": 0, "network.n2k.ngt-1.130356.ch2Bandwidth": 3, "network.n2k.ngt-1.130356.ch1.bandwidth": 2, "network.n2k.ngt-1.130356.ch1.rxDropped": 0, "network.n2k.ngt-1.130356.ch2.rxDropped": 0, "network.n2k.ngt-1.130356.ch1.rxFiltered": 0, "network.n2k.ngt-1.130356.ch2.rxFiltered": 0, "network.n2k.ngt-1.130356.ch1.rxBandwidth": 4, "network.n2k.ngt-1.130356.ch1.txBandwidth": 0, "network.n2k.ngt-1.130356.ch2.rxBandwidth": 0, "network.n2k.ngt-1.130356.ch2.txBandwidth": 10, "network.n2k.ngt-1.130356.uniChannelCount": 2, "network.n2k.ngt-1.130356.indiChannelCount": 2, "network.n2k.ngt-1.130356.ch1.BufferLoading": 0, "network.n2k.ngt-1.130356.ch2.bufferLoading": 0, "network.n2k.ngt-1.130356.ch1.PointerLoading": 0, "network.n2k.ngt-1.130356.ch2.pointerLoading": 0}
 	},
+	{
+		"time" : "2022-07-31T11:41:28.561Z",
+		"client_id" : "vessels.urn:mrn:imo:mmsi:987654321",
+		"latitude" : 59.7163052,
+		"longitude" : 25.7325741,
+		"speedoverground" : 9.5,
+		"courseovergroundtrue" : 198.8,
+		"windspeedapparent" : 18.0,
+		"anglespeedapparent" : 41.0,
+		"status" : "sailing",
+		"metrics" : {"navigation.log": 17441766, "navigation.trip.log": 80747, "navigation.headingTrue": 3.5972, "navigation.gnss.satellites": 10, "environment.depth.belowKeel": 20.948999999999998, "navigation.magneticVariation": 0.1414, "navigation.speedThroughWater": 3.47, "environment.water.temperature": 313.15, "electrical.batteries.1.current": 192.4, "electrical.batteries.1.voltage": 14.56, "navigation.gnss.antennaAltitude": 0.39, "network.n2k.ngt-1.130356.errorID": 0, "network.n2k.ngt-1.130356.modelID": 14, "environment.depth.belowTransducer": 20.95, "electrical.batteries.1.temperature": 299.82, "environment.depth.transducerToKeel": -0.001, "navigation.gnss.horizontalDilution": 0.8, "network.n2k.ngt-1.130356.ch1.rxLoad": 4, "network.n2k.ngt-1.130356.ch1.txLoad": 0, "network.n2k.ngt-1.130356.ch2.rxLoad": 0, "network.n2k.ngt-1.130356.ch2.txLoad": 64, "network.n2k.ngt-1.130356.ch1.deleted": 0, "network.n2k.ngt-1.130356.ch2.deleted": 0, "network.n2k.ngt-1.130356.ch2Bandwidth": 3, "network.n2k.ngt-1.130356.ch1.bandwidth": 2, "network.n2k.ngt-1.130356.ch1.rxDropped": 0, "network.n2k.ngt-1.130356.ch2.rxDropped": 0, "network.n2k.ngt-1.130356.ch1.rxFiltered": 0, "network.n2k.ngt-1.130356.ch2.rxFiltered": 0, "network.n2k.ngt-1.130356.ch1.rxBandwidth": 4, "network.n2k.ngt-1.130356.ch1.txBandwidth": 0, "network.n2k.ngt-1.130356.ch2.rxBandwidth": 0, "network.n2k.ngt-1.130356.ch2.txBandwidth": 10, "network.n2k.ngt-1.130356.uniChannelCount": 2, "network.n2k.ngt-1.130356.indiChannelCount": 2, "network.n2k.ngt-1.130356.ch1.BufferLoading": 0, "network.n2k.ngt-1.130356.ch2.bufferLoading": 0, "network.n2k.ngt-1.130356.ch1.PointerLoading": 0, "network.n2k.ngt-1.130356.ch2.pointerLoading": 0}
+	},
 	{
 		"time" : "2022-07-31T11:42:28.569Z",
 		"client_id" : "vessels.urn:mrn:imo:mmsi:987654321",

tests/package.json

@@ -8,5 +8,8 @@
     "moment": "^2.29.4",
     "should": "^13.2.3",
     "supertest": "^6.3.3"
+  },
+  "devDependencies": {
+    "schemalint": "^2.0.5"
   }
 }

tests/sql/badges.sql

@@ -17,14 +17,19 @@ SELECT set_config('vessel.id', :'vessel_id', false) IS NOT NULL as vessel_id;
 
 \echo 'Insert new api.logbook for badges'
 INSERT INTO api.logbook
-    (id, active, "name", "_from", "_from_lat", "_from_lng", "_to", "_to_lat", "_to_lng", track_geom, track_geog, track_geojson, "_from_time", "_to_time", distance, duration, avg_speed, max_speed, max_wind_speed, notes, vessel_id)
+    (id, active, "name", "_from", "_from_lat", "_from_lng", "_to", "_to_lat", "_to_lng", trip, "_from_time", "_to_time", distance, duration, avg_speed, max_speed, max_wind_speed, notes, vessel_id)
     OVERRIDING SYSTEM VALUE VALUES
-    (nextval('api.logbook_id_seq'), false, 'Tropics Zone', NULL, NULL, NULL, NULL, NULL, NULL, 'SRID=4326;LINESTRING (-63.151124640791096 14.01074681627324, -77.0912026418618 12.870995731013664)'::public.geometry, NULL, NULL, NOW(), NOW(), 123, NULL, NULL, NULL, NULL, NULL, current_setting('vessel.id', false)),
-    (nextval('api.logbook_id_seq'), false, 'Alaska Zone', NULL, NULL, NULL, NULL, NULL, NULL, 'SRID=4326;LINESTRING (-143.5773697471158 59.4404631255976, -152.35402122385003 56.58243132943173)'::public.geometry, NULL, NULL, NOW(), NOW(), 1234, NULL, NULL, NULL, NULL, NULL, current_setting('vessel.id', false));
+    (nextval('api.logbook_id_seq'), false, 'Tropics Zone', NULL, NULL, NULL, NULL, NULL, NULL, 'SRID=4326;[Point(-63.151124640791096 14.01074681627324)@2025-01-01, Point(-77.0912026418618 12.870995731013664)@2025-01-02]'::public.tgeogpoint, NOW(), NOW(), 123, NULL, NULL, NULL, NULL, NULL, current_setting('vessel.id', false)),
+    (nextval('api.logbook_id_seq'), false, 'Alaska Zone', NULL, NULL, NULL, NULL, NULL, NULL, 'SRID=4326;[Point(-143.5773697471158 59.4404631255976)@2025-01-01, Point(-152.35402122385003 56.58243132943173)@2025-01-02]'::public.tgeogpoint, NOW(), NOW(), 1234, NULL, NULL, NULL, NULL, NULL, current_setting('vessel.id', false));
+
+-- Transform static geometry LINESTRING to mobilitydb
+-- 'SRID=4326;LINESTRING (-63.151124640791096 14.01074681627324, -77.0912026418618 12.870995731013664)'::public.geometry
+-- 'SRID=4326;LINESTRING (-143.5773697471158 59.4404631255976, -152.35402122385003 56.58243132943173)'::public.geometry
+--SELECT ST_AsGeoJSON('SRID=4326;LINESTRING (-63.151124640791096 14.01074681627324, -77.0912026418618 12.870995731013664)'::public.geometry);
+--SELECT ST_AsGeoJSON(trajectory('SRID=4326;[Point(-63.151124640791096 14.01074681627324)@2025-01-01, Point(-77.0912026418618 12.870995731013664)@2025-01-02]'::public.tgeogpoint));
 
 \echo 'Set config'
 SELECT set_config('user.email', 'demo+kapla@openplotter.cloud', false);
---SELECT set_config('vessel.client_id', 'vessels.urn:mrn:imo:mmsi:123456789', false);
 
 \echo 'Process badge'
 SELECT badges_logbook_fn(5,NOW()::TEXT);
@@ -32,11 +37,10 @@ SELECT badges_logbook_fn(6,NOW()::TEXT);
 SELECT badges_geom_fn(5,NOW()::TEXT);
 SELECT badges_geom_fn(6,NOW()::TEXT);
 
-\echo 'Check badges for user'
+\echo 'Check badges for all users'
 SELECT jsonb_object_keys ( a.preferences->'badges' ) FROM auth.accounts a;
 
 \echo 'Check details from vessel_id kapla'
---SELECT get_user_settings_from_vesselid_fn('vessels.urn:mrn:imo:mmsi:123456789'::TEXT);
 SELECT 
     json_build_object( 
             'boat', v.name,
@@ -53,10 +57,10 @@ SELECT
 
 \echo 'Insert new api.moorages for badges'
 INSERT INTO api.moorages
-    (id,"name",country,stay_code,stay_duration,reference_count,latitude,longitude,geog,home_flag,notes,vessel_id)
+    (id,"name",country,stay_code,latitude,longitude,geog,home_flag,notes,vessel_id)
     OVERRIDING SYSTEM VALUE VALUES
-    (8,'Badge Mooring Pro',NULL,3,'11 days 00:39:56.418',1,NULL,NULL,NULL,false,'Badge Mooring Pro',current_setting('vessel.id', false)),
-    (9,'Badge Anchormaster',NULL,2,'26 days 00:49:56.418',1,NULL,NULL,NULL,false,'Badge Anchormaster',current_setting('vessel.id', false));
+    (8,'Badge Mooring Pro',NULL,3,NULL,NULL,NULL,false,'Badge Mooring Pro',current_setting('vessel.id', false)),
+    (9,'Badge Anchormaster',NULL,2,NULL,NULL,NULL,false,'Badge Anchormaster',current_setting('vessel.id', false));
 
 \echo 'Set config'
 SELECT set_config('user.email', 'demo+aava@openplotter.cloud', false);
@@ -68,6 +72,9 @@ SELECT set_config('vessel.id', :'vessel_id', false) IS NOT NULL as vessel_id;
 \echo 'Process badge'
 SELECT badges_moorages_fn();
 
+\echo 'Check badges for all users'
+SELECT jsonb_object_keys ( a.preferences->'badges' ) FROM auth.accounts a;
+
 \echo 'Check details from vessel_id aava'
 --SELECT get_user_settings_from_vesselid_fn('vessels.urn:mrn:imo:mmsi:787654321'::TEXT);
 SELECT 

tests/sql/badges.sql.output

@@ -27,7 +27,7 @@ badges_geom_fn |
 -[ RECORD 1 ]--+-
 badges_geom_fn | 
 
-Check badges for user
+Check badges for all users
 -[ RECORD 1 ]-----+------------------
 jsonb_object_keys | Helmsman
 -[ RECORD 2 ]-----+------------------
@@ -76,6 +76,38 @@ Process badge
 -[ RECORD 1 ]------+-
 badges_moorages_fn | 
 
+Check badges for all users
+-[ RECORD 1 ]-----+------------------
+jsonb_object_keys | Helmsman
+-[ RECORD 2 ]-----+------------------
+jsonb_object_keys | Wake Maker
+-[ RECORD 3 ]-----+------------------
+jsonb_object_keys | Balearic Sea
+-[ RECORD 4 ]-----+------------------
+jsonb_object_keys | Stormtrooper
+-[ RECORD 5 ]-----+------------------
+jsonb_object_keys | Gulf of Finland
+-[ RECORD 6 ]-----+------------------
+jsonb_object_keys | Helmsman
+-[ RECORD 7 ]-----+------------------
+jsonb_object_keys | Wake Maker
+-[ RECORD 8 ]-----+------------------
+jsonb_object_keys | Club Alaska
+-[ RECORD 9 ]-----+------------------
+jsonb_object_keys | Stormtrooper
+-[ RECORD 10 ]----+------------------
+jsonb_object_keys | Captain Award
+-[ RECORD 11 ]----+------------------
+jsonb_object_keys | Caribbean Sea
+-[ RECORD 12 ]----+------------------
+jsonb_object_keys | Gulf of Alaska
+-[ RECORD 13 ]----+------------------
+jsonb_object_keys | Gulf of Finland
+-[ RECORD 14 ]----+------------------
+jsonb_object_keys | Navigator Award
+-[ RECORD 15 ]----+------------------
+jsonb_object_keys | Tropical Traveler
+
 Check details from vessel_id aava
 -[ RECORD 1 ]-+--------------------------------------------------------------------------------------------------------------
 user_settings | {"boat" : "aava", "recipient" : "first_aava", "email" : "demo+aava@openplotter.cloud", "pushover_key" : null}

tests/sql/cron_post_jobs.sql

@@ -25,7 +25,8 @@ SELECT set_config('vessel.id', :'vessel_id', false) IS NOT NULL as vessel_id;
 \echo 'logbook'
 SELECT count(*) FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
 \echo 'logbook'
-SELECT name,_from_time IS NOT NULL AS _from_time,_to_time IS NOT NULL AS _to_time, track_geojson IS NOT NULL AS track_geojson, track_geom, distance,duration,avg_speed,max_speed,max_wind_speed,notes,extra FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
+--SELECT name,_from_time IS NOT NULL AS _from_time,_to_time IS NOT NULL AS _to_time, track_geojson IS NOT NULL AS track_geojson, trajectory(trip)::geometry as track_geom, distance,duration,round(avg_speed::NUMERIC,6),max_speed,max_wind_speed,notes,extra FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
+SELECT name,_from_time IS NOT NULL AS _from_time,_to_time IS NOT NULL AS _to_time, api.export_logbook_geojson_trip_fn(id) IS NOT NULL AS track_geojson, trajectory(trip)::geometry as track_geom, distance,duration,round(avg_speed::NUMERIC,6),max_speed,max_wind_speed,notes,extra FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
 
 -- Test stays for user
 \echo 'stays'
@@ -69,11 +70,28 @@ SELECT extra FROM api.logbook l WHERE id = 1 AND vessel_id = current_setting('ve
 SELECT api.update_logbook_observations_fn(1, '{"tags": ["tag_name"]}'::TEXT);
 SELECT extra FROM api.logbook l WHERE id = 1 AND vessel_id = current_setting('vessel.id', false);
 
+\echo 'Check logbook geojson LineString properties'
+WITH logbook_tbl AS (
+    SELECT api.logbook_update_geojson_trip_fn(id) AS geojson
+    FROM api.logbook WHERE id = 1 AND vessel_id = current_setting('vessel.id', false)
+)
+SELECT jsonb_object_keys(jsonb_path_query(geojson, '$.features[0].properties'))
+    FROM logbook_tbl;
+\echo 'Check logbook geojson Point properties'
+WITH logbook_tbl AS (
+    SELECT api.logbook_update_geojson_trip_fn(id) AS geojson
+    FROM api.logbook WHERE id = 1 AND vessel_id = current_setting('vessel.id', false)
+)
+SELECT jsonb_object_keys(jsonb_path_query(geojson, '$.features[1].properties'))
+    FROM logbook_tbl;
+
 -- Check export
---\echo 'check logbook export fn'
+\echo 'Check logbook export fn'
 --SELECT api.export_logbook_geojson_fn(1);
 --SELECT api.export_logbook_gpx_fn(1);
 --SELECT api.export_logbook_kml_fn(1);
+SELECT api.export_logbook_gpx_trip_fn(1) IS NOT NULL AS gpx_trip;
+SELECT api.export_logbook_kml_trip_fn(1) IS NOT NULL AS kml_trip;
 
 -- Check history
 --\echo 'monitoring history fn'

tests/sql/cron_post_jobs.sql.output

@@ -16,28 +16,28 @@ logbook
 count | 2
 
 logbook
--[ RECORD 1 ]--+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 1 ]--+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 name           | Pojoviken to Norra hamnen
 _from_time     | t
 _to_time       | t
 track_geojson  | t
-track_geom     | 0102000020E61000001C000000B0DEBBE0E68737404DA938FBF0094E40B0DEBBE0E68737404DA938FBF0094E4020D26F5F0786374030BB270F0B094E400C6E7ED60F843740AA60545227084E40D60FC48C03823740593CE27D42074E407B39D9F322803740984C158C4A064E4091ED7C3F357E3740898BB63D54054E40A8A1208B477C37404BA3DC9059044E404C5CB4EDA17A3740C4F856115B034E40A9A44E4013793740D8F0F44A59024E40E4839ECDAA773740211FF46C56014E405408D147067637408229F03B73004E40787AA52C43743740F90FE9B7AFFF4D40F8098D4D18723740C217265305FF4D4084E82303537037409A2D464AA0FE4D4022474DCE636F37402912396A72FE4D408351499D806E374088CFB02B40FE4D4076711B0DE06D3740B356C7040FFE4D404EAC66B0BC6E374058A835CD3BFE4D40D7A3703D0A6F3740D3E10EC15EFE4D4087602F277B6E3740A779C7293AFE4D4087602F277B6E3740A779C7293AFE4D402063EE5A426E3740B5A679C729FE4D40381DEE10EC6D37409ECA7C1A0AFE4D40E2C46A06CB6B37400A43F7BF36FD4D4075931804566E3740320BDAD125FD4D409A2D464AA06E37404A5658830AFD4D40029A081B9E6E37404A5658830AFD4D40
+track_geom     | 0102000020E61000001A000000B0DEBBE0E68737404DA938FBF0094E4020D26F5F0786374030BB270F0B094E400C6E7ED60F843740AA60545227084E40D60FC48C03823740593CE27D42074E407B39D9F322803740984C158C4A064E4091ED7C3F357E3740898BB63D54054E40A8A1208B477C37404BA3DC9059044E404C5CB4EDA17A3740C4F856115B034E40A9A44E4013793740D8F0F44A59024E40E4839ECDAA773740211FF46C56014E405408D147067637408229F03B73004E40787AA52C43743740F90FE9B7AFFF4D40F8098D4D18723740C217265305FF4D4084E82303537037409A2D464AA0FE4D4022474DCE636F37402912396A72FE4D408351499D806E374088CFB02B40FE4D4076711B0DE06D3740B356C7040FFE4D404EAC66B0BC6E374058A835CD3BFE4D40D7A3703D0A6F3740D3E10EC15EFE4D4087602F277B6E3740A779C7293AFE4D402063EE5A426E3740B5A679C729FE4D40381DEE10EC6D37409ECA7C1A0AFE4D40E2C46A06CB6B37400A43F7BF36FD4D4075931804566E3740320BDAD125FD4D409A2D464AA06E37404A5658830AFD4D40029A081B9E6E37404A5658830AFD4D40
 distance       | 7.6447
 duration       | PT27M
-avg_speed      | 3.6357142857142852
+round          | 3.635714
 max_speed      | 6.1
 max_wind_speed | 22.1
 notes          | 
 extra          | {"metrics": {"propulsion.main.runTime": "PT10S"}, "observations": {"seaState": -1, "visibility": -1, "cloudCoverage": -1}, "avg_wind_speed": 14.549999999999999}
--[ RECORD 2 ]--+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 2 ]--+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 name           | Norra hamnen to Ekenäs
 _from_time     | t
 _to_time       | t
 track_geojson  | t
-track_geom     | 0102000020E610000015000000029A081B9E6E37404A5658830AFD4D40029A081B9E6E37404A5658830AFD4D404806A6C0EF6C3740DA1B7C6132FD4D40FE65F7E461693740226C787AA5FC4D407DD3E10EC1663740B29DEFA7C6FB4D40898BB63D5465374068479724BCFA4D409A5271F6E1633740B6847CD0B3F94D40431CEBE236623740E9263108ACF84D402C6519E2585F37407E678EBFC7F74D4096218E75715B374027C5B45C23F74D402AA913D044583740968DE1C46AF64D405AF5B9DA8A5537407BEF829B9FF54D407449C2ABD253374086C954C1A8F44D407D1A0AB278543740F2B0506B9AF34D409D11A5BDC15737406688635DDCF24D4061C3D32B655937402CAF6F3ADCF14D408988888888583740B3319C58CDF04D4021FAC8C0145837408C94405DB7EF4D40B8F9593F105B37403DC0804BEDEE4D40DE4C5FE2A25D3740AE47E17A14EE4D40DE4C5FE2A25D3740AE47E17A14EE4D40
+track_geom     | 0102000020E610000013000000029A081B9E6E37404A5658830AFD4D404806A6C0EF6C3740DA1B7C6132FD4D40FE65F7E461693740226C787AA5FC4D407DD3E10EC1663740B29DEFA7C6FB4D40898BB63D5465374068479724BCFA4D409A5271F6E1633740B6847CD0B3F94D40431CEBE236623740E9263108ACF84D402C6519E2585F37407E678EBFC7F74D4096218E75715B374027C5B45C23F74D402AA913D044583740968DE1C46AF64D405AF5B9DA8A5537407BEF829B9FF54D407449C2ABD253374086C954C1A8F44D407D1A0AB278543740F2B0506B9AF34D409D11A5BDC15737406688635DDCF24D4061C3D32B655937402CAF6F3ADCF14D408988888888583740B3319C58CDF04D4021FAC8C0145837408C94405DB7EF4D40B8F9593F105B37403DC0804BEDEE4D40DE4C5FE2A25D3740AE47E17A14EE4D40
 distance       | 8.8968
 duration       | PT20M
-avg_speed      | 5.4523809523809526
+round          | 5.452381
 max_speed      | 6.5
 max_wind_speed | 37.2
 notes          | 
@@ -73,14 +73,14 @@ SELECT 1
 -[ RECORD 1 ]+----------
 name         | "kapla"
 count        | 4
-max_speed    | 7.1
-max_distance | 8.8968
+max_speed    | 9.5
+max_distance | 68.8677
 max_duration | "PT1H11M"
 ?column?     | 3
-?column?     | 30.1154
-?column?     | "PT2H43M"
+?column?     | 90.6030
+?column?     | "PT2H44M"
 ?column?     | 44.2
-?column?     | 2
+?column?     | 3
 ?column?     | 4
 ?column?     | 4
 first_date   | t
@@ -110,3 +110,64 @@ update_logbook_observations_fn | t
 -[ RECORD 1 ]--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 extra | {"tags": ["tag_name"], "metrics": {"propulsion.main.runTime": "PT10S"}, "observations": {"seaState": -1, "visibility": -1, "cloudCoverage": 1}, "avg_wind_speed": 14.549999999999999}
 
+Check logbook geojson LineString properties
+-[ RECORD 1 ]-----+-----------------
+jsonb_object_keys | id
+-[ RECORD 2 ]-----+-----------------
+jsonb_object_keys | _to
+-[ RECORD 3 ]-----+-----------------
+jsonb_object_keys | name
+-[ RECORD 4 ]-----+-----------------
+jsonb_object_keys | _from
+-[ RECORD 5 ]-----+-----------------
+jsonb_object_keys | notes
+-[ RECORD 6 ]-----+-----------------
+jsonb_object_keys | times
+-[ RECORD 7 ]-----+-----------------
+jsonb_object_keys | _to_time
+-[ RECORD 8 ]-----+-----------------
+jsonb_object_keys | distance
+-[ RECORD 9 ]-----+-----------------
+jsonb_object_keys | duration
+-[ RECORD 10 ]----+-----------------
+jsonb_object_keys | avg_speed
+-[ RECORD 11 ]----+-----------------
+jsonb_object_keys | max_speed
+-[ RECORD 12 ]----+-----------------
+jsonb_object_keys | _from_time
+-[ RECORD 13 ]----+-----------------
+jsonb_object_keys | _to_moorage_id
+-[ RECORD 14 ]----+-----------------
+jsonb_object_keys | avg_wind_speed
+-[ RECORD 15 ]----+-----------------
+jsonb_object_keys | max_wind_speed
+-[ RECORD 16 ]----+-----------------
+jsonb_object_keys | _from_moorage_id
+
+Check logbook geojson Point properties
+-[ RECORD 1 ]-----+-------
+jsonb_object_keys | cog
+-[ RECORD 2 ]-----+-------
+jsonb_object_keys | sog
+-[ RECORD 3 ]-----+-------
+jsonb_object_keys | twa
+-[ RECORD 4 ]-----+-------
+jsonb_object_keys | twd
+-[ RECORD 5 ]-----+-------
+jsonb_object_keys | tws
+-[ RECORD 6 ]-----+-------
+jsonb_object_keys | time
+-[ RECORD 7 ]-----+-------
+jsonb_object_keys | trip
+-[ RECORD 8 ]-----+-------
+jsonb_object_keys | notes
+-[ RECORD 9 ]-----+-------
+jsonb_object_keys | status
+
+Check logbook export fn
+-[ RECORD 1 ]
+gpx_trip | t
+
+-[ RECORD 1 ]
+kml_trip | t
+

tests/sql/cron_run_jobs.sql.output

@@ -17,5 +17,5 @@ any_pending_jobs | 2
 
 Check the number of metrics entries
 -[ RECORD 1 ]-+----
-metrics_count | 172
+metrics_count | 173
 

tests/sql/grafana.sql

@@ -15,15 +15,15 @@ select current_database();
 -- grafana_auth
 SET ROLE grafana_auth;
 \echo 'ROLE grafana_auth current_setting'
-SELECT current_user, current_setting('user.email', true), current_setting('vessel.client_id', true), current_setting('vessel.id', true);
+SELECT current_user, current_setting('user.email', true), current_setting('vessel.id', true);
 
 --SELECT a.pass,v.name,m.client_id FROM auth.accounts a JOIN auth.vessels v ON a.email = 'demo+kapla@openplotter.cloud' AND a.role = 'user_role' AND cast(a.preferences->>'email_valid' as Boolean) = True AND v.owner_email = a.email JOIN api.metadata m ON m.vessel_id = v.vessel_id;
 --SELECT a.pass,v.name,m.client_id FROM auth.accounts a JOIN auth.vessels v ON a.email = 'demo+kapla@openplotter.cloud' AND a.role = 'user_role' AND v.owner_email = a.email JOIN api.metadata m ON m.vessel_id = v.vessel_id;
 \echo 'link vessel and user based on current_setting'
-SELECT v.name,m.client_id FROM auth.accounts a JOIN auth.vessels v ON a.role = 'user_role' AND v.owner_email = a.email JOIN api.metadata m ON m.vessel_id = v.vessel_id;
+SELECT v.name,m.client_id FROM auth.accounts a JOIN auth.vessels v ON a.role = 'user_role' AND v.owner_email = a.email JOIN api.metadata m ON m.vessel_id = v.vessel_id ORDER BY a.id DESC;
 
 \echo 'auth.accounts details'
-SELECT a.user_id IS NOT NULL AS user_id, a.email, a.first, a.last, a.pass IS NOT NULL AS pass, a.role, a.preferences->'telegram'->'chat' AS telegram, a.preferences->'pushover_user_key' AS pushover_user_key FROM auth.accounts AS a;
+SELECT a.user_id IS NOT NULL AS user_id, a.email, a.first, a.last, a.pass IS NOT NULL AS pass, a.role, a.preferences->'telegram'->'chat' AS telegram, a.preferences->'pushover_user_key' AS pushover_user_key FROM auth.accounts AS a ORDER BY a.id DESC;
 \echo 'auth.vessels details'
 --SELECT 'SELECT ' || STRING_AGG('v.' || column_name, ', ') || ' FROM auth.vessels AS v' FROM information_schema.columns WHERE table_name = 'vessels' AND table_schema = 'auth' AND column_name NOT IN ('created_at', 'updated_at');
 SELECT v.vessel_id IS NOT NULL AS vessel_id, v.owner_email, v.mmsi, v.name, v.role FROM auth.vessels AS v;
@@ -46,7 +46,7 @@ SELECT v.vessel_id as "vessel_id" FROM auth.vessels v WHERE v.owner_email = 'dem
 SELECT set_config('vessel.id', :'vessel_id', false) IS NOT NULL as vessel_id;
 
 --SELECT current_user, current_setting('user.email', true), current_setting('vessel.client_id', true), current_setting('vessel.id', true);
-SELECT current_user, current_setting('user.email', true), current_setting('vessel.client_id', true);
+SELECT current_user, current_setting('user.email', true);
 
 SELECT v.name AS __text, m.client_id AS __value FROM auth.vessels v JOIN api.metadata m ON v.owner_email = 'demo+kapla@openplotter.cloud' and m.vessel_id = v.vessel_id;
 
@@ -67,13 +67,18 @@ SELECT l.id, l.name, l.from, l.to, l.distance, l.duration, l._from_moorage_id, l
 --SELECT * FROM api.stays s;
 SELECT m.id, m.vessel_id IS NOT NULL AS vessel_id, m.moorage_id, m.active, m.name IS NOT NULL AS name, m.latitude, m.longitude, m.geog, m.arrived IS NOT NULL AS arrived, m.departed IS NOT NULL AS departed, m.duration, m.stay_code, m.notes FROM api.stays AS m;
 
-\echo 'stays_view'
+\echo 'api.stays_view'
 --SELECT * FROM api.stays_view s;
 SELECT m.id, m.name IS NOT NULL AS name, m.moorage, m.moorage_id, m.duration, m.stayed_at, m.stayed_at_id, m.arrived IS NOT NULL AS arrived, m.departed IS NOT NULL AS departed, m.notes FROM api.stays_view AS m;
 
 \echo 'api.moorages'
 --SELECT * FROM api.moorages m;
-SELECT m.id, m.vessel_id IS NOT NULL AS vessel_id, m.name, m.country, m.stay_code, m.stay_duration, m.reference_count, m.latitude, m.longitude, m.geog, m.home_flag, m.notes FROM api.moorages AS m;
+--SELECT m.id, m.vessel_id IS NOT NULL AS vessel_id, m.name, m.country, m.stay_code, m.stay_duration, m.reference_count, m.latitude, m.longitude, m.geog, m.home_flag, m.notes FROM api.moorages AS m;
+SELECT m.id, m.vessel_id IS NOT NULL AS vessel_id, m.name, m.country, m.stay_code, m.latitude, m.longitude, m.geog, m.home_flag, m.notes FROM api.moorages AS m;
 
 \echo 'api.moorages_view'
-SELECT * FROM api.moorages_view s;
+SELECT * FROM api.moorages_view;
+
+\echo 'api.moorage_view'
+--SELECT * FROM api.moorage_view;
+SELECT m.id, m.name, default_stay, m.latitude, m.longitude, m.geog, m.home, m.notes, logs_count, stays_count, stay_first_seen_id, stay_last_seen_id, stay_first_seen IS NOT NULL AS stay_first_seen, stay_last_seen IS NOT NULL AS stay_last_seen FROM api.moorage_view m;

tests/sql/grafana.sql.output

@@ -11,7 +11,6 @@ ROLE grafana_auth current_setting
 current_user    | grafana_auth
 current_setting | 
 current_setting | 
-current_setting | 
 
 link vessel and user based on current_setting
 -[ RECORD 1 ]----------------------------------------------------------------
@@ -93,7 +92,6 @@ vessel_id | t
 -[ RECORD 1 ]---+-----------------------------
 current_user    | grafana
 current_setting | demo+kapla@openplotter.cloud
-current_setting | 
 
 -[ RECORD 1 ]--------------------------------------------------------------
 __text  | kapla
@@ -186,7 +184,7 @@ duration   | PT2M
 stay_code  | 4
 notes      | 
 
-stays_view
+api.stays_view
 -[ RECORD 1 ]+---------------------
 id           | 2
 name         | t
@@ -211,45 +209,39 @@ departed     | t
 notes        | new stay note 3
 
 api.moorages
--[ RECORD 1 ]---+---------------------------------------------------
-id              | 1
-vessel_id       | t
-name            | patch moorage name 3
-country         | fi
-stay_code       | 2
-stay_duration   | PT1M
-reference_count | 1
-latitude        | 60.0776666666667
-longitude       | 23.5308666666667
-geog            | 0101000020E6100000B9DEBBE0E687374052A938FBF0094E40
-home_flag       | t
-notes           | new moorage note 3
--[ RECORD 2 ]---+---------------------------------------------------
-id              | 2
-vessel_id       | t
-name            | Norra hamnen
-country         | fi
-stay_code       | 4
-stay_duration   | PT2M
-reference_count | 2
-latitude        | 59.9768833333333
-longitude       | 23.4321
-geog            | 0101000020E6100000029A081B9E6E3740455658830AFD4D40
-home_flag       | f
-notes           | 
--[ RECORD 3 ]---+---------------------------------------------------
-id              | 3
-vessel_id       | t
-name            | Ekenäs
-country         | fi
-stay_code       | 1
-stay_duration   | PT0S
-reference_count | 1
-latitude        | 59.86
-longitude       | 23.3657666666667
-geog            | 0101000020E6100000E84C5FE2A25D3740AE47E17A14EE4D40
-home_flag       | f
-notes           | 
+-[ RECORD 1 ]-------------------------------------------------
+id        | 1
+vessel_id | t
+name      | patch moorage name 3
+country   | fi
+stay_code | 2
+latitude  | 60.0776666666667
+longitude | 23.5308666666667
+geog      | 0101000020E6100000B9DEBBE0E687374052A938FBF0094E40
+home_flag | t
+notes     | new moorage note 3
+-[ RECORD 2 ]-------------------------------------------------
+id        | 2
+vessel_id | t
+name      | Norra hamnen
+country   | fi
+stay_code | 4
+latitude  | 59.9768833333333
+longitude | 23.4321
+geog      | 0101000020E6100000029A081B9E6E3740455658830AFD4D40
+home_flag | f
+notes     | 
+-[ RECORD 3 ]-------------------------------------------------
+id        | 3
+vessel_id | t
+name      | Ekenäs
+country   | fi
+stay_code | 1
+latitude  | 59.86
+longitude | 23.3657666666667
+geog      | 0101000020E6100000E84C5FE2A25D3740AE47E17A14EE4D40
+home_flag | f
+notes     | 
 
 api.moorages_view
 -[ RECORD 1 ]-------+---------------------
@@ -257,23 +249,67 @@ id                  | 2
 moorage             | Norra hamnen
 default_stay        | Dock
 default_stay_id     | 4
-total_stay          | 0
-total_duration      | PT2M
 arrivals_departures | 2
+total_duration      | PT2M
 -[ RECORD 2 ]-------+---------------------
 id                  | 1
 moorage             | patch moorage name 3
 default_stay        | Anchor
 default_stay_id     | 2
-total_stay          | 0
-total_duration      | PT1M
 arrivals_departures | 1
+total_duration      | PT1M
 -[ RECORD 3 ]-------+---------------------
 id                  | 3
 moorage             | Ekenäs
 default_stay        | Unknown
 default_stay_id     | 1
-total_stay          | 0
-total_duration      | PT0S
 arrivals_departures | 1
+total_duration      | PT0S
+
+api.moorage_view
+-[ RECORD 1 ]------+---------------------------------------------------
+id                 | 3
+name               | Ekenäs
+default_stay       | Unknown
+latitude           | 59.86
+longitude          | 23.3657666666667
+geog               | 0101000020E6100000E84C5FE2A25D3740AE47E17A14EE4D40
+home               | f
+notes              | 
+logs_count         | 1
+stays_count        | 0
+stay_first_seen_id | 
+stay_last_seen_id  | 
+stay_first_seen    | f
+stay_last_seen     | f
+-[ RECORD 2 ]------+---------------------------------------------------
+id                 | 2
+name               | Norra hamnen
+default_stay       | Dock
+latitude           | 59.9768833333333
+longitude          | 23.4321
+geog               | 0101000020E6100000029A081B9E6E3740455658830AFD4D40
+home               | f
+notes              | 
+logs_count         | 2
+stays_count        | 1
+stay_first_seen_id | 2
+stay_last_seen_id  | 2
+stay_first_seen    | t
+stay_last_seen     | t
+-[ RECORD 3 ]------+---------------------------------------------------
+id                 | 1
+name               | patch moorage name 3
+default_stay       | Anchor
+latitude           | 60.0776666666667
+longitude          | 23.5308666666667
+geog               | 0101000020E6100000B9DEBBE0E687374052A938FBF0094E40
+home               | t
+notes              | new moorage note 3
+logs_count         | 1
+stays_count        | 1
+stay_first_seen_id | 1
+stay_last_seen_id  | 1
+stay_first_seen    | t
+stay_last_seen     | t
 

tests/sql/logbook.sql

@@ -26,7 +26,8 @@ SELECT set_config('vessel.id', :'vessel_id', false) IS NOT NULL as vessel_id;
 \echo 'logbook'
 SELECT count(*) FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
 \echo 'logbook'
-SELECT name,_from_time IS NOT NULL AS _from_time,_to_time IS NOT NULL AS _to_time, track_geojson IS NOT NULL AS track_geojson, track_geom, distance,duration,avg_speed,max_speed,max_wind_speed,notes,extra FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
+-- track_geom and track_geojson are now dynamic from mobilitydb
+SELECT name,_from_time IS NOT NULL AS _from_time, _to_time IS NOT NULL AS _to_time, trajectory(trip) AS track_geom, distance,duration,avg_speed,max_speed,max_wind_speed,notes,extra FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false) ORDER BY id ASC;
 
 -- Delete logbook for user
 \echo 'Delete logbook for user kapla'

tests/sql/logbook.sql.output

@@ -17,12 +17,11 @@ logbook
 count | 4
 
 logbook
--[ RECORD 1 ]--+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 1 ]--+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 name           | patch log name 3
 _from_time     | t
 _to_time       | t
-track_geojson  | t
-track_geom     | 0102000020E61000001C000000B0DEBBE0E68737404DA938FBF0094E40B0DEBBE0E68737404DA938FBF0094E4020D26F5F0786374030BB270F0B094E400C6E7ED60F843740AA60545227084E40D60FC48C03823740593CE27D42074E407B39D9F322803740984C158C4A064E4091ED7C3F357E3740898BB63D54054E40A8A1208B477C37404BA3DC9059044E404C5CB4EDA17A3740C4F856115B034E40A9A44E4013793740D8F0F44A59024E40E4839ECDAA773740211FF46C56014E405408D147067637408229F03B73004E40787AA52C43743740F90FE9B7AFFF4D40F8098D4D18723740C217265305FF4D4084E82303537037409A2D464AA0FE4D4022474DCE636F37402912396A72FE4D408351499D806E374088CFB02B40FE4D4076711B0DE06D3740B356C7040FFE4D404EAC66B0BC6E374058A835CD3BFE4D40D7A3703D0A6F3740D3E10EC15EFE4D4087602F277B6E3740A779C7293AFE4D4087602F277B6E3740A779C7293AFE4D402063EE5A426E3740B5A679C729FE4D40381DEE10EC6D37409ECA7C1A0AFE4D40E2C46A06CB6B37400A43F7BF36FD4D4075931804566E3740320BDAD125FD4D409A2D464AA06E37404A5658830AFD4D40029A081B9E6E37404A5658830AFD4D40
+track_geom     | 0102000020E61000001A000000B0DEBBE0E68737404DA938FBF0094E4020D26F5F0786374030BB270F0B094E400C6E7ED60F843740AA60545227084E40D60FC48C03823740593CE27D42074E407B39D9F322803740984C158C4A064E4091ED7C3F357E3740898BB63D54054E40A8A1208B477C37404BA3DC9059044E404C5CB4EDA17A3740C4F856115B034E40A9A44E4013793740D8F0F44A59024E40E4839ECDAA773740211FF46C56014E405408D147067637408229F03B73004E40787AA52C43743740F90FE9B7AFFF4D40F8098D4D18723740C217265305FF4D4084E82303537037409A2D464AA0FE4D4022474DCE636F37402912396A72FE4D408351499D806E374088CFB02B40FE4D4076711B0DE06D3740B356C7040FFE4D404EAC66B0BC6E374058A835CD3BFE4D40D7A3703D0A6F3740D3E10EC15EFE4D4087602F277B6E3740A779C7293AFE4D402063EE5A426E3740B5A679C729FE4D40381DEE10EC6D37409ECA7C1A0AFE4D40E2C46A06CB6B37400A43F7BF36FD4D4075931804566E3740320BDAD125FD4D409A2D464AA06E37404A5658830AFD4D40029A081B9E6E37404A5658830AFD4D40
 distance       | 7.6447
 duration       | PT27M
 avg_speed      | 3.6357142857142852
@@ -30,12 +29,11 @@ max_speed      | 6.1
 max_wind_speed | 22.1
 notes          | new log note 3
 extra          | {"tags": ["tag_name"], "metrics": {"propulsion.main.runTime": "PT10S"}, "observations": {"seaState": -1, "visibility": -1, "cloudCoverage": 1}, "avg_wind_speed": 14.549999999999999}
--[ RECORD 2 ]--+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 2 ]--+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 name           | Norra hamnen to Ekenäs
 _from_time     | t
 _to_time       | t
-track_geojson  | t
-track_geom     | 0102000020E610000015000000029A081B9E6E37404A5658830AFD4D40029A081B9E6E37404A5658830AFD4D404806A6C0EF6C3740DA1B7C6132FD4D40FE65F7E461693740226C787AA5FC4D407DD3E10EC1663740B29DEFA7C6FB4D40898BB63D5465374068479724BCFA4D409A5271F6E1633740B6847CD0B3F94D40431CEBE236623740E9263108ACF84D402C6519E2585F37407E678EBFC7F74D4096218E75715B374027C5B45C23F74D402AA913D044583740968DE1C46AF64D405AF5B9DA8A5537407BEF829B9FF54D407449C2ABD253374086C954C1A8F44D407D1A0AB278543740F2B0506B9AF34D409D11A5BDC15737406688635DDCF24D4061C3D32B655937402CAF6F3ADCF14D408988888888583740B3319C58CDF04D4021FAC8C0145837408C94405DB7EF4D40B8F9593F105B37403DC0804BEDEE4D40DE4C5FE2A25D3740AE47E17A14EE4D40DE4C5FE2A25D3740AE47E17A14EE4D40
+track_geom     | 0102000020E610000013000000029A081B9E6E37404A5658830AFD4D404806A6C0EF6C3740DA1B7C6132FD4D40FE65F7E461693740226C787AA5FC4D407DD3E10EC1663740B29DEFA7C6FB4D40898BB63D5465374068479724BCFA4D409A5271F6E1633740B6847CD0B3F94D40431CEBE236623740E9263108ACF84D402C6519E2585F37407E678EBFC7F74D4096218E75715B374027C5B45C23F74D402AA913D044583740968DE1C46AF64D405AF5B9DA8A5537407BEF829B9FF54D407449C2ABD253374086C954C1A8F44D407D1A0AB278543740F2B0506B9AF34D409D11A5BDC15737406688635DDCF24D4061C3D32B655937402CAF6F3ADCF14D408988888888583740B3319C58CDF04D4021FAC8C0145837408C94405DB7EF4D40B8F9593F105B37403DC0804BEDEE4D40DE4C5FE2A25D3740AE47E17A14EE4D40
 distance       | 8.8968
 duration       | PT20M
 avg_speed      | 5.4523809523809526
@@ -43,11 +41,10 @@ max_speed      | 6.5
 max_wind_speed | 37.2
 notes          | 
 extra          | {"metrics": {"propulsion.main.runTime": "PT11S"}, "observations": {"seaState": -1, "visibility": -1, "cloudCoverage": -1}, "avg_wind_speed": 10.476190476190478}
--[ RECORD 3 ]--+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 3 ]--+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 name           | Tropics Zone
 _from_time     | t
 _to_time       | t
-track_geojson  | f
 track_geom     | 0102000020E610000002000000A4E85E0D58934FC000DC509B80052C40BC069B43D64553C090510727F3BD2940
 distance       | 123
 duration       | 
@@ -56,11 +53,10 @@ max_speed      |
 max_wind_speed | 
 notes          | 
 extra          | 
--[ RECORD 4 ]--+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-[ RECORD 4 ]--+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 name           | Alaska Zone
 _from_time     | t
 _to_time       | t
-track_geojson  | f
 track_geom     | 0102000020E610000002000000FDB11ED079F261C090C47F1861B84D40D3505124540B63C09C091C1C8D4A4C40
 distance       | 1234
 duration       | 

tests/sql/mobilitydb.sql

@@ -0,0 +1,82 @@
+---------------------------------------------------------------------------
+-- Listing
+--
+
+-- List current database
+select current_database();
+
+-- connect to the DB
+\c signalk
+
+-- output display format
+\x on
+
+-- Assign vessel_id var
+SELECT v.vessel_id as "vessel_id_kapla" FROM auth.vessels v WHERE v.owner_email = 'demo+kapla@openplotter.cloud' \gset
+SELECT v.vessel_id as "vessel_id_aava" FROM auth.vessels v WHERE v.owner_email = 'demo+aava@openplotter.cloud' \gset
+
+-- user_role
+SET ROLE user_role;
+-- Switch user as aava
+SELECT set_config('vessel.id', :'vessel_id_aava', false) IS NOT NULL as vessel_id;
+
+-- Update notes
+\echo 'Add a note for an entry from a trip'
+-- Get original value, should be empty
+SELECT numInstants(trip), valueAtTimestamp(trip_notes,timestampN(trip,13)) from api.logbook where id = 3;
+-- Create the string
+SELECT concat('["fishing"@', timestampN(trip,13),',""@',timestampN(trip,14),']') as to_be_update FROM api.logbook where id = 3 \gset
+--\echo :to_be_update
+-- Update the notes
+SELECT api.update_trip_notes_fn(3, :'to_be_update');
+-- Compare with previous value, should include "fishing"
+SELECT valueAtTimestamp(trip_notes,timestampN(trip,13)) from api.logbook where id = 3;
+
+-- Delete notes
+\echo 'Delete an entry from a trip'
+-- Get original value, should be 45
+SELECT numInstants(trip), jsonb_array_length(api.export_logbook_geojson_point_trip_fn(id)->'features') from api.logbook where id = 3;
+-- Extract the timestamps of the invalid coords
+--SELECT timestampN(trip,14) as "to_be_delete" FROM api.logbook where id = 3 \gset
+SELECT concat('[', timestampN(trip,14),',',timestampN(trip,15),')') as to_be_delete FROM api.logbook where id = 3 \gset
+--\echo :to_be_delete
+-- Delete the entry for all trip sequence
+SELECT api.delete_trip_entry_fn(3, :'to_be_delete');
+-- Compare with previous value, should be 44
+SELECT numInstants(trip), jsonb_array_length(api.export_logbook_geojson_point_trip_fn(id)->'features') from api.logbook where id = 3;
+
+-- Export PostGIS geography from a trip
+\echo 'Export PostGIS geography from trajectory'
+--SELECT ST_IsValid(trajectory(trip)::geometry) IS TRUE FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
+SELECT trajectory(trip)::geometry FROM api.logbook WHERE id = 3;
+
+-- Export GeoJSON from a trip
+\echo 'Export GeoJSON with properties from a trip'
+SELECT jsonb_array_length(api.export_logbook_geojson_point_trip_fn(3)->'features');
+
+-- Export GPX from a trip
+\echo 'Export GPX from a trip'
+SELECT api.export_logbook_gpx_trip_fn(3) IS NOT NULL;
+
+-- Export KML from a trip
+\echo 'Export KML from a trip'
+SELECT api.export_logbook_kml_trip_fn(3) IS NOT NULL;
+
+-- Switch user as kapla
+SELECT set_config('vessel.id', :'vessel_id_kapla', false) IS NOT NULL as vessel_id;
+
+-- Export timelapse as Geometry LineString from a trip
+\echo 'Export timelapse as Geometry LineString from a trip'
+SELECT api.export_logbooks_geojson_linestring_trips_fn(1,2) FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
+
+-- Export timelapse as Geometry Point from a trip
+\echo 'Export timelapse as Geometry Point from a trip'
+SELECT api.export_logbooks_geojson_point_trips_fn(1,2) IS NOT NULL FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
+
+-- Export GPX from trips
+\echo 'Export GPX from trips'
+SELECT api.export_logbooks_gpx_trips_fn(1,2) IS NOT NULL FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);
+
+-- Export KML from trips
+\echo 'Export KML from trips'
+SELECT api.export_logbooks_kml_trips_fn(1,2) IS NOT NULL FROM api.logbook WHERE vessel_id = current_setting('vessel.id', false);

tests/sql/mobilitydb.sql.output

@@ -0,0 +1,69 @@
+ current_database 
+------------------
+ signalk
+(1 row)
+
+You are now connected to database "signalk" as user "username".
+Expanded display is on.
+SET
+-[ RECORD 1 ]
+vessel_id | t
+
+Add a note for an entry from a trip
+-[ RECORD 1 ]----+---
+numinstants      | 45
+valueattimestamp | 
+
+-[ RECORD 1 ]--------+-
+update_trip_notes_fn | 
+
+-[ RECORD 1 ]----+--------
+valueattimestamp | fishing
+
+Delete an entry from a trip
+-[ RECORD 1 ]------+---
+numinstants        | 45
+jsonb_array_length | 45
+
+-[ RECORD 1 ]--------+-
+delete_trip_entry_fn | 
+
+-[ RECORD 1 ]------+---
+numinstants        | 44
+jsonb_array_length | 44
+
+Export PostGIS geography from trajectory
+-[ RECORD 1 ]----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+trajectory | 0102000020E61000002B0000001CACA4BA25BC3840217B18B556DC4D40569FABADD8BB384012EA33B10ADC4D408A65E9F989BB384018A023A8D0DB4D40B174F4AE30BB38409951E2299ADB4D407C348B06DFBA3840443A973D64DB4D40FE4465C39ABA38409313927131DB4D402C9CA4F963BA384029E6C52EF6DA4D4010559D7A49BA384019E25817B7DA4D401BF0F96184BC3840F868160DBEDC4D4095B7239C16BC38401DDB7C6D47DC4D40559FABADD8BB384012EA33B10ADC4D408A65E9F989BB384018A023A8D0DB4D40B274F4AE30BB38409951E2299ADB4D407C348B06DFBA3840443A973D64DB4D40FE4465C39ABA38409313927131DB4D402C9CA4F963BA384029E6C52EF6DA4D4010559D7A49BA384019E25817B7DA4D401BF0F96184BC3840F868160DBEDC4D4098B1B2C755BC38404D52F41B81DC4D4095B7239C16BC38401DDB7C6D47DC4D407448C55AD7BB38406CABFEAD09DC4D40D8367B5688BB38400D54C6BFCFDB4D40B274F4AE30BB38409951E2299ADB4D401256BEC2DDBA3840EB22E06B63DB4D40FE4465C39ABA38409313927131DB4D402C9CA4F963BA384029E6C52EF6DA4D40407D152A49BA3840CDA66D0DB6DA4D40BDBFE6C182BC3840F9269710BDDC4D4098B1B2C755BC38404D52F41B81DC4D4024308CAA15BC3840B85DC36746DC4D407448C55AD7BB38406CABFEAD09DC4D40D8367B5688BB38400D54C6BFCFDB4D408224A24E2FBB384070BEC74F99DB4D4028B0A5EC99BA3840F90C4D7E30DB4D402C4080B163BA38402FA93528F5DA4D40407D152A49BA3840CDA66D0DB6DA4D40BDBFE6C182BC3840F9269710BDDC4D4099B1B2C755BC38404D52F41B81DC4D4024308CAA15BC3840B85DC36746DC4D407448C55AD7BB38406CABFEAD09DC4D40D8367B5688BB38400D54C6BFCFDB4D408224A24E2FBB384070BEC74F99DB4D401156BEC2DDBA3840EB22E06B63DB4D40
+
+Export GeoJSON with properties from a trip
+-[ RECORD 1 ]------+---
+jsonb_array_length | 44
+
+Export GPX from a trip
+-[ RECORD 1 ]
+?column? | t
+
+Export KML from a trip
+-[ RECORD 1 ]
+?column? | t
+
+-[ RECORD 1 ]
+vessel_id | t
+
+Export timelapse as Geometry LineString from a trip
+-[ RECORD 1 ]-------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+export_logbooks_geojson_linestring_trips_fn | {"type": "FeatureCollection", "features": [{"type": "Feature", "geometry": {"type": "LineString", "coordinates": [[23.530866667, 60.077666667], [23.52355, 60.07065], [23.515866667, 60.0637], [23.507866667, 60.056716667], [23.500533333, 60.04915], [23.493, 60.041633333], [23.485466667, 60.033983333], [23.479033333, 60.026216667], [23.47295, 60.01835], [23.461033333, 60.003516667], [23.45415, 59.99755], [23.445683333, 59.99235], [23.438766667, 59.989266667], [23.435116667, 59.987866667], [23.43165, 59.986333333], [23.4292, 59.984833333], [23.432566667, 59.9862], [23.43375, 59.987266667], [23.431566667, 59.98615], [23.4307, 59.98565], [23.429383333, 59.984683333], [23.421066667, 59.978233333], [23.431, 59.977716667], [23.432133333, 59.976883333], [23.4321, 59.976883333], [23.425533333, 59.9781], [23.41165, 59.9738], [23.401383333, 59.967], [23.395816667, 59.958866667], [23.390166667, 59.9508], [23.38365, 59.94275], [23.37245, 59.935783333], [23.3572, 59.930766667], [23.33415, 59.918933333], [23.327433333, 59.9114], [23.329966667, 59.90315], [23.3428, 59.89735], [23.3492, 59.889533333], [23.345833333, 59.881266667], [23.344066667, 59.872783333], [23.355716667, 59.866616667], [23.365766667, 59.86]]}, "properties": {}}]}
+
+Export timelapse as Geometry Point from a trip
+-[ RECORD 1 ]
+?column? | t
+
+Export GPX from trips
+-[ RECORD 1 ]
+?column? | t
+
+Export KML from trips
+-[ RECORD 1 ]
+?column? | t
+

tests/sql/monitoring.sql.output

@@ -22,15 +22,15 @@ count | 21
 
 Test monitoring_view3 for user
 -[ RECORD 1 ]
-count | 3736
+count | 3775
 
 Test monitoring_voltage for user
 -[ RECORD 1 ]
-count | 47
+count | 48
 
 Test monitoring_temperatures for user
 -[ RECORD 1 ]
-count | 120
+count | 121
 
 Test monitoring_humidity for user
 -[ RECORD 1 ]

tests/sql/qgis.sql

@@ -49,4 +49,5 @@ SELECT public.qgis_bbox_trip_py_fn(CONCAT(:'vessel_id_aava'::TEXT, '_', 3, '_',
 --SELECT set_config('vessel.id', :'vessel_id_kapla', false) IS NOT NULL as vessel_id;
 -- SQL request from QGIS to fetch the necessary data base on vessel_id
 --SELECT id, vessel_id, name as logname, ST_Transform(track_geom, 3857) as track_geom, ROUND(distance, 2) as distance, ROUND(EXTRACT(epoch FROM duration)/3600,2) as duration,_from_time,_to_time FROM api.logbook where track_geom is not null and _to_time is not null ORDER BY _from_time DESC;
-SELECT count(*) FROM api.logbook where track_geom is not null and _to_time is not null;
+--SELECT count(*) FROM api.logbook WHERE track_geom IS NOT NULL AND _to_time iIS NOT NULL;
+SELECT count(*) FROM api.logbook WHERE trip IS NOT NULL AND _to_time IS NOT NULL;

tests/sql/summary.sql.output

@@ -6,10 +6,10 @@
 You are now connected to database "signalk" as user "username".
 Expanded display is on.
 -[ RECORD 1 ]--+-------------------------------
-server_version | 16.4 (Debian 16.4-1.pgdg120+2)
+server_version | 16.6 (Debian 16.6-1.pgdg120+1)
 
--[ RECORD 1 ]--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-postgis_full_version | POSTGIS="3.4.3 e365945" [EXTENSION] PGSQL="160" GEOS="3.11.1-CAPI-1.17.1" PROJ="9.1.1 NETWORK_ENABLED=OFF URL_ENDPOINT=https://cdn.proj.org USER_WRITABLE_DIRECTORY=/var/lib/postgresql/.local/share/proj DATABASE_PATH=/usr/share/proj/proj.db" LIBXML="2.9.14" LIBJSON="0.16" LIBPROTOBUF="1.4.1" WAGYU="0.5.0 (Internal)"
+-[ RECORD 1 ]--------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+postgis_full_version | POSTGIS="3.5.1 48ab069" [EXTENSION] PGSQL="160" GEOS="3.11.1-CAPI-1.17.1" PROJ="9.1.1 NETWORK_ENABLED=OFF URL_ENDPOINT=https://cdn.proj.org USER_WRITABLE_DIRECTORY=/var/lib/postgresql/.local/share/proj DATABASE_PATH=/usr/share/proj/proj.db" (compiled against PROJ 9.1.1) LIBXML="2.9.14" LIBJSON="0.16" LIBPROTOBUF="1.4.1" WAGYU="0.5.0 (Internal)"
 
 -[ RECORD 1 ]--------------------------------------------------------------------------------------
 Name        | citext
@@ -22,41 +22,46 @@ Version     | 1.0
 Schema      | public
 Description | transform between jsonb and plpython3u
 -[ RECORD 3 ]--------------------------------------------------------------------------------------
+Name        | mobilitydb
+Version     | 1.2.0
+Schema      | public
+Description | MobilityDB geospatial trajectory data management & analysis platform
+-[ RECORD 4 ]--------------------------------------------------------------------------------------
 Name        | moddatetime
 Version     | 1.0
 Schema      | public
 Description | functions for tracking last modification time
--[ RECORD 4 ]--------------------------------------------------------------------------------------
+-[ RECORD 5 ]--------------------------------------------------------------------------------------
 Name        | pg_stat_statements
 Version     | 1.10
 Schema      | public
 Description | track planning and execution statistics of all SQL statements executed
--[ RECORD 5 ]--------------------------------------------------------------------------------------
+-[ RECORD 6 ]--------------------------------------------------------------------------------------
 Name        | pgcrypto
 Version     | 1.3
 Schema      | public
 Description | cryptographic functions
--[ RECORD 6 ]--------------------------------------------------------------------------------------
+-[ RECORD 7 ]--------------------------------------------------------------------------------------
 Name        | plpgsql
 Version     | 1.0
 Schema      | pg_catalog
 Description | PL/pgSQL procedural language
--[ RECORD 7 ]--------------------------------------------------------------------------------------
+-[ RECORD 8 ]--------------------------------------------------------------------------------------
 Name        | plpython3u
 Version     | 1.0
 Schema      | pg_catalog
 Description | PL/Python3U untrusted procedural language
--[ RECORD 8 ]--------------------------------------------------------------------------------------
+-[ RECORD 9 ]--------------------------------------------------------------------------------------
 Name        | postgis
-Version     | 3.4.3
+Version     | 3.5.1
 Schema      | public
 Description | PostGIS geometry and geography spatial types and functions
--[ RECORD 9 ]--------------------------------------------------------------------------------------
+-[ RECORD 10 ]-------------------------------------------------------------------------------------
 Name        | timescaledb
-Version     | 2.17.0
+Version     | 2.17.2
 Schema      | public
 Description | Enables scalable inserts and complex queries for time-series data (Community Edition)
--[ RECORD 10 ]-------------------------------------------------------------------------------------
+-[ RECORD 11 ]-------------------------------------------------------------------------------------
 Name        | uuid-ossp
 Version     | 1.1
 Schema      | public
@@ -106,14 +111,14 @@ laninline     | 13566
 lanvalidator  | 13567
 lanacl        | 
 -[ RECORD 5 ]-+-----------
-oid           | 18194
+oid           | 18190
 lanname       | plpython3u
 lanowner      | 10
 lanispl       | t
 lanpltrusted  | t
-lanplcallfoid | 18191
-laninline     | 18192
-lanvalidator  | 18193
+lanplcallfoid | 18187
+laninline     | 18188
+lanvalidator  | 18189
 lanacl        | 
 
 -[ RECORD 1 ]+-----------
@@ -180,25 +185,30 @@ Type   | table
 Owner  | username
 -[ RECORD 8 ]---------------------------------
 Schema | public
-Name   | ne_10m_geography_marine_polys
+Name   | mobilitydb_opcache
 Type   | table
 Owner  | username
 -[ RECORD 9 ]---------------------------------
 Schema | public
+Name   | ne_10m_geography_marine_polys
+Type   | table
+Owner  | username
+-[ RECORD 10 ]--------------------------------
+Schema | public
 Name   | ne_10m_geography_marine_polys_gid_seq
 Type   | sequence
 Owner  | username
--[ RECORD 10 ]--------------------------------
+-[ RECORD 11 ]--------------------------------
 Schema | public
 Name   | process_queue
 Type   | table
 Owner  | username
--[ RECORD 11 ]--------------------------------
+-[ RECORD 12 ]--------------------------------
 Schema | public
 Name   | process_queue_id_seq
 Type   | sequence
 Owner  | username
--[ RECORD 12 ]--------------------------------
+-[ RECORD 13 ]--------------------------------
 Schema | public
 Name   | spatial_ref_sys
 Type   | table
@@ -232,10 +242,12 @@ schema_public | iso3166
 -[ RECORD 7 ]-+------------------------------
 schema_public | mid
 -[ RECORD 8 ]-+------------------------------
-schema_public | ne_10m_geography_marine_polys
+schema_public | mobilitydb_opcache
 -[ RECORD 9 ]-+------------------------------
-schema_public | process_queue
+schema_public | ne_10m_geography_marine_polys
 -[ RECORD 10 ]+------------------------------
+schema_public | process_queue
+-[ RECORD 11 ]+------------------------------
 schema_public | spatial_ref_sys
 
 -[ RECORD 1 ]---------
@@ -653,8 +665,8 @@ reverse_geocode_py_fn | {"name": "Spain", "country_code": "es"}
 
 Test geoip reverse_geoip_py_fn
 Test opverpass API overpass_py_fn
--[ RECORD 1 ]--+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-overpass_py_fn | {"fee": "yes", "vhf": "09", "name": "Port Olímpic", "image": "https://i.imgur.com/1KQVeFV.jpeg", "phone": "+34 933561016", "leisure": "marina", "website": "https://portolimpic.barcelona/", "wikidata": "Q171204", "wikipedia": "ca:Port Olímpic de Barcelona", "check_date": "2024-09-16", "addr:street": "Moll de Xaloc", "power_supply": "yes", "seamark:type": "harbour", "addr:postcode": "08005", "internet_access": "wlan", "wikimedia_commons": "Category:Port Olímpic (Barcelona)", "sanitary_dump_station": "yes", "seamark:harbour:category": "marina"}
+-[ RECORD 1 ]--+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+overpass_py_fn | {"fee": "yes", "vhf": "09", "name": "Port Olímpic", "phone": "+34 933561016", "leisure": "marina", "website": "https://portolimpic.barcelona/", "wikidata": "Q171204", "panoramax": "b637d864-4a5f-4d56-a68e-6c81d2c70292", "wikipedia": "ca:Port Olímpic de Barcelona", "check_date": "2024-09-16", "addr:street": "Moll de Xaloc", "power_supply": "yes", "seamark:type": "harbour", "addr:postcode": "08005", "internet_access": "wlan", "wikimedia_commons": "Category:Port Olímpic (Barcelona)", "sanitary_dump_station": "yes", "seamark:harbour:category": "marina"}
 
 -[ RECORD 1 ]--+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 overpass_py_fn | {"name": "Port de la Ginesta", "type": "multipolygon", "leisure": "marina", "name:ca": "Port de la Ginesta", "wikidata": "Q16621038", "wikipedia": "ca:Port Ginesta", "check_date": "2024-08-23"}
@@ -662,13 +674,13 @@ overpass_py_fn | {"name": "Port de la Ginesta", "type": "multipolygon", "leisure
 -[ RECORD 1 ]--+----------------------------------------------
 overpass_py_fn | {"name": "Norra hamnen", "leisure": "marina"}
 
--[ RECORD 1 ]----------------------------------------------------------------------------------------------------------------------------------------------
-versions_fn | {"api_version" : "0.7.7", "sys_version" : "PostgreSQL 16.4", "timescaledb" : "2.17.0", "postgis" : "3.4.3", "postgrest" : "PostgREST 12.2.3"}
+-[ RECORD 1 ]----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+versions_fn | {"api_version" : "0.8.1", "sys_version" : "PostgreSQL 16.6", "mobilitydb" : "1.2.0", "timescaledb" : "2.17.2", "postgis" : "3.5.1", "postgrest" : "PostgREST 12.2.3"}
 
 -[ RECORD 1 ]-----------------
-api_version | 0.7.7
-sys_version | PostgreSQL 16.4
-timescaledb | 2.17.0
-postgis     | 3.4.3
+api_version | 0.8.1
+sys_version | PostgreSQL 16.6
+timescaledb | 2.17.2
+postgis     | 3.5.1
 postgrest   | PostgREST 12.2.3
 

tests/tests.sh

@@ -1,4 +1,4 @@
-# PostgSail Unit test 
+# PostgSail Unit test
 
 if [[ -z "${PGSAIL_DB_URI}" ]]; then
   echo "PGSAIL_DB_URI is undefined"
@@ -18,8 +18,9 @@ fi
 if [[ ! -x "/usr/bin/go" || ! -x "/root/go/bin/mermerd" ]]; then
     #wget -q https://go.dev/dl/go1.21.4.linux-arm64.tar.gz && \
     #rm -rf /usr/local/go && tar -C /usr/local -xzf go1.21.4.linux-arm64.tar.gz && \
-    apt update && apt -y install golang && \
-    go install github.com/KarnerTh/mermerd@latest
+    apt update && apt -y install golang-go && \
+    #go install github.com/KarnerTh/mermerd@latest require latest go version
+    go install github.com/KarnerTh/mermerd@v0.11.0
 fi
 
 # pnpm install
@@ -203,6 +204,32 @@ else
     exit 1
 fi
 
+# Stats SQL unit tests
+#psql ${PGSAIL_DB_URI} < sql/stats.sql > output/stats.sql.output
+#diff sql/stats.sql.output output/stats.sql.output > /dev/null
+#diff -u sql/stats.sql.output output/stats.sql.output | wc -l
+#echo 0
+#if [ $? -eq 0 ]; then
+#    echo SQL stats.sql OK
+#else
+#    echo SQL stats.sql FAILED
+#    diff -u sql/stats.sql.output output/stats.sql.output
+#    exit 1
+#fi
+
+# MobilityDB SQL unit tests
+psql ${PGSAIL_DB_URI} < sql/mobilitydb.sql > output/mobilitydb.sql.output
+diff sql/mobilitydb.sql.output output/mobilitydb.sql.output > /dev/null
+#diff -u sql/mobilitydb.sql.output output/mobilitydb.sql.output | wc -l
+#echo 0
+if [ $? -eq 0 ]; then
+    echo SQL mobilitydb.sql OK
+else
+    echo SQL mobilitydb.sql FAILED
+    diff -u sql/mobilitydb.sql.output output/mobilitydb.sql.output
+    exit 1
+fi
+
 # qgis SQL unit tests
 psql ${PGSAIL_DB_URI} < sql/qgis.sql > output/qgis.sql.output
 diff sql/qgis.sql.output output/qgis.sql.output > /dev/null