General cleanup and minor changes

.gitignore

@@ -9,3 +9,6 @@ src/version/version.h
 .directory
 notUsed
 *.swp
+
+.vscode
+taptest.sh

NEWS.md

@@ -114,6 +114,7 @@ In the deprecated functions:
 
 ## pgRouting 3.7
 
+
 <details> <summary>pgRouting 3.7.3 Release Notes</summary>
 
 To see all issues & pull requests closed by this release see the [Git closed

configuration.conf

@@ -54,4 +54,3 @@ categories          | N | N | Y
 #----------------------
 topology            | N | Y | Y
 utilities           | N | Y | Y
-deprecated          | N | Y | N

doc/src/release_notes.rst

@@ -146,6 +146,10 @@ In the deprecated functions:
 pgRouting 3.7
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+.. contents:: Contents
+   :local:
+   :depth: 1
+
 pgRouting 3.7.3 Release Notes
 -------------------------------------------------------------------------------
 

docqueries/src/migration.pg

@@ -34,11 +34,6 @@ SELECT * FROM new_restrictions;
 /* --rest5 */
 
 /* --verticesv1 */
-SELECT * FROM pgr_trsp(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
-    FROM edges WHERE id != 16$$,
-  15, 16,
-  true, true);
 /* --verticesv2 */
 SELECT * FROM pgr_dijkstra(
   $$SELECT id, source, target, cost, reverse_cost
@@ -51,13 +46,6 @@ FROM pgr_dijkstra(
     FROM edges WHERE id != 16$$,
   15, 16);
 /* --verticesv4 */
-SELECT * FROM pgr_trsp(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
-    FROM edges WHERE id != 16$$,
-  15, 16,
-  true, true,
-  $$SELECT to_cost, target_id::INTEGER, via_path
-    FROM old_restrictions$$);
 /* --verticesv5 */
 SELECT * FROM pgr_trsp(
   $$SELECT id, source, target, cost, reverse_cost
@@ -75,11 +63,6 @@ FROM pgr_trsp(
 SELECT pid, edge_id, fraction, side FROM pointsOfInterest
 WHERE pid IN (3, 4);
 /* --edgesv1 */
-SELECT * FROM pgr_trsp(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
-    FROM edges$$,
-  6, 0.3, 12, 0.6,
-  true, true);
 /* --edgesv2 */
 SELECT * FROM pgr_withPoints(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -94,10 +77,6 @@ FROM pgr_withPoints(
   -1, -2,
   details => false);
 /* --edgesv4 */
-SELECT * FROM pgr_trsp(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  6, 0.3, 12, 0.6, true, true,
-  $$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
 /* --edgesv5 */
 SELECT * FROM pgr_trsp_withPoints(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -115,11 +94,6 @@ FROM pgr_trsp_withPoints(
   details => false)
 WHERE edge != -1;
 /* --edgesv7 */
-/* --viav1 */
-SELECT * FROM pgr_trspViaVertices(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  ARRAY[6, 3, 6],
-  true, true);
 /* --viav2 */
 SELECT * FROM pgr_dijkstraVia(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -133,11 +107,6 @@ FROM pgr_dijkstraVia(
   ARRAY[6, 3, 6])
 WHERE edge != -1;
 /* --viav4*/
-SELECT * FROM pgr_trspViaVertices(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  ARRAY[6, 3, 6],
-  true, true,
-  $$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
 /* --viav5 */
 SELECT * FROM pgr_trspVia(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -156,10 +125,7 @@ WHERE edge != -1;
 SELECT pid, edge_id, fraction, side FROM pointsOfInterest
 WHERE pid IN (3, 4, 6);
 /* --edgesvia1 */
-SELECT * FROM pgr_trspViaEdges(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  ARRAY[6, 12, 4], ARRAY[0.3, 0.6, 0.7],
-  true, true);
+SELECT pid, edge_id, fraction FROM pointsOfInterest WHERE pid IN (3, 4, 6);
 /* --edgesvia2 */
 SELECT * FROM pgr_withPointsVia(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -172,15 +138,10 @@ path_id::INTEGER AS id1, node::INTEGER AS id2,
 CASE WHEN edge >= 0 THEN edge::INTEGER ELSE -1 END AS id3, cost::FLOAT
 FROM pgr_withPointsVia(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
-  $$SELECT * FROM (VALUES (1, 6, 0.3),(2, 12, 0.6),(3, 4, 0.7)) AS t(pid, edge_id, fraction)$$,
-  ARRAY[-1, -2, -3],
-  details=> false);
+  $$SELECT pid, edge_id, fraction FROM pointsOfInterest WHERE pid IN (3, 4, 6)$$,
+  ARRAY[-4, -3, -6],
+  details => false);
 /* --edgesvia4 */
-SELECT * FROM pgr_trspViaEdges(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  ARRAY[6, 12, 4], ARRAY[0.3, 0.6, 0.7],
-  true, true,
-  $$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
 /* --edgesvia5 */
 SELECT * FROM pgr_trspVia_withPoints(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,

docqueries/src/migration.result

@@ -65,20 +65,6 @@ SELECT * FROM new_restrictions;
 
 /* --rest5 */
 /* --verticesv1 */
-SELECT * FROM pgr_trsp(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
-    FROM edges WHERE id != 16$$,
-  15, 16,
-  true, true);
-WARNING:  pgr_trsp(text,integer,integer,boolean,boolean) deprecated signature on v3.4.0
- seq | id1 | id2 | cost
------+-----+-----+------
-   0 |  15 |   3 |    1
-   1 |  10 |   5 |    1
-   2 |  11 |   9 |    1
-   3 |  16 |  -1 |    0
-(4 rows)
-
 /* --verticesv2 */
 SELECT * FROM pgr_dijkstra(
   $$SELECT id, source, target, cost, reverse_cost
@@ -107,24 +93,6 @@ FROM pgr_dijkstra(
 (4 rows)
 
 /* --verticesv4 */
-SELECT * FROM pgr_trsp(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
-    FROM edges WHERE id != 16$$,
-  15, 16,
-  true, true,
-  $$SELECT to_cost, target_id::INTEGER, via_path
-    FROM old_restrictions$$);
-WARNING:  pgr_trsp(text,integer,integer,boolean,boolean) deprecated signature on v3.4.0
- seq | id1 | id2 | cost
------+-----+-----+------
-   0 |  15 |   3 |    1
-   1 |  10 |   5 |    1
-   2 |  11 |  11 |    1
-   3 |  12 |  13 |    1
-   4 |  17 |  15 |    1
-   5 |  16 |  -1 |    0
-(6 rows)
-
 /* --verticesv5 */
 SELECT * FROM pgr_trsp(
   $$SELECT id, source, target, cost, reverse_cost
@@ -168,21 +136,6 @@ WHERE pid IN (3, 4);
 (2 rows)
 
 /* --edgesv1 */
-SELECT * FROM pgr_trsp(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost
-    FROM edges$$,
-  6, 0.3, 12, 0.6,
-  true, true);
-WARNING:  pgr_trsp(text,integer,float,integer,float,boolean,boolean) deprecated signature on v3.4.0
- seq | id1 | id2 | cost
------+-----+-----+------
-   0 |  -1 |   6 |  0.7
-   1 |   3 |   7 |    1
-   2 |   7 |  10 |    1
-   3 |   8 |  12 |  0.6
-   4 |  -2 |  -1 |    0
-(5 rows)
-
 /* --edgesv2 */
 SELECT * FROM pgr_withPoints(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -215,25 +168,6 @@ FROM pgr_withPoints(
 (5 rows)
 
 /* --edgesv4 */
-SELECT * FROM pgr_trsp(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  6, 0.3, 12, 0.6, true, true,
-  $$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
-WARNING:  pgr_trsp(text,integer,float,integer,float,boolean,boolean) deprecated signature on v3.4.0
- seq | id1 | id2 | cost
------+-----+-----+------
-   0 |  -1 |   6 |  0.7
-   1 |   3 |   7 |    1
-   2 |   7 |   8 |    1
-   3 |  11 |   9 |    1
-   4 |  16 |  16 |    1
-   5 |  15 |   3 |    1
-   6 |  10 |   2 |    1
-   7 |   6 |   4 |    1
-   8 |   7 |  10 |    1
-   9 |   8 |  12 |  0.6
-(10 rows)
-
 /* --edgesv5 */
 SELECT * FROM pgr_trsp_withPoints(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -280,21 +214,6 @@ WHERE edge != -1;
 (10 rows)
 
 /* --edgesv7 */
-/* --viav1 */
-SELECT * FROM pgr_trspViaVertices(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  ARRAY[6, 3, 6],
-  true, true);
-WARNING:  pgr_trspViaVertices(text,anyarray,boolean,boolean,text) deprecated function on v3.4.0
- seq | id1 | id2 | id3 | cost
------+-----+-----+-----+------
-   1 |   1 |   6 |   4 |    1
-   2 |   1 |   7 |   7 |    1
-   3 |   2 |   3 |   7 |    1
-   4 |   2 |   7 |   4 |    1
-   5 |   2 |   6 |  -1 |    0
-(5 rows)
-
 /* --viav2 */
 SELECT * FROM pgr_dijkstraVia(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -327,27 +246,6 @@ WHERE edge != -1;
 (5 rows)
 
 /* --viav4*/
-SELECT * FROM pgr_trspViaVertices(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  ARRAY[6, 3, 6],
-  true, true,
-  $$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
-WARNING:  pgr_trspViaVertices(text,anyarray,boolean,boolean,text) deprecated function on v3.4.0
- seq | id1 | id2 | id3 | cost
------+-----+-----+-----+------
-   1 |   1 |   6 |   4 |    1
-   2 |   1 |   7 |   8 |    1
-   3 |   1 |  11 |   9 |    1
-   4 |   1 |  16 |  16 |    1
-   5 |   1 |  15 |   3 |    1
-   6 |   1 |  10 |   5 |    1
-   7 |   1 |  11 |   8 |    1
-   8 |   1 |   7 |   7 |    1
-   9 |   2 |   3 |   7 |    1
-  10 |   2 |   7 |   4 |    1
-  11 |   2 |   6 |  -1 |    0
-(11 rows)
-
 /* --viav5 */
 SELECT * FROM pgr_trspVia(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
@@ -404,26 +302,13 @@ WHERE pid IN (3, 4, 6);
 (3 rows)
 
 /* --edgesvia1 */
-SELECT * FROM pgr_trspViaEdges(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  ARRAY[6, 12, 4], ARRAY[0.3, 0.6, 0.7],
-  true, true);
-WARNING:  pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text) deprecated function on v3.4.0
- seq | id1 | id2 | id3 | cost
------+-----+-----+-----+------
-   1 |   1 |  -1 |   6 |  0.7
-   2 |   1 |   3 |   7 |    1
-   3 |   1 |   7 |  10 |    1
-   4 |   1 |   8 |  12 |  0.6
-   5 |   1 |  -2 |  -1 |    0
-   6 |   2 |  -2 |  12 |  0.4
-   7 |   2 |  12 |  13 |    1
-   8 |   2 |  17 |  15 |    1
-   9 |   2 |  16 |   9 |    1
-  10 |   2 |  11 |   8 |    1
-  11 |   2 |   7 |   4 |  0.7
-  12 |   2 |  -3 |  -2 |    0
-(12 rows)
+SELECT pid, edge_id, fraction FROM pointsOfInterest WHERE pid IN (3, 4, 6);
+ pid | edge_id | fraction
+-----+---------+----------
+   3 |      12 |      0.6
+   4 |       6 |      0.3
+   6 |       4 |      0.7
+(3 rows)
 
 /* --edgesvia2 */
 SELECT * FROM pgr_withPointsVia(
@@ -453,53 +338,26 @@ path_id::INTEGER AS id1, node::INTEGER AS id2,
 CASE WHEN edge >= 0 THEN edge::INTEGER ELSE -1 END AS id3, cost::FLOAT
 FROM pgr_withPointsVia(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,
-  $$SELECT * FROM (VALUES (1, 6, 0.3),(2, 12, 0.6),(3, 4, 0.7)) AS t(pid, edge_id, fraction)$$,
-  ARRAY[-1, -2, -3],
-  details=> false);
+  $$SELECT pid, edge_id, fraction FROM pointsOfInterest WHERE pid IN (3, 4, 6)$$,
+  ARRAY[-4, -3, -6],
+  details => false);
  seq | id1 | id2 | id3 | cost
 -----+-----+-----+-----+------
-   1 |   1 |  -1 |   6 |  0.7
+   1 |   1 |  -4 |   6 |  0.7
    2 |   1 |   3 |   7 |    1
    3 |   1 |   7 |  10 |    1
    4 |   1 |   8 |  12 |  0.6
-   5 |   1 |  -2 |  -1 |    0
-   6 |   2 |  -2 |  12 |  0.4
+   5 |   1 |  -3 |  -1 |    0
+   6 |   2 |  -3 |  12 |  0.4
    7 |   2 |  12 |  13 |    1
    8 |   2 |  17 |  15 |    1
    9 |   2 |  16 |   9 |    1
   10 |   2 |  11 |   8 |    1
   11 |   2 |   7 |   4 |  0.3
-  12 |   2 |  -3 |  -1 |    0
+  12 |   2 |  -6 |  -1 |    0
 (12 rows)
 
 /* --edgesvia4 */
-SELECT * FROM pgr_trspViaEdges(
-  $$SELECT id::INTEGER, source::INTEGER, target::INTEGER, cost, reverse_cost FROM edges$$,
-  ARRAY[6, 12, 4], ARRAY[0.3, 0.6, 0.7],
-  true, true,
-  $$SELECT to_cost, target_id::INTEGER, via_path FROM old_restrictions$$);
-WARNING:  pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text) deprecated function on v3.4.0
-WARNING:  pgr_trsp(text,integer,float,integer,float,boolean,boolean) deprecated signature on v3.4.0
-WARNING:  pgr_trsp(text,integer,float,integer,float,boolean,boolean) deprecated signature on v3.4.0
- seq | id1 | id2 | id3 | cost
------+-----+-----+-----+------
-   1 |   1 |  -1 |   6 |  0.7
-   2 |   1 |   3 |   7 |    1
-   3 |   1 |   7 |   8 |    1
-   4 |   1 |  11 |   9 |    1
-   5 |   1 |  16 |  16 |    1
-   6 |   1 |  15 |   3 |    1
-   7 |   1 |  10 |   2 |    1
-   8 |   1 |   6 |   4 |    1
-   9 |   1 |   7 |  10 |    1
-  10 |   1 |   8 |  12 |    1
-  11 |   2 |  12 |  13 |    1
-  12 |   2 |  17 |  15 |    1
-  13 |   2 |  16 |   9 |    1
-  14 |   2 |  11 |   8 |    1
-  15 |   2 |   7 |   4 |  0.3
-(15 rows)
-
 /* --edgesvia5 */
 SELECT * FROM pgr_trspVia_withPoints(
   $$SELECT id, source, target, cost, reverse_cost FROM edges$$,

docqueries/src/test.conf

@@ -3,10 +3,10 @@
 %main::tests = (
     'any' => {
         'files' => [qw(
+            concepts.pg
+            migration.pg
             sampledata.pg
             withPoints-category.pg
-            migration.pg
-            concepts.pg
             )],
     },
 );