CMakeLists.txt

@@ -35,7 +35,7 @@ include(pgr/BuildType)
 
 project(PGROUTING VERSION 3.0.0
     LANGUAGES C CXX )
-set(PGROUTING_VERSION_DEV "-beta")
+set(PGROUTING_VERSION_DEV "-rc1")
 
 include(pgr/GitInfo)
 
@@ -381,7 +381,12 @@ endif()
 
 # TODO use -Werror when TRSP gets rewritten
 set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG}   -Wall -Wconversion -Wmissing-prototypes -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wconversion -pedantic -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
+if(BOOST_Geometry_VERSION_OK)
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wconversion -pedantic -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
+else()
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -pedantic -W -Wunused -Wuninitialized -Wextra -Wdouble-promotion")
+endif()
+
 
 
 

README.md

@@ -27,12 +27,12 @@ Status of the project can be found [here](https://github.com/pgRouting/pgrouting
 
 pgRouting extends the PostGIS/PostgreSQL geospatial database to provide geospatial routing and other network analysis functionality.
 
-This library contains following features:
+This library contains the following features:
 
 * All Pairs Shortest Path Algorithms
 * A-star algorithm
 * Bi-directional algorithms
-* A variety of applications of dijkstra algorithms
+* A variety of applications of Dijkstra algorithms
   * Cost functions
   * With points
 * Driving Distance
@@ -104,4 +104,3 @@ See online documentation: http://docs.pgrouting.org/dev/en/index.html
 * Some code contributed by iMaptools.com is available under MIT-X license.
 
 
-

ci/debbie/regress.sh

@@ -9,8 +9,8 @@ export OS_BUILD=64
 export PG_VER=11
 export PGSQL_VERSION=110
 export PGPORT=5411
-export GEOS_VER=3.7.0dev
-export GDAL_VER=2.2
+export GEOS_VER=3.8
+export GDAL_VER=2.3
 export PROJECTS=${JENKINS_HOME}/workspace
 export PGPATH=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
 export PGDATA=${PGPATH}/data_${PGPORT}
@@ -18,7 +18,7 @@ export PGDATABASE=postgres
 export PGUSER=postgres
 export LD_LIBRARY_PATH="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/lib:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/lib:${PGPATH}/lib"
 export PATH="${PATH}:${PGPATH}/bin:${PGPATH}/lib:${PGPATH}/include"
-export POSTGIS_VER=2.5.0dev
+export POSTGIS_VER=3.1.0dev
 
 #---
 # start the pg sever

cmake/pgr/BuildType.cmake

 
 # Set a default build type if none was specified
-set(PGROUTING_DEFULT_BUILD_TYPE "Release")
+set(PGROUTING_DEFAULT_BUILD_TYPE "Release")
 if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    set(PGROUTING_DEFULT_BUILD_TYPE "Debug")
+    set(PGROUTING_DEFAULT_BUILD_TYPE "Debug")
 endif()
 
 if (CMAKE_BUILD_TYPE AND
@@ -12,8 +12,8 @@ if (CMAKE_BUILD_TYPE AND
 endif()
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    message(STATUS "Setting build type to '${PGROUTING_DEFULT_BUILD_TYPE}' as none was specified.")
-    set(CMAKE_BUILD_TYPE "${PGROUTING_DEFULT_BUILD_TYPE}" CACHE
+    message(STATUS "Setting build type to '${PGROUTING_DEFAULT_BUILD_TYPE}' as none was specified.")
+    set(CMAKE_BUILD_TYPE "${PGROUTING_DEFAULT_BUILD_TYPE}" CACHE
         STRING "Choose the type of build." FORCE)
 endif()
 message(STATUS "CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}")

debian/changelog

+pgrouting (3.0.0~rc1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release candidate.
+  * Update copyright file.
+  * Refresh patches.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 03 Dec 2019 07:19:41 +0100
+
 pgrouting (3.0.0~beta-1) unstable; urgency=medium
 
   * Team upload.

debian/copyright

@@ -38,7 +38,14 @@ License: CC-BY-SA-3.0
 
 Files: include/boost/*
 Copyright: 1997-2000, University of Notre Dame.
+           1995-2010, Geodan, Amsterdam, the Netherlands
                 2013, University of Warsaw.
+                2014, Samuel Debionne, Grenoble, France
+           2007-2015, Barend Gehrels, Amsterdam, the Netherlands.
+           2008-2015, Bruno Lalande, Paris, France.
+           2009-2015, Mateusz Loskot, London, UK.
+           2011-2017, Adam Wulkiewicz, Lodz, Poland
+           2013-2017, Oracle and/or its affiliates
 License: BSL-1.0
 
 Files: include/cpp_common/signalhandler.h

debian/patches/extension-no-version

@@ -3,7 +3,7 @@ Author:	Christoph Berg <myon@debian.org>
 
 --- a/sql/scripts/build-extension-update-files1.pl
 +++ b/sql/scripts/build-extension-update-files1.pl
-@@ -665,7 +665,7 @@ sub write_script {
+@@ -708,7 +708,7 @@ sub write_script {
      # write out the header and the commands to clean up the old extension
      print OUT <<EOF;
  -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

doc/CMakeLists.txt

@@ -106,10 +106,15 @@ endforeach()
 foreach(lang ${PGROUTING_SUPPORTED_LANGUAGES})
     string(TOUPPER ${lang} opt)
     if (${opt} OR WITH_ALL_LANG)
+        set (langFound  "1")
         list(APPEND PGROUTING_BUILD_LANGUAGES ${lang})
     endif()
 endforeach()
 
+if (langFound)
+    set(PGROUTING_ENGLISH "")
+endif()
+
 #---------------------------------------------
 # All languages po files are to be generated
 #---------------------------------------------

doc/components/components-family.rst

@@ -49,7 +49,7 @@ Parameters
 =================== ====================== ========= =========================================
 Parameter           Type                   Default   Description
 =================== ====================== ========= =========================================
-**Edges SQL**       ``TEXT``                         Inner query as described bellow.
+**Edges SQL**       ``TEXT``                         Inner query as described below.
 =================== ====================== ========= =========================================
 
 .. components_parameters_end

doc/components/pgr_biconnectedComponents.rst

@@ -22,7 +22,11 @@ In particular, the algorithm implemented by Boost.Graph.
 
 * Version 3.0.0
 
-  * Return columns change: ``n_seq`` is removed
+  * Return columns change:
+
+    *  ``n_seq`` is removed
+    * ``seq`` changed type to ``BIGINT``
+
   * **Official** function
 
 * Version 2.5.0
@@ -102,7 +106,7 @@ Returns set of ``(seq, component, edge)``
 ============== ========== =================================================
 Column         Type       Description
 ============== ========== =================================================
-**seq**        ``INT``    Sequential value starting from **1**.
+**seq**        ``BIGINT``    Sequential value starting from **1**.
 **component**  ``BIGINT`` Component identifier. It is equal to the minimum edge identifier in the component.
 **edge**       ``BIGINT`` Identifier of the edge.
 ============== ========== =================================================

doc/components/pgr_connectedComponents.rst

@@ -21,7 +21,11 @@ pgr_connectedComponents
 
 * Version 3.0.0
 
-  * Return columns change: ``n_seq`` is removed
+  * Return columns change:
+
+    *  ``n_seq`` is removed
+    * ``seq`` changed type to ``BIGINT``
+
   * **Official** function
 
 * Version 2.5.0
@@ -101,7 +105,7 @@ Returns set of ``(seq, component, node)``
 ============== ========== =================================================
 Column         Type       Description
 ============== ========== =================================================
-**seq**        ``INT``    Sequential value starting from **1**.
+**seq**        ``BIGINT``    Sequential value starting from **1**.
 **component**  ``BIGINT`` Component identifier. It is equal to the minimum node identifier in the component.
 **node**       ``BIGINT`` Identifier of the vertex that belongs to **component**.
 ============== ========== =================================================

doc/components/pgr_strongComponents.rst

@@ -21,7 +21,11 @@ pgr_strongComponents
 
 * Version 3.0.0
 
-  * Return columns change: ``n_seq`` is removed
+  * Return columns change:
+
+    *  ``n_seq`` is removed
+    * ``seq`` changed type to ``BIGINT``
+
   * **Official** function
 
 * Version 2.5.0

doc/src/experimental.rst

@@ -11,6 +11,10 @@ Experimental Functions
 
 ..  begin-warn-expr
 
+.. warning:: Possible server crash
+
+  - These functions might create a server crash
+
 .. warning:: Experimental functions
 
   - They are not officially of the current release.

doc/trsp/pgr_trsp.rst

@@ -267,7 +267,7 @@ Different ways to represent 'no path found`
    :end-before: --place4
 
 pgr_trsp calls :doc:`pgr_dijkstra` when there are no restrictions which returns
-`EMTPY SET` when a path is not found
+`EMPTY SET` when a path is not found
 
 .. literalinclude:: trsp_notes.queries
    :start-after: --place4
@@ -345,7 +345,7 @@ An EXCEPTION is thrown.
    :start-after: --place10
    :end-before: --place11
 
-The ``reverse_cost`` column will be efectively removed and will cost execution time
+The ``reverse_cost`` column will be effectively removed and will cost execution time
 
 The "Edges" signature version
 .........................................................................
@@ -369,7 +369,7 @@ Different ways to represent 'no path found`
    :end-before: --place12
 
 pgr_trsp calls :doc:`pgr_withPoints` when there are no restrictions which returns
-`EMTPY SET` when a path is not found
+`EMPTY SET` when a path is not found
 
 .. rubric:: Throwing EXCEPTION to represent no path found
 
@@ -460,7 +460,7 @@ An EXCEPTION is thrown.
    :start-after: --place18
    :end-before: --place19
 
-The ``reverse_cost`` column will be efectively removed and will cost execution time
+The ``reverse_cost`` column will be effectively removed and will cost execution time
 
 Using a points of interest table
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

docqueries/contraction/doc-contraction-family.result

@@ -180,7 +180,8 @@ vertices_in_graph AS (
 SELECT id, source, target, cost, reverse_cost, contracted_vertices
 FROM edge_table
 WHERE source IN (SELECT * FROM vertices_in_graph)
-AND target IN (SELECT * FROM vertices_in_graph);
+AND target IN (SELECT * FROM vertices_in_graph)
+ORDER BY id;
  id | source | target | cost | reverse_cost | contracted_vertices
 ----+--------+--------+------+--------------+---------------------
   5 |      3 |      6 |    1 |           -1 |

docqueries/contraction/doc-contraction-family.test.sql

@@ -67,7 +67,8 @@ vertices_in_graph AS (
 SELECT id, source, target, cost, reverse_cost, contracted_vertices
 FROM edge_table
 WHERE source IN (SELECT * FROM vertices_in_graph)
-AND target IN (SELECT * FROM vertices_in_graph);
+AND target IN (SELECT * FROM vertices_in_graph)
+ORDER BY id;
 
 
 \echo -- case1

docqueries/spanningTree/doc-pgr_kruskal.result

@@ -5,7 +5,7 @@ SET
 -- q1
 SELECT * FROM pgr_kruskal(
     'SELECT id, source, target, cost, reverse_cost
-        FROM edge_table'
+        FROM edge_table ORDER BY id'
 ) ORDER BY edge;
  edge | cost
 ------+------

docqueries/spanningTree/doc-pgr_kruskal.test.sql

 \echo -- q1
 SELECT * FROM pgr_kruskal(
     'SELECT id, source, target, cost, reverse_cost
-        FROM edge_table'
+        FROM edge_table ORDER BY id'
 ) ORDER BY edge;
 
 \echo -- q2

docqueries/spanningTree/doc-pgr_kruskalBFS.result

@@ -5,28 +5,24 @@ SET
 --q1
 SELECT * FROM pgr_kruskalBFS(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table ORDER BY id',
-    0
+    2
 );
  seq | depth | start_vid | node | edge | cost | agg_cost
 -----+-------+-----------+------+------+------+----------
-   1 |     0 |         1 |    1 |   -1 |    0 |        0
-   2 |     1 |         1 |    2 |    1 |    1 |        1
-   3 |     2 |         1 |    3 |    2 |    1 |        2
-   4 |     3 |         1 |    4 |    3 |    1 |        3
-   5 |     4 |         1 |    9 |   16 |    1 |        4
-   6 |     5 |         1 |   12 |   15 |    1 |        5
-   7 |     6 |         1 |   11 |   13 |    1 |        6
-   8 |     7 |         1 |    6 |   11 |    1 |        7
-   9 |     7 |         1 |   10 |   12 |    1 |        7
-  10 |     8 |         1 |    5 |   10 |    1 |        8
-  11 |     8 |         1 |   13 |   14 |    1 |        8
-  12 |     9 |         1 |    8 |    7 |    1 |        9
-  13 |    10 |         1 |    7 |    6 |    1 |       10
-  14 |     0 |        14 |   14 |   -1 |    0 |        0
-  15 |     1 |        14 |   15 |   17 |    1 |        1
-  16 |     0 |        16 |   16 |   -1 |    0 |        0
-  17 |     1 |        16 |   17 |   18 |    1 |        1
-(17 rows)
+   1 |     0 |         2 |    2 |   -1 |    0 |        0
+   2 |     1 |         2 |    1 |    1 |    1 |        1
+   3 |     1 |         2 |    3 |    2 |    1 |        1
+   4 |     2 |         2 |    4 |    3 |    1 |        2
+   5 |     3 |         2 |    9 |   16 |    1 |        3
+   6 |     4 |         2 |   12 |   15 |    1 |        4
+   7 |     5 |         2 |   11 |   13 |    1 |        5
+   8 |     6 |         2 |    6 |   11 |    1 |        6
+   9 |     6 |         2 |   10 |   12 |    1 |        6
+  10 |     7 |         2 |    5 |   10 |    1 |        7
+  11 |     7 |         2 |   13 |   14 |    1 |        7
+  12 |     8 |         2 |    8 |    7 |    1 |        8
+  13 |     9 |         2 |    7 |    6 |    1 |        9
+(13 rows)
 
 --q2
 SELECT * FROM pgr_kruskalBFS(

docqueries/spanningTree/doc-pgr_kruskalBFS.test.sql

 \echo --q1
 SELECT * FROM pgr_kruskalBFS(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table ORDER BY id',
-    0
+    2
 );
 \echo --q2
 SELECT * FROM pgr_kruskalBFS(