Skip to content

Commit 544044b

Browse files
cvvergaracvvergara
committed
fixing merge conflicts
2 parents 4bb500d + df265ff commit 544044b

File tree

13 files changed

+154
-10
lines changed

13 files changed

+154
-10
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ branches:
2727
only:
2828
- master
2929
- develop
30+
- hotFix/issue552
3031

3132
env:
3233
- POSTGRESQL_VERSION=9.1

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SET(POSTGRESQL_BIN "" CACHE STRING "Define optional path to PostgreSQL binaries
3131
# PGROUTING version number.
3232
set(PGROUTING_VERSION_MAJOR "2")
3333
set(PGROUTING_VERSION_MINOR "2")
34-
set(PGROUTING_VERSION_PATCH "1")
34+
set(PGROUTING_VERSION_PATCH "2")
3535

3636
set(PGROUTING_VERSION_STRING "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}.${PGROUTING_VERSION_PATCH}")
3737
set(PGROUTING_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
@@ -41,7 +41,7 @@ set(POSTGIS_MINIMUM_VERSION "2.0.0")
4141

4242
file(STRINGS "${PGROUTING_SOURCE_DIR}/VERSION" PGROUTING_BUILD_STRING)
4343

44-
set(PGROUTING_GIT_TAG "pgrouting-2.2.1")
44+
set(PGROUTING_GIT_TAG "pgrouting-2.2.2")
4545
#string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\1" PGROUTING_GIT_TAG ${PGROUTING_BUILD_STRING})
4646
string(REGEX REPLACE "^(.+)-([^-]+)-[0-9]+-g([0-9a-f]+) (.*)$" "\\2" PGROUTING_GIT_BUILD ${PGROUTING_BUILD_STRING})
4747
string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\3" PGROUTING_GIT_HASH ${PGROUTING_BUILD_STRING})

‎NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Changes for 2.2.2
2+
-------------------------------------------------------------------------------
3+
4+
- Fixed regression error on pgr_drivingDistance
15

26
Changes for 2.2.1
37
-------------------------------------------------------------------------------

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
## STATUS
66

7-
### Current Development is in the *develop* branch
7+
### Branches
88

9-
The *master* branch reflects the current 2.2.0 release.
9+
The *master* branch reflects the current 2.2.2 release.
10+
The *develop* branch reflects the 2.3.0-dev
1011

1112

1213

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pgrouting-2.2.1-0-g7141904 master
1+
pgrouting-2.2.2-0-g7eb7d57 master

‎doc/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ Change Log
177177

178178
:ref:`change_log`
179179

180+
- :ref:`changelog_2_2_2`
180181
- :ref:`changelog_2_2_1`
181182
- :ref:`changelog_2_2_0`
182183
- :ref:`changelog_2_1_0`

‎doc/src/changelog/2_2_2.rst

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
..
2+
****************************************************************************
3+
pgRouting Manual
4+
Copyright(c) pgRouting Contributors
5+
6+
This documentation is licensed under a Creative Commons Attribution-Share
7+
Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
8+
****************************************************************************
9+
10+
.. _changelog_2_2_2:
11+
12+
pgRouting 2.2.2 Release Notes
13+
===============================================================================
14+
15+
With the release of pgRouting 2.2.2 fixes a regression bug.
16+
17+
- To see the full list of changes check the list of `Git commits <https://github.com/pgRouting/pgrouting/commits>`_ on Github.
18+
- To see the issues closed by this release see the `Git closed issues <https://github.com/pgRouting/pgrouting/issues?q=milestone%3ARelease-2.2.2+is%3Aclosed>`_ on Github.
19+
- For important changes see the following release notes.
20+
21+
22+
Release Notes
23+
-------------------------------------------------------------------------------
24+
25+
26+
Changes for release 2.2.2
27+
28+
* Fixed regression error on pgr_drivingDistance

‎doc/src/changelog/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
Release Notes
1313
===============================================================================
1414

15+
- :ref:`changelog_2_2_2`
1516
- :ref:`changelog_2_2_1`
1617
- :ref:`changelog_2_2_0`
1718
- :ref:`changelog_2_1_0`
@@ -21,6 +22,7 @@ Release Notes
2122
.. toctree::
2223
:hidden:
2324

25+
2_2_2
2426
2_2_1
2527
2_2_0
2628
2_1_0

‎doc/test/utilities-any.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.1
1+
2.2.2

‎src/common/src/basePath_SSEC.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class Path {
162162
return l.node < r.node;
163163
});
164164

165-
if (pos != p1.end() && stop.agg_cost < pos->agg_cost) {
165+
if (pos != p1.end() && stop.node == pos->node && stop.agg_cost < pos->agg_cost) {
166166
/* both share the same node &
167167
* the second path has the smallest
168168
* So erasing from the first path */

‎src/withPoints/doc/pgr_withPointsDD.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ Finds the driving distance depending on the optional parameters setup.
100100
Driving distance from many starting points
101101
------------------------------------------
102102

103-
.. note:: Not coded yet
104-
105103
Finds the driving distance depending on the optional parameters setup.
106104

107105
.. code-block:: none

‎src/withPoints/doc/withPoints_queries.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Column Type Description
3636
- Can not be NULL.
3737
- If column not present, a sequential identifier will be given automatically.
3838

39-
**eid** ``ANY-INTEGER`` Identifier of the "closest" edge to the point.
39+
**edge_id** ``ANY-INTEGER`` Identifier of the "closest" edge to the point.
4040
**fraction** ``ANY-NUMERICAL`` Value in <0,1> that indicates the relative postition from the first end point of the edge.
4141
**side** ``CHAR`` (optional) Value in ['b', 'r', 'l', NULL] indicating if the point is:
4242
- In the right, left of the edge or

‎tools/sigs/pgrouting--2.2.1.sig

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
#VERSION pgrouting 2.2.1
2+
#TYPES
3+
pgr_costResult(integer,integer,integer,float8)
4+
pgr_costResult3(integer,integer,integer,integer,float8)
5+
pgr_geomResult(integer,integer,integer,geometry)
6+
#FUNCTIONS
7+
_pgr_checkverttab(text,text[],in int ,in text ,out text,out text)
8+
_pgr_createindex(text,text,text,text,in int ,in text )
9+
_pgr_createindex(text,text,text,in int ,in text )
10+
_pgr_dijkstra(text,bigint,bigint,boolean,boolean ,out integer,out integer,out bigint,out bigint,out float,out float)
11+
_pgr_dijkstra(text,bigint,anyarray,boolean ,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out float,out float)
12+
_pgr_dijkstra(text,anyarray,bigint,boolean ,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out float,out float)
13+
_pgr_dijkstra(text,anyarray,anyarray,boolean ,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out bigint,out float,out float)
14+
_pgr_drivingdistance(text,bigint,float8,boolean,out integer,out bigint,out bigint,out float,out float)
15+
_pgr_drivingdistance(text,anyarray,float8,boolean,boolean,out integer,out bigint,out bigint,out bigint,out float,out float)
16+
_pgr_endpoint(geometry)
17+
_pgr_getcolumnname(text,text,text,in int ,in text )
18+
_pgr_getcolumnname(text,text,in int ,in text )
19+
_pgr_getcolumntype(text,text,text,in int ,in text )
20+
_pgr_getcolumntype(text,text,in int ,in text )
21+
_pgr_gettablename(in text,in int ,in text ,out text,out text)
22+
_pgr_get_statement(text)
23+
_pgr_iscolumnintable(text,text)
24+
_pgr_iscolumnindexed(text,text,text,in int ,in text )
25+
_pgr_iscolumnindexed(text,text,in int ,in text )
26+
_pgr_ksp(text,bigint,bigint,integer,boolean,boolean,out integer,out integer,out integer,out bigint,out bigint,out float,out float)
27+
_pgr_makedistancematrix(text,out double precision[],out integer[])
28+
_pgr_msg(in int,in text,in text )
29+
_pgr_onerror(in boolean,in int,in text,in text,in text ,in text )
30+
_pgr_parameter_check(text,text,boolean )
31+
_pgr_pointtoid(geometry,double precision,text,integer)
32+
_pgr_quote_ident(text)
33+
_pgr_startpoint(geometry)
34+
_pgr_trsp(text,integer,integer,boolean,boolean,text )
35+
_pgr_trspviavertices(text,integer[],boolean,boolean,text )
36+
_pgr_versionless(text,text)
37+
_pgr_withpoints(text,text,bigint,bigint,boolean,char,boolean,boolean ,out integer,out integer,out bigint,out bigint,out float,out float)
38+
_pgr_withpoints(text,text,bigint,anyarray,boolean,char,boolean,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out float,out float)
39+
_pgr_withpoints(text,text,anyarray,bigint,boolean,char,boolean,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out float,out float)
40+
_pgr_withpoints(text,text,anyarray,anyarray,boolean,char,boolean,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out bigint,out float,out float)
41+
_pgr_withpointsvia(text,bigint[],float[],boolean ,out integer,out integer,out integer,out bigint,out bigint,out bigint,out bigint,out float,out float,out float)
42+
pgr_alphashape(text,float8 ,out float8,out float8)
43+
pgr_analyzeoneway(text,text[],text[],text[],text[],boolean ,text ,text ,text )
44+
pgr_analyzegraph(text,double precision,text ,text ,text ,text ,text )
45+
pgr_apspjohnson(text)
46+
pgr_apspwarshall(text,boolean,boolean)
47+
pgr_astar(text,integer,integer,boolean,boolean)
48+
pgr_bdastar(text,integer,integer,boolean,boolean)
49+
pgr_bddijkstra(text,integer,integer,boolean,boolean)
50+
pgr_createtopology(text,double precision,text ,text ,text ,text ,text ,boolean )
51+
pgr_createverticestable(text,text ,text ,text ,text )
52+
pgr_dijkstra(text,bigint,bigint,out integer,out integer,out bigint,out bigint,out float,out float)
53+
pgr_dijkstra(text,bigint,bigint,boolean,out integer,out integer,out bigint,out bigint,out float,out float)
54+
pgr_dijkstra(text,bigint,anyarray,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out float,out float)
55+
pgr_dijkstra(text,integer,integer,boolean,boolean)
56+
pgr_dijkstra(text,anyarray,bigint,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out float,out float)
57+
pgr_dijkstra(text,anyarray,anyarray,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out bigint,out float,out float)
58+
pgr_dijkstracost(text,bigint,bigint,boolean ,out bigint,out bigint,out float)
59+
pgr_dijkstracost(text,bigint,anyarray,boolean ,out bigint,out bigint,out float)
60+
pgr_dijkstracost(text,anyarray,bigint,boolean ,out bigint,out bigint,out float)
61+
pgr_dijkstracost(text,anyarray,anyarray,boolean ,out bigint,out bigint,out float)
62+
pgr_dijkstravia(text,anyarray,boolean ,boolean ,boolean ,out integer,out integer,out integer,out bigint,out bigint,out bigint,out bigint,out float,out float,out float)
63+
pgr_drivingdistance(text,bigint,float8,boolean,boolean)
64+
pgr_drivingdistance(text,bigint,float8,boolean ,out integer,out bigint,out bigint,out float,out float)
65+
pgr_drivingdistance(text,anyarray,float8,boolean ,boolean ,out integer,out bigint,out bigint,out bigint,out float,out float)
66+
pgr_endpoint(geometry)
67+
pgr_flipedges(geometry[])
68+
pgr_floydwarshall(text,boolean ,out bigint,out bigint,out float)
69+
pgr_getcolumnname(text,text)
70+
pgr_gettablename(in text,out text,out text)
71+
pgr_gsoc_vrppdtw(text,integer,integer,out integer,out integer,out integer,out integer )
72+
pgr_iscolumnintable(text,text)
73+
pgr_iscolumnindexed(text,text)
74+
pgr_johnson(text,boolean ,out bigint,out bigint,out float)
75+
pgr_kdijkstrapath(text,integer,integer array,boolean,boolean)
76+
pgr_kdijkstracost(text,integer,integer array,boolean,boolean)
77+
pgr_ksp(text,bigint,bigint,integer,boolean ,boolean ,out integer,out integer,out integer,out bigint,out bigint,out float,out float)
78+
pgr_ksp(text,integer,integer,integer,boolean)
79+
pgr_labelgraph(text,text ,text ,text ,text ,text )
80+
pgr_nodenetwork(text,double precision,text ,text ,text ,text ,boolean )
81+
pgr_pointsaspolygon(varchar,float8 )
82+
pgr_pointstodmatrix(geometry[],integer )
83+
pgr_pointstovids(geometry[],text,float8 )
84+
pgr_pointtoedgenode(text,geometry,float8)
85+
pgr_quote_ident(text)
86+
pgr_startpoint(geometry)
87+
pgr_texttopoints(text,integer )
88+
pgr_trsp(text,integer,integer,boolean,boolean,text )
89+
pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text )
90+
pgr_trspviaedges(text,integer[],float8[],boolean,boolean,text )
91+
pgr_trspviavertices(text,anyarray,boolean,boolean,text )
92+
pgr_tsp(float8[][],integer,integer ,out integer,out integer)
93+
pgr_tsp(text,integer,integer )
94+
pgr_version()
95+
pgr_versionless(text,text)
96+
pgr_vidstodmatrix(text,integer[],bool,bool,bool)
97+
pgr_vidstodmatrix(in integer[],in geometry[],in text,float8 )
98+
pgr_vrponedepot(text,text,text,integer,out integer,out integer,out integer,out integer,out integer)
99+
pgr_withpoints(text,text,bigint,bigint,boolean ,char ,boolean ,out integer,out integer,out bigint,out bigint,out float,out float)
100+
pgr_withpoints(text,text,bigint,anyarray,boolean ,char ,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out float,out float)
101+
pgr_withpoints(text,text,anyarray,bigint,boolean ,char ,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out float,out float)
102+
pgr_withpoints(text,text,anyarray,anyarray,boolean ,char ,boolean ,out integer,out integer,out bigint,out bigint,out bigint,out bigint,out float,out float)
103+
pgr_withpointscost(text,text,bigint,bigint,boolean ,char ,out bigint,out bigint,out float)
104+
pgr_withpointscost(text,text,bigint,anyarray,boolean ,char ,out bigint,out bigint,out float)
105+
pgr_withpointscost(text,text,anyarray,bigint,boolean ,char ,out bigint,out bigint,out float)
106+
pgr_withpointscost(text,text,anyarray,anyarray,boolean ,char ,out bigint,out bigint,out float)
107+
pgr_withpointsdd(text,text,anyarray,float,boolean ,char ,boolean ,boolean ,out integer,out bigint,out bigint,out bigint,out float,out float)
108+
pgr_withpointsdd(text,text,bigint,float,boolean ,char ,boolean ,out integer,out bigint,out bigint,out float,out float)
109+
pgr_withpointsksp(text,text,bigint,bigint,integer,boolean ,boolean ,char ,boolean ,out integer,out integer,out integer,out bigint,out bigint,out float,out float)

0 commit comments

Comments
 (0)