Merge remote-tracking branch 'upstream/develop' into king-ordering-cleanup

Author: wifi:)

doc/allpairs/pgr_johnson.rst

@@ -17,7 +17,7 @@
 ===============================================================================
 
 ``pgr_johnson`` - Returns the sum of the costs of the shortest path for each
-pair of nodes in the graph using Floyd-Warshall algorithm.
+pair of nodes in the graph using Johnson algorithm.
 
 .. rubric:: Availability
 

doc/contraction/pgr_contractionHierarchies.rst

@@ -23,9 +23,9 @@ shortcut edges created.
 
 .. rubric:: Availability
 
-* Version 3.8.0
+.. rubric:: Version 3.8.0
 
-  * New **experimental** function
+* New experimental function
 
 
 Description

doc/src/pgRouting-introduction.rst

@@ -63,10 +63,9 @@ Contributors
 This Release Contributors
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-Individuals in this release v3.8.x (in alphabetical order)
+Individuals in this release v4.0.0 (in alphabetical order)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Aurélie Bousquet,
 Regina Obe,
 Vicky Vergara
 

doc/src/support.rst

@@ -48,19 +48,22 @@ Bugs are reported and managed in an `issue tracker
 
 
 
-Mailing List and GIS StackExchange
+Mailing List, Matrix, GIS StackExchange
 -------------------------------------------------------------------------------
 
-There are two mailing lists for pgRouting hosted on OSGeo mailing list server:
+There are two mailing lists for pgRouting hosted on OSGeo discourse server:
 
-* User mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-users
+* User mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-users/
 * Developer mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-dev/
 
   * Subscribe: https://discourse.osgeo.org/g/pgrouting-dev
 
 For general questions and topics about how to use pgRouting, please write to the
 user mailing list.
 
+If you want to chat with fellow pgRouting users and contributors, you 
+can join our matrix channel: `pgRouting matrix channel <https://matrix.to/#/#pgrouting:osgeo.org>`_.
+
 You can also ask at `GIS StackExchange <https://gis.stackexchange.com/>`_ and
 tag the question with ``pgrouting``.
 Find all questions tagged with ``pgrouting`` under

docqueries/src/sampledata.result

@@ -206,13 +206,13 @@ SELECT
   pid, ST_AsText(geom) geom,
   edge_id, fraction AS frac, side, distance AS dist,
   ST_AsText(edge) edge, ST_AsText(newPoint) newPoint
-FROM pointsOfInterest;
+FROM pointsOfInterest ORDER BY pid;
  pid |      geom      | edge_id | frac | side | dist |           edge            |   newpoint
 -----+----------------+---------+------+------+------+---------------------------+--------------
    1 | POINT(1.8 0.4) |       1 |  0.4 | l    |  0.2 | LINESTRING(1.8 0.4,2 0.4) | POINT(2 0.4)
-   4 | POINT(0.3 1.8) |       6 |  0.3 | r    |  0.2 | LINESTRING(0.3 1.8,0.3 2) | POINT(0.3 2)
-   3 | POINT(2.6 3.2) |      12 |  0.6 | l    |  0.2 | LINESTRING(2.6 3.2,2.6 3) | POINT(2.6 3)
    2 | POINT(4.2 2.4) |      15 |  0.4 | r    |  0.2 | LINESTRING(4.2 2.4,4 2.4) | POINT(4 2.4)
+   3 | POINT(2.6 3.2) |      12 |  0.6 | l    |  0.2 | LINESTRING(2.6 3.2,2.6 3) | POINT(2.6 3)
+   4 | POINT(0.3 1.8) |       6 |  0.3 | r    |  0.2 | LINESTRING(0.3 1.8,0.3 2) | POINT(0.3 2)
    5 | POINT(2.9 1.8) |       5 |  0.8 | l    |  0.1 | LINESTRING(2.9 1.8,3 1.8) | POINT(3 1.8)
    6 | POINT(2.2 1.7) |       4 |  0.7 | b    |  0.2 | LINESTRING(2.2 1.7,2 1.7) | POINT(2 1.7)
 (6 rows)

docqueries/src/withPoints-category.pg

@@ -1,7 +1,8 @@
 -- CopyRight(c) pgRouting developers
 -- Creative Commons Attribution-Share Alike 3.0 License : https://creativecommons.org/licenses/by-sa/3.0/
 /* --q1 */
-SELECT pid, edge_id, fraction, side FROM pointsOfInterest;
+SELECT pid, edge_id, fraction, side FROM pointsOfInterest
+ORDER BY pid;
 /* --q2 */
 SELECT id, source, target, cost, reverse_cost
 FROM edges WHERE id = 15;

docqueries/src/withPoints-category.result

@@ -3,13 +3,14 @@ BEGIN
 SET client_min_messages TO NOTICE;
 SET
 /* --q1 */
-SELECT pid, edge_id, fraction, side FROM pointsOfInterest;
+SELECT pid, edge_id, fraction, side FROM pointsOfInterest
+ORDER BY pid;
  pid | edge_id | fraction | side
 -----+---------+----------+------
    1 |       1 |      0.4 | l
-   4 |       6 |      0.3 | r
-   3 |      12 |      0.6 | l
    2 |      15 |      0.4 | r
+   3 |      12 |      0.6 | l
+   4 |       6 |      0.3 | r
    5 |       5 |      0.8 | l
    6 |       4 |      0.7 | b
 (6 rows)