diff --git a/tests/sql/cron_post_jobs.sql b/tests/sql/cron_post_jobs.sql index 6a91608..f4617fa 100644 --- a/tests/sql/cron_post_jobs.sql +++ b/tests/sql/cron_post_jobs.sql @@ -25,7 +25,7 @@ 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); -- Test stays for user \echo 'stays' diff --git a/tests/sql/cron_post_jobs.sql.output b/tests/sql/cron_post_jobs.sql.output index a1a5086..2bb9b52 100644 --- a/tests/sql/cron_post_jobs.sql.output +++ b/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 | @@ -114,50 +114,52 @@ Check numbers of geojson properties -[ RECORD 1 ]-----+----------------- jsonb_object_keys | id -[ RECORD 2 ]-----+----------------- -jsonb_object_keys | name +jsonb_object_keys | _to -[ RECORD 3 ]-----+----------------- -jsonb_object_keys | notes +jsonb_object_keys | name -[ RECORD 4 ]-----+----------------- -jsonb_object_keys | _to_time +jsonb_object_keys | _from -[ RECORD 5 ]-----+----------------- -jsonb_object_keys | distance +jsonb_object_keys | notes -[ RECORD 6 ]-----+----------------- -jsonb_object_keys | duration +jsonb_object_keys | times -[ RECORD 7 ]-----+----------------- -jsonb_object_keys | avg_speed +jsonb_object_keys | _to_time -[ RECORD 8 ]-----+----------------- -jsonb_object_keys | max_speed +jsonb_object_keys | distance -[ RECORD 9 ]-----+----------------- -jsonb_object_keys | _from_time +jsonb_object_keys | duration -[ RECORD 10 ]----+----------------- -jsonb_object_keys | _to_moorage_id +jsonb_object_keys | avg_speed -[ RECORD 11 ]----+----------------- -jsonb_object_keys | avg_wind_speed +jsonb_object_keys | max_speed -[ RECORD 12 ]----+----------------- -jsonb_object_keys | max_wind_speed +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 --[ RECORD 1 ]-----+--------------------- +-[ 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 2 ]-----+--------------------- +-[ RECORD 7 ]-----+------- jsonb_object_keys | trip --[ RECORD 3 ]-----+--------------------- +-[ RECORD 8 ]-----+------- jsonb_object_keys | notes --[ RECORD 4 ]-----+--------------------- +-[ RECORD 9 ]-----+------- jsonb_object_keys | status --[ RECORD 5 ]-----+--------------------- -jsonb_object_keys | latitude --[ RECORD 6 ]-----+--------------------- -jsonb_object_keys | longitude --[ RECORD 7 ]-----+--------------------- -jsonb_object_keys | truewindspeed --[ RECORD 8 ]-----+--------------------- -jsonb_object_keys | speedoverground --[ RECORD 9 ]-----+--------------------- -jsonb_object_keys | truewinddirection --[ RECORD 10 ]----+--------------------- -jsonb_object_keys | windspeedapparent --[ RECORD 11 ]----+--------------------- -jsonb_object_keys | courseovergroundtrue