Skip to content

Commit dedc9d4

Browse files
cvvergaracvvergara
committed
Moving to legacy pgr_costResult3 type
Changes to be committed: * Not processing the types modified: sql/common/CMakeLists.txt deleted: sql/common/pgrouting-types.sql * Moving to legacy modified: sql/legacy/routing_legacy.sql * Removing from the signature file modified: sql/sigs/pgrouting--3.0.0.sig * Deleting files that are not used to build pgRouting deleted: sql/trsp/routing_trsp_vias.sql deleted: sql/trsp/viaEdges_v2.2.sql deleted: sql/trsp/viaVertices_v2.2.sql * Not using the types modified: sql/trsp/vias_trsp_V2.2.sql modified: sql/trsp/trsp_V2.2.sql
1 parent f18f8b5 commit dedc9d4

10 files changed

Lines changed: 87 additions & 405 deletions

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6795-b274521 release/3.0
1+
6796-f18f8b5 release/3.0

‎sql/common/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
SET(LOCAL_FILES
33
pgRouting-header.sql
4-
pgrouting-types.sql
54
pgrouting_version.sql
65
pgrouting_utilities.sql
76
pgr_parameter_check.sql

‎sql/common/pgrouting-types.sql‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎sql/legacy/routing_legacy.sql‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ CREATE TYPE pgr_costResult AS
3232
cost float8
3333
);
3434

35+
CREATE TYPE pgr_costResult3 AS
36+
(
37+
seq integer,
38+
id1 integer,
39+
id2 integer,
40+
id3 integer,
41+
cost float8
42+
);
3543

3644
CREATE TYPE pgr_geomResult AS
3745
(

‎sql/sigs/pgrouting--3.0.0.sig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#VERSION pgrouting 3.0.0
22
#TYPES
3-
pgr_costresult3
43
#FUNCTIONS
54
pgr_alphashape(text,double precision)
65
pgr_analyzegraph(text,double precision,text,text,text,text,text)

‎sql/trsp/routing_trsp_vias.sql‎

Lines changed: 0 additions & 165 deletions
This file was deleted.

‎sql/trsp/trsp_V2.2.sql‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,16 @@ CREATE OR REPLACE FUNCTION pgr_trspViaVertices(
151151
via_vids ANYARRAY,
152152
directed BOOLEAN,
153153
has_rcost BOOLEAN,
154-
restrictions_sql TEXT DEFAULT NULL)
155-
RETURNS SETOF pgr_costResult3 AS
154+
restrictions_sql TEXT DEFAULT NULL,
155+
156+
OUT seq INTEGER,
157+
OUT id1 INTEGER,
158+
OUT id2 INTEGER,
159+
OUT id3 INTEGER,
160+
OUT cost FLOAT
161+
)
162+
RETURNS SETOF RECORD AS
163+
156164
$BODY$
157165
DECLARE
158166
has_reverse BOOLEAN;
@@ -175,8 +183,8 @@ BEGIN
175183

176184
IF (restrictions_sql IS NULL OR length(restrictions_sql) = 0) THEN
177185
RETURN query SELECT (row_number() over())::INTEGER, path_id:: INTEGER, node::INTEGER,
178-
(CASE WHEN edge = -2 THEN -1 ELSE edge END)::INTEGER, cost
179-
FROM pgr_dijkstraVia(new_sql, via_vids, directed, strict:=true) WHERE edge != -1;
186+
(CASE WHEN edge = -2 THEN -1 ELSE edge END)::INTEGER, a.cost
187+
FROM pgr_dijkstraVia(new_sql, via_vids, directed, strict:=true) AS a WHERE edge != -1;
180188
RETURN;
181189
END IF;
182190

‎sql/trsp/viaEdges_v2.2.sql‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)