Skip to content
Commits on Source (4)
Show whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 0c575398
......@@ -182,7 +182,7 @@ endif()
set(PGROUTING_VERSION_MAJOR "2")
set(PGROUTING_VERSION_MINOR "6")
set(PGROUTING_VERSION_PATCH "2")
set(PGROUTING_VERSION_PATCH "3")
set(PGROUTING_VERSION_DEV "")
set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
......
NEWS
View file @ 0c575398
pgRouting 2.6.2 Release Notes
-------------------------------------------------------------------------------
To see the issues closed by this release see the [Git closed milestone for 2.6.2 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.3%22%20) on Github.
*Bug fixes*
* [#1219 ](https://github.com/pgRouting/pgrouting/pull/1219)_ Implicit cast for via_path integer to text
* [#1193 ](https://github.com/pgRouting/pgrouting/pull/1193)_ Fixed pgr_pointsAsPolygon breaking when comparing strings in WHERE clause
* [#1185 ](https://github.com/pgRouting/pgrouting/pull/1185)_ Improve FindPostgreSQL.cmake
pgRouting 2.6.2 Release Notes
-------------------------------------------------------------------------------
......
README.md
View file @ 0c575398
......@@ -99,7 +99,7 @@ Family of functions include:
## REQUIREMENTS
Building reqirements
Building requirements
--------------------
* Perl
* C and C++ compilers
......@@ -112,7 +112,7 @@ Building reqirements
* Sphinx >= 1.2
User's reqirements
User's requirements
--------------------
* PostGIS >= 2.0
......
cmake/FindPostgreSQL.cmake
View file @ 0c575398
......@@ -38,7 +38,6 @@ else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES AND POSTGRESQL_EXECUTABLE)
endif(NOT "${POSTGRESQL_BIN}" STREQUAL "")
message(STATUS "POSTGRESQL_PG_CONFIG is " ${POSTGRESQL_PG_CONFIG})
if(POSTGRESQL_PG_CONFIG)
execute_process(
COMMAND ${POSTGRESQL_PG_CONFIG} --bindir
......@@ -46,26 +45,25 @@ else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES AND POSTGRESQL_EXECUTABLE)
OUTPUT_VARIABLE T_POSTGRESQL_BIN)
endif(POSTGRESQL_PG_CONFIG)
# Checking POSTGRESQL_EXECUTABLE in all the dir (*) - implies that
# search for POSTGRESQL_EXECUTABLE _only_ in the dir specified by pg_config
find_program(POSTGRESQL_EXECUTABLE NAMES postgres
PATHS
${T_POSTGRESQL_BIN}
NO_DEFAULT_PATH
)
message(STATUS "POSTGRESQL_EXECUTABLE is " ${POSTGRESQL_EXECUTABLE})
# if not found continue search in the path and all the dirs listed here (questionable)
find_program(POSTGRESQL_EXECUTABLE NAMES postgres
PATHS
/usr/lib/postgresql/*/bin/
)
# # more elegant, equivalent way if we want to keep both of above:
# find_program(POSTGRESQL_EXECUTABLE NAMES postgres
# HINTS
# ${T_POSTGRESQL_BIN}
# PATHS
# /usr/lib/postgresql/*/bin/
# )
# message(STATUS "POSTGRESQL_EXECUTABLE is " ${POSTGRESQL_EXECUTABLE})
# find_program(POSTGRESQL_PG_CONFIG NAMES pg_config
# PATHS
# /usr/lib/postgresql/*/bin/
# )
# message(STATUS "POSTGRESQL_PG_CONFIG is " ${POSTGRESQL_PG_CONFIG})
message(STATUS "POSTGRESQL_EXECUTABLE is " ${POSTGRESQL_EXECUTABLE})
if(POSTGRESQL_PG_CONFIG)
execute_process(
......@@ -83,9 +81,12 @@ else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES AND POSTGRESQL_EXECUTABLE)
OUTPUT_VARIABLE T_POSTGRESQL_INCLUDE_DIR)
endif(POSTGRESQL_PG_CONFIG)
#as with POSTGRESQL_EXECUTABLE we should/could use the path specified by pg_config only
#instead of path and our own guesses
find_path(POSTGRESQL_INCLUDE_DIR postgres.h
HINTS
${T_POSTGRESQL_INCLUDE_DIR}
PATHS
/usr/include/server
/usr/include/pgsql/server
/usr/local/include/pgsql/server
......
debian/changelog
View file @ 0c575398
pgrouting (2.6.3-1) unstable; urgency=medium
* Team upload.
* New upstream release.
-- Bas Couwenberg <sebastic@debian.org> Thu, 05 Sep 2019 18:10:48 +0200
pgrouting (2.6.2-2) unstable; urgency=medium
* Team upload.
......
doc/queries/doc-pgr_version.queries
View file @ 0c575398
......@@ -6,7 +6,7 @@ SET
SELECT version FROM pgr_version();
version
---------
2.6.2
2.6.3
(1 row)
-- q2
......
doc/src/pgRouting-concepts.rst
View file @ 0c575398
......@@ -122,7 +122,7 @@ network. The general form of a route query is:
.. code-block:: none
select pgr_dijkstra(`SELECT * FROM myroads', 1, 2)
select pgr_dijkstra('SELECT * FROM myroads', 1, 2)
As you can see this is fairly straight forward and you can look and the
specific algorithms for the details of the signatures and how to use them.
......
doc/src/release_notes.rst
View file @ 0c575398
......@@ -18,6 +18,7 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog start
* :ref:`changelog_2_6_3`
* :ref:`changelog_2_6_2`
* :ref:`changelog_2_6_1`
* :ref:`changelog_2_6_0`
......@@ -45,6 +46,20 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog end
.. _changelog_2_6_3:
pgRouting 2.6.3 Release Notes
-------------------------------------------------------------------------------
To see the issues closed by this release see the `Git closed milestone for 2.6.3 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.3%22%20>`_ on Github.
.. rubric:: Bug fixes
* `#1219 <https://github.com/pgRouting/pgrouting/pull/1219>`__ Implicit cast for via_path integer to text
* `#1193 <https://github.com/pgRouting/pgrouting/pull/1193>`__ Fixed pgr_pointsAsPolygon breaking when comparing strings in WHERE clause
* `#1185 <https://github.com/pgRouting/pgrouting/pull/1185>`__ Improve FindPostgreSQL.cmake
.. _changelog_2_6_2:
pgRouting 2.6.2 Release Notes
......
pgtap/common/hasnt_v2_signatures.sql
View file @ 0c575398
......@@ -30,7 +30,7 @@ SELECT hasnt_function('pgr_ksp',ARRAY['text', 'integer', 'integer', 'integer', '
SELECT hasnt_function('pgr_drivingdistance',ARRAY['text', 'integer', 'double precision', 'boolean', 'boolean']);
SELECT hasnt_function('pgr_bdastar',ARRAY['text', 'integer', 'integer', 'boolean', 'boolean']);
SELECT hasnt_function('pgr_bddijkstra',ARRAY['text', 'integer', 'integer', 'boolean', 'boolean']);
SELECT hasnt_function('pgr_tsp',ARRAY['(double precision[]', 'integer', 'integer']);
SELECT hasnt_function('pgr_tsp',ARRAY['double precision[]', 'integer', 'integer']);
-- deprecated functions
SELECT hasnt_function('pgr_kdijkstracost');
......
sql/alpha_shape/alpha_shape.sql
View file @ 0c575398
......@@ -59,7 +59,7 @@ CREATE OR REPLACE FUNCTION pgr_pointsAsPolygon(query varchar, alpha float8 DEFAU
geoms := array[]::geometry[];
i := 1;
FOR vertex_result IN EXECUTE 'SELECT x, y FROM pgr_alphashape('''|| query || ''', ' || alpha || ')'
FOR vertex_result IN EXECUTE 'SELECT x, y FROM pgr_alphashape('''|| REPLACE(query, E'\'', E'\'\'') || ''', ' || alpha || ')'
LOOP
x[i] = vertex_result.x;
y[i] = vertex_result.y;
......
sql/sigs/pgrouting--2.6.3.sig 0 → 100644
View file @ 0c575398
#VERSION pgrouting 2.6.3
#TYPES
pgr_costresult
pgr_costresult3
pgr_geomresult
#FUNCTIONS
pgr_alphashape(text,double precision)
pgr_analyzegraph(text,double precision,text,text,text,text,text)
pgr_analyzeoneway(text,text[],text[],text[],text[],boolean,text,text,text)
pgr_apspjohnson(text)
pgr_apspwarshall(text,boolean,boolean)
_pgr_array_reverse(anyarray)
pgr_articulationpoints(text)
pgr_astarcostmatrix(text,anyarray,boolean,integer,double precision,double precision)
pgr_astarcost(text,anyarray,anyarray,boolean,integer,double precision,double precision)
pgr_astarcost(text,anyarray,bigint,boolean,integer,double precision,double precision)
pgr_astarcost(text,bigint,anyarray,boolean,integer,double precision,double precision)
pgr_astarcost(text,bigint,bigint,boolean,integer,double precision,double precision)
pgr_astar(text,anyarray,anyarray,boolean,integer,double precision,double precision)
_pgr_astar(text,anyarray,anyarray,boolean,integer,double precision,double precision,boolean,boolean)
pgr_astar(text,anyarray,bigint,boolean,integer,double precision,double precision)
pgr_astar(text,bigint,anyarray,boolean,integer,double precision,double precision)
pgr_astar(text,bigint,bigint,boolean,integer,double precision,double precision)
pgr_astar(text,integer,integer,boolean,boolean)
pgr_bdastarcostmatrix(text,anyarray,boolean,integer,numeric,numeric)
pgr_bdastarcost(text,anyarray,anyarray,boolean,integer,numeric,numeric)
pgr_bdastarcost(text,anyarray,bigint,boolean,integer,numeric,numeric)
pgr_bdastarcost(text,bigint,anyarray,boolean,integer,numeric,numeric)
pgr_bdastarcost(text,bigint,bigint,boolean,integer,numeric,numeric)
_pgr_bdastar(text,anyarray,anyarray,boolean,integer,double precision,double precision,boolean)
pgr_bdastar(text,anyarray,anyarray,boolean,integer,numeric,numeric)
pgr_bdastar(text,anyarray,bigint,boolean,integer,numeric,numeric)
pgr_bdastar(text,bigint,anyarray,boolean,integer,numeric,numeric)
pgr_bdastar(text,bigint,bigint)
pgr_bdastar(text,bigint,bigint,boolean,integer,numeric,numeric)
pgr_bdastar(text,integer,integer,boolean,boolean)
pgr_bddijkstracostmatrix(text,anyarray,boolean)
pgr_bddijkstracost(text,anyarray,anyarray,boolean)
pgr_bddijkstracost(text,anyarray,bigint,boolean)
pgr_bddijkstracost(text,bigint,anyarray,boolean)
pgr_bddijkstracost(text,bigint,bigint,boolean)
pgr_bddijkstra(text,anyarray,anyarray,boolean)
_pgr_bddijkstra(text,anyarray,anyarray,boolean,boolean)
pgr_bddijkstra(text,anyarray,bigint,boolean)
pgr_bddijkstra(text,bigint,anyarray,boolean)
pgr_bddijkstra(text,bigint,bigint)
pgr_bddijkstra(text,bigint,bigint,boolean)
pgr_bddijkstra(text,integer,integer,boolean,boolean)
pgr_biconnectedcomponents(text)
pgr_boykovkolmogorov(text,anyarray,anyarray)
pgr_boykovkolmogorov(text,anyarray,bigint)
pgr_boykovkolmogorov(text,bigint,anyarray)
pgr_boykovkolmogorov(text,bigint,bigint)
pgr_bridges(text)
_pgr_checkverttab(text,text[],integer,text)
pgr_connectedcomponents(text)
pgr_contractgraph(text,bigint[],integer,bigint[],boolean)
_pgr_createindex(text,text,text,integer,text)
_pgr_createindex(text,text,text,text,integer,text)
pgr_createtopology(text,double precision,text,text,text,text,text,boolean)
pgr_createverticestable(text,text,text,text,text)
pgr_dijkstracostmatrix(text,anyarray,boolean)
pgr_dijkstracost(text,anyarray,anyarray,boolean)
pgr_dijkstracost(text,anyarray,bigint,boolean)
pgr_dijkstracost(text,bigint,anyarray,boolean)
pgr_dijkstracost(text,bigint,bigint,boolean)
pgr_dijkstra(text,anyarray,anyarray,boolean)
_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean)
pgr_dijkstra(text,anyarray,bigint,boolean)
pgr_dijkstra(text,bigint,anyarray,boolean)
pgr_dijkstra(text,bigint,bigint)
pgr_dijkstra(text,bigint,bigint,boolean)
pgr_dijkstra(text,integer,integer,boolean,boolean)
pgr_dijkstravia(text,anyarray,boolean,boolean,boolean)
pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
pgr_drivingdistance(text,bigint,double precision,boolean)
pgr_drivingdistance(text,bigint,double precision,boolean,boolean)
pgr_edgedisjointpaths(text,anyarray,anyarray,boolean)
pgr_edgedisjointpaths(text,anyarray,bigint,boolean)
pgr_edgedisjointpaths(text,bigint,anyarray,boolean)
pgr_edgedisjointpaths(text,bigint,bigint,boolean)
pgr_edmondskarp(text,anyarray,anyarray)
pgr_edmondskarp(text,anyarray,bigint)
pgr_edmondskarp(text,bigint,anyarray)
pgr_edmondskarp(text,bigint,bigint)
_pgr_endpoint(geometry)
pgr_endpoint(geometry)
pgr_euclediantsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
pgr_flipedges(geometry[])
pgr_floydwarshall(text,boolean)
pgr_getcolumnname(text,text)
_pgr_getcolumnname(text,text,integer,text)
_pgr_getcolumnname(text,text,text,integer,text)
_pgr_getcolumntype(text,text,integer,text)
_pgr_getcolumntype(text,text,text,integer,text)
_pgr_get_statement(text)
pgr_gettablename(text)
_pgr_gettablename(text,integer,text)
_pgr_gsoc_vrppdtw(text,integer,double precision,double precision,integer)
pgr_gsoc_vrppdtw(text,integer,integer)
pgr_iscolumnindexed(text,text)
_pgr_iscolumnindexed(text,text,integer,text)
_pgr_iscolumnindexed(text,text,text,integer,text)
_pgr_iscolumnintable(text,text)
pgr_iscolumnintable(text,text)
pgr_johnson(text,boolean)
pgr_kdijkstracost(text,integer,integer[],boolean,boolean)
pgr_kdijkstrapath(text,integer,integer[],boolean,boolean)
_pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
pgr_ksp(text,integer,integer,integer,boolean)
pgr_labelgraph(text,text,text,text,text,text)
pgr_linegraphfull(text)
pgr_linegraph(text,boolean)
_pgr_makedistancematrix(text)
pgr_maxcardinalitymatch(text,boolean)
pgr_maxflowboykovkolmogorov(text,anyarray,anyarray)
pgr_maxflowboykovkolmogorov(text,anyarray,bigint)
pgr_maxflowboykovkolmogorov(text,bigint,anyarray)
pgr_maxflowboykovkolmogorov(text,bigint,bigint)
pgr_maxflowedmondskarp(text,anyarray,anyarray)
pgr_maxflowedmondskarp(text,anyarray,bigint)
pgr_maxflowedmondskarp(text,bigint,anyarray)
pgr_maxflowedmondskarp(text,bigint,bigint)
pgr_maxflowpushrelabel(text,anyarray,anyarray)
pgr_maxflowpushrelabel(text,anyarray,bigint)
pgr_maxflowpushrelabel(text,bigint,anyarray)
pgr_maxflowpushrelabel(text,bigint,bigint)
pgr_maxflow(text,anyarray,anyarray)
_pgr_maxflow(text,anyarray,anyarray,integer,boolean)
pgr_maxflow(text,anyarray,bigint)
pgr_maxflow(text,bigint,anyarray)
pgr_maxflow(text,bigint,bigint)
pgr_maximumcardinalitymatching(text,boolean)
_pgr_msg(integer,text,text)
pgr_nodenetwork(text,double precision,text,text,text,text,boolean)
_pgr_onerror(boolean,integer,text,text,text,text)
_pgr_parameter_check(text,text,boolean)
_pgr_pickdelivereuclidean(text,text,double precision,integer,integer)
_pgr_pickdeliver(text,text,text,double precision,integer,integer)
pgr_pointsaspolygon(character varying,double precision)
pgr_pointstodmatrix(geometry[],integer)
pgr_pointstovids(geometry[],text,double precision)
pgr_pointtoedgenode(text,geometry,double precision)
_pgr_pointtoid(geometry,double precision,text,integer)
pgr_pushrelabel(text,anyarray,anyarray)
pgr_pushrelabel(text,anyarray,bigint)
pgr_pushrelabel(text,bigint,anyarray)
pgr_pushrelabel(text,bigint,bigint)
_pgr_quote_ident(text)
pgr_quote_ident(text)
_pgr_startpoint(geometry)
pgr_startpoint(geometry)
pgr_strongcomponents(text)
pgr_texttopoints(text,integer)
_pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
pgr_trsp(text,integer,integer,boolean,boolean,text)
_pgr_trsp(text,text,anyarray,anyarray,boolean)
_pgr_trsp(text,text,anyarray,bigint,boolean)
_pgr_trsp(text,text,bigint,anyarray,boolean)
_pgr_trsp(text,text,bigint,bigint,boolean)
pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)
pgr_trspviavertices(text,anyarray,boolean,boolean,text)
_pgr_trspviavertices(text,integer[],boolean,boolean,text)
pgr_tsp(double precision[],integer,integer)
pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
pgr_tsp(text,integer,integer)
_pgr_unnest_matrix(double precision[])
pgr_version()
_pgr_versionless(text,text)
pgr_versionless(text,text)
pgr_vidstodmatrix(integer[],geometry[],text,double precision)
pgr_vidstodmatrix(text,integer[],boolean,boolean,boolean)
_pgr_vrponedepot(text,text,text,integer)
pgr_vrponedepot(text,text,text,integer)
pgr_withpointscostmatrix(text,text,anyarray,boolean,character)
pgr_withpointscost(text,text,anyarray,anyarray,boolean,character)
pgr_withpointscost(text,text,anyarray,bigint,boolean,character)
pgr_withpointscost(text,text,bigint,anyarray,boolean,character)
pgr_withpointscost(text,text,bigint,bigint,boolean,character)
pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)
pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,boolean)
pgr_withpoints(text,text,anyarray,anyarray,boolean,character,boolean)
_pgr_withpoints(text,text,anyarray,anyarray,boolean,character,boolean,boolean,boolean)
pgr_withpoints(text,text,anyarray,bigint,boolean,character,boolean)
pgr_withpoints(text,text,bigint,anyarray,boolean,character,boolean)
pgr_withpoints(text,text,bigint,bigint,boolean,character,boolean)
_pgr_withpointsvia(text,bigint[],double precision[],boolean)
_trsp(text,text,anyarray,anyarray,boolean)
sql/trsp/trsp_V2.2.sql
View file @ 0c575398
......@@ -105,7 +105,7 @@ BEGIN
$6 || $$
)
SELECT ROW_NUMBER() OVER() AS id,
_pgr_array_reverse(array_prepend(target_id, string_to_array(via_path, ',')::INTEGER[])) AS path,
_pgr_array_reverse(array_prepend(target_id, string_to_array(via_path::text, ',')::INTEGER[])) AS path,
to_cost AS cost
FROM old_restrictions;
$$;
......
test/common/doc-pgr_version.result
View file @ 0c575398
......@@ -6,7 +6,7 @@ SET
SELECT version FROM pgr_version();
version
---------
2.6.2
2.6.3
(1 row)
-- q2
......