moving the license to the LICENSE file

CMakeLists.txt

@@ -212,7 +212,7 @@ endif()
 
 set(PGROUTING_VERSION_MAJOR "2")
 set(PGROUTING_VERSION_MINOR "4")
-set(PGROUTING_VERSION_PATCH "0")
+set(PGROUTING_VERSION_PATCH "1")
 set(PGROUTING_VERSION_DEV "")
 
 set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")

NEWS

@@ -1,4 +1,11 @@
 
+Changes for 2.4.1
+-------------------------------------------------------------------------------
+
+* Bug fixes
+  * fixed compiling error on macOS
+  * Condition error on pgr_withPoints
+
 Changes for 2.4.0
 -------------------------------------------------------------------------------
 

VERSION

@@ -1 +1 @@
-4686-72236aaa7 master
+4691-722e04e03 master

doc/src/release_notes.rst

@@ -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_4_1`
 * :ref:`changelog_2_4_0`
 * :ref:`changelog_2_3_2`
 * :ref:`changelog_2_3_1`
@@ -34,6 +35,16 @@ To see the full list of changes check the list of `Git commits <https://github.c
 
 .. changelog end
 
+.. _changelog_2_4_1:
+
+pgRouting 2.4.1 Release Notes
+-------------------------------------------------------------------------------
+
+.. rubric:: Bug fix
+
+* Fixed compiling error on macOS
+* Condition error on pgr_withPoints
+
 .. _changelog_2_4_0:
 
 pgRouting 2.4.0 Release Notes

doc/test/utilities-any.result

@@ -1 +1 @@
-2.4.0
+2.4.1

src/bdDijkstra/src/pgr_bdDijkstra.hpp

@@ -81,7 +81,7 @@ class Pgr_bdDijkstra {
      }
 
      std::string log() const {return m_log.str();}
-     void clean_log() {log.clear();}
+     void clean_log() {m_log.clear();}
      void clear() {
          while (!forward_queue.empty()) forward_queue.pop();
          while (!backward_queue.empty()) backward_queue.pop();

src/topology/doc/pgr_nodeNetwork.rst

@@ -111,7 +111,7 @@ Now we can analyze the network.
  	 OK
 	(1 row)
 
-The analysis tell us that the network has a gap and and an intersection. We try to fix the problem using:
+The analysis tell us that the network has a gap and an intersection. We try to fix the problem using:
 
 .. code-block:: sql
 

src/withPoints/src/many_to_many_withPoints_driver.cpp

@@ -108,9 +108,8 @@ do_pgr_many_to_many_withPoints(
         pgassert(!(*err_msg));
         pgassert(!(*return_tuples));
         pgassert((*return_count) == 0);
-        pgassert(edges);
+        pgassert(edges || edges_of_points);
         pgassert(points_p);
-        pgassert(edges_of_points);
         pgassert(start_pidsArr);
         pgassert(end_pidsArr);
 

tools/curr-sig/pgrouting--2.4.1.sig

@@ -0,0 +1,156 @@
+#VERSION pgrouting 2.4.1
+#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_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)
+pgr_astar(text,anyarray,bigint,boolean,integer,double precision,double precision)
+_pgr_astar(text,anyarray,bigint,boolean,integer,double precision,double precision,boolean)
+pgr_astar(text,bigint,anyarray,boolean,integer,double precision,double precision)
+_pgr_astar(text,bigint,anyarray,boolean,integer,double precision,double precision,boolean)
+pgr_astar(text,bigint,bigint,boolean,integer,double precision,double precision)
+_pgr_astar(text,bigint,bigint,boolean,integer,double precision,double precision,boolean)
+pgr_astar(text,integer,integer,boolean,boolean)
+pgr_bdastar(text,integer,integer,boolean,boolean)
+pgr_bddijkstra(text,bigint,bigint)
+pgr_bddijkstra(text,bigint,bigint,boolean)
+_pgr_bddijkstra(text,bigint,bigint,boolean,boolean)
+pgr_bddijkstra(text,integer,integer,boolean,boolean)
+_pgr_checkverttab(text,text[],integer,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)
+pgr_dijkstra(text,anyarray,bigint,boolean)
+_pgr_dijkstra(text,anyarray,bigint,boolean,boolean)
+pgr_dijkstra(text,bigint,anyarray,boolean)
+_pgr_dijkstra(text,bigint,anyarray,boolean,boolean)
+pgr_dijkstra(text,bigint,bigint)
+pgr_dijkstra(text,bigint,bigint,boolean)
+_pgr_dijkstra(text,bigint,bigint,boolean,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_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,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_makedistancematrix(text)
+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,text,boolean)
+pgr_maxflow(text,anyarray,bigint)
+_pgr_maxflow(text,anyarray,bigint,text,boolean)
+pgr_maxflow(text,bigint,anyarray)
+_pgr_maxflow(text,bigint,anyarray,text,boolean)
+pgr_maxflow(text,bigint,bigint)
+_pgr_maxflow(text,bigint,bigint,text,boolean)
+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_pickdeliver(text,integer,double precision,double precision,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_quote_ident(text)
+pgr_quote_ident(text)
+_pgr_startpoint(geometry)
+pgr_startpoint(geometry)
+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,integer,integer,boolean,boolean,text)
+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_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)
+pgr_withpoints(text,text,anyarray,bigint,boolean,character,boolean)
+_pgr_withpoints(text,text,anyarray,bigint,boolean,character,boolean,boolean)
+pgr_withpoints(text,text,bigint,anyarray,boolean,character,boolean)
+_pgr_withpoints(text,text,bigint,anyarray,boolean,character,boolean,boolean)
+pgr_withpoints(text,text,bigint,bigint,boolean,character,boolean)
+_pgr_withpoints(text,text,bigint,bigint,boolean,character,boolean,boolean)
+_pgr_withpointsvia(text,bigint[],double precision[],boolean)