Skip to content

Commit 9899bbf

Browse files
cayetanobvcayetanobv
authored
Merge pull request #127 from pgRouting/master
Develop branch updated with last changes to master
2 parents c85afab + d86fed2 commit 9899bbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+783
-363
lines changed

‎.travis.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# ------------------------------------------------------------------------------
2+
# Travis CI scripts
3+
# Copyright(c) pgRouting Contributors
4+
#
5+
# Main configuration
6+
# ------------------------------------------------------------------------------
7+
8+
dist: xenial
9+
10+
language: python
11+
python:
12+
- "3.5"
13+
14+
addons:
15+
apt:
16+
packages:
17+
- pyqt5-dev-tools
18+
19+
cache:
20+
directories:
21+
- $HOME/.cache/pip
22+
23+
before_cache:
24+
- rm -f $HOME/.cache/pip/log/debug.log
25+
26+
install:
27+
- pip install -r requirements.txt
28+
29+
before_script:
30+
- mkdir build
31+
32+
script:
33+
- pb_tool deploy -y -p build
34+
- mkdocs build
35+

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ A plugin for QGIS created by by Anita Graser, Ko Nagase and Vicky Vergara.
55
pgRoutingLayer is currently developed and maintained by pgRouting community.
66

77
- Project home and bug tracker: [https://github.com/pgrouting/pgRoutingLayer](https://github.com/pgrouting/pgRoutingLayer)
8-
- Plugin repository: [https://plugins.qgis.org/plugins](https://plugins.qgis.org/plugins)
8+
- Plugin repository: [https://plugins.qgis.org/plugins/pgRoutingLayer/](https://plugins.qgis.org/plugins/pgRoutingLayer/)
99

1010
## What is the goal
1111

@@ -39,7 +39,7 @@ the Free Software Foundation; either version 2 of the License, or
3939

4040
## Installation
4141

42-
This plugin can be installed using the QGIS Plugin Manager. You will have to enable "experimental" plugins.
42+
This plugin can be installed using the QGIS Plugin Manager.
4343

4444
### Dependencies
4545

‎__init__.py‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
1-
"""
2-
/***************************************************************************
3-
pgRouting Layer
4-
a QGIS plugin
5-
6-
based on "Fast SQL Layer" plugin Copyright 2011 Pablo Torres Carreira
7-
-------------------
8-
begin : 2011-11-25
9-
copyright : (c) 2011 by Anita Graser
10-
email : [email protected]
11-
***************************************************************************/
12-
13-
/***************************************************************************
14-
* *
15-
* This program is free software; you can redistribute it and/or modify *
16-
* it under the terms of the GNU General Public License as published by *
17-
* the Free Software Foundation; either version 2 of the License, or *
18-
* (at your option) any later version. *
19-
* *
20-
***************************************************************************/
21-
This script initializes the plugin, making it known to QGIS.
22-
"""
23-
1+
# -*- coding: utf-8 -*-
2+
# /*PGR-GNU*****************************************************************
3+
# File: __init__.py
4+
#
5+
# Copyright (c) 2011~2019 pgRouting developers
6+
# Mail: [email protected]
7+
#
8+
# Developer's GitHub nickname:
9+
# - AasheeshT
10+
# - cayetanobv
11+
# - cvvergara
12+
# - anitagraser
13+
# ------
14+
#
15+
# This program is free software; you can redistribute it and/or modify
16+
# it under the terms of the GNU General Public License as published by
17+
# the Free Software Foundation; either version 2 of the License, or
18+
# (at your option) any later version.
19+
# This program is distributed in the hope that it will be useful,
20+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
# GNU General Public License for more details.
23+
# You should have received a copy of the GNU General Public License
24+
# along with this program; if not, write to the Free Software
25+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
26+
# ********************************************************************PGR-GNU*/
2427

2528
def classFactory(iface):
2629
from pgRoutingLayer.pgRoutingLayer import PgRoutingLayer

‎connectors/__init__.py‎

Whitespace-only changes.

‎connectors/postgis.py‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
# -*- coding: utf-8 -*-
2-
"""
3-
RT Sql Layer
4-
Copyright 2010 Giuseppe Sucameli
2+
# /*PGR-GNU*****************************************************************
3+
# File: postgis.py
4+
#
5+
# Copyright (c) 2011~2019 pgRouting developers
6+
# Mail: [email protected]
7+
#
8+
# Developer's GitHub nickname:
9+
# - cayetanobv
10+
# - AasheeshT
11+
# - jef-n
12+
# - sanak
13+
# - cvvergara
14+
# - anitagraser
15+
# ------
16+
#
17+
# This program is free software; you can redistribute it and/or modify
18+
# it under the terms of the GNU General Public License as published by
19+
# the Free Software Foundation; either version 2 of the License, or
20+
# (at your option) any later version.
21+
# This program is distributed in the hope that it will be useful,
22+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
23+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24+
# GNU General Public License for more details.
25+
# You should have received a copy of the GNU General Public License
26+
# along with this program; if not, write to the Free Software
27+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
28+
# ********************************************************************PGR-GNU*/
529

6-
based on PostGIS Manager
7-
Copyright 2008 Martin Dobias
8-
9-
Licensed under the terms of GNU GPL v2 (or any later)
10-
http://www.gnu.org/copyleft/gpl.html
11-
12-
13-
Good resource for metadata extraction:
14-
http://www.alberton.info/postgresql_meta_info.html
15-
System information functions:
16-
http://www.postgresql.org/docs/8.0/static/functions-info.html
17-
"""
1830
from __future__ import print_function
1931
from qgis.core import QgsDataSourceUri
2032
from qgis.PyQt.QtCore import QSettings

‎dbConnection.py‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11
# -*- coding: utf-8 -*-
2+
# /*PGR-GNU*****************************************************************
3+
# File: dbConnection.py
4+
#
5+
# Copyright (c) 2011~2019 pgRouting developers
6+
# Mail: [email protected]
7+
#
8+
# Developer's GitHub nickname:
9+
# - AasheeshT
10+
# - cayetanobv
11+
# - sanak
12+
# - cvvergara
13+
# - anitagraser
14+
# ------
15+
#
16+
# This program is free software; you can redistribute it and/or modify
17+
# it under the terms of the GNU General Public License as published by
18+
# the Free Software Foundation; either version 2 of the License, or
19+
# (at your option) any later version.
20+
# This program is distributed in the hope that it will be useful,
21+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
22+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+
# GNU General Public License for more details.
24+
# You should have received a copy of the GNU General Public License
25+
# along with this program; if not, write to the Free Software
26+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
27+
# ********************************************************************PGR-GNU*/
28+
229

330
from __future__ import absolute_import
431
from qgis.core import QgsDataSourceUri

‎docs/functions/pgr_KSP.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<pgRoutingLayer Manual>
2+
<Copyright(c) pgRouting Contributors>
3+
<This documentation is licensed under a Creative Commons Attribution-Share>
4+
<Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/>
5+
16
# pgr_KSP
27
![pgr_KSP](../img/functions/f_pgr_KSP.png)
38

@@ -37,7 +42,7 @@
3742
|![Heap paths](../img/fields/arguments/KSP_heapPaths.png)| Tick.. ![Heap paths](../img/fields/arguments/KSP_heapPathsON.png)
3843
|![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
3944

40-
## Execute tab
45+
## Execute tab
4146
![Execute tab](../img/tabs/execute/execute.png)
4247

4348
|Button|Action|
@@ -47,8 +52,8 @@
4752
|![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
4853
|![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multiline geometry layer. As many rows as needed|
4954

50-
Depending on the pressed button the layer name will be
55+
Depending on the pressed button the layer name will be
5156
```
5257
(<U|D>) pgr_KSP: <source_id> to <target_id> BBOX(<bbox>)
5358
(M <U|D>) pgr_KSP: <source_id> to <target_id> BBOX(<bbox>)
54-
```
59+
```

‎docs/functions/pgr_aStar.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# pgr_astar
1+
<pgRoutingLayer Manual>
2+
<Copyright(c) pgRouting Contributors>
3+
<This documentation is licensed under a Creative Commons Attribution-Share>
4+
<Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/>
25

3-
- # pgr_astar
6+
# pgr_astar
47
![pgr_astar](../img/functions/f_pgr_astar.png)
58

69
|Button|Action|
@@ -42,7 +45,7 @@
4245
|![Epsilon](../img/fields/arguments/astar_epsilon.png)| For less restricted results. `epsilon >= 1`. Default ``1``.|
4346
|![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
4447

45-
## Execute tab
48+
## Execute tab
4649
![Execute tab](../img/tabs/execute/execute.png)
4750

4851
|Button|Action|
@@ -53,8 +56,8 @@
5356
|![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multiline geometry layer. As many rows as needed|
5457

5558

56-
Depending on the pressed button the layer name will be
59+
Depending on the pressed button the layer name will be
5760
```
5861
(<U|D>) pgr_astar: <source_id> to <target_id> BBOX(<bbox>)
5962
(M <U|D>) pgr_astar: <source_id> to <target_id> BBOX(<bbox>)
60-
```
63+
```

‎docs/functions/pgr_astarCost.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<pgRoutingLayer Manual>
2+
<Copyright(c) pgRouting Contributors>
3+
<This documentation is licensed under a Creative Commons Attribution-Share>
4+
<Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/>
5+
16
# pgr_astarCost
27
![pgr_astarCost](../img/functions/f_pgr_astarCost.png)
38

@@ -38,7 +43,7 @@
3843
|![Epsilon](../img/fields/arguments/astar_epsilon.png)| For less restricted results. `epsilon >= 1`. Default ``1``.|
3944
|![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
4045

41-
## Execute tab
46+
## Execute tab
4247
![Execute tab](../img/tabs/execute/execute.png)
4348

4449
|Button|Action|
@@ -48,7 +53,7 @@
4853
|![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
4954
|![Export Merged](../img/buttons/execute/exportmergedOFF.png)| Disabled|
5055

51-
Depending on the pressed button the layer name will be
56+
Depending on the pressed button the layer name will be
5257
```
5358
(<U|D>) pgr_astarCost: <source_id> to <target_id> BBOX(<bbox>)
54-
```
59+
```

‎docs/functions/pgr_bdAstar.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# pgr_bdAstar
1+
<pgRoutingLayer Manual>
2+
<Copyright(c) pgRouting Contributors>
3+
<This documentation is licensed under a Creative Commons Attribution-Share>
4+
<Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/>
25

3-
- # pgr_bdAstar
6+
# pgr_bdAstar
47
![pgr_bdAstar](../img/functions/f_pgr_bdAstar.png)
58

69
|Button|Action|
@@ -42,19 +45,19 @@
4245
|![Epsilon](../img/fields/arguments/astar_epsilon.png)| For less restricted results. `epsilon >= 1`. Default ``1``.|
4346
|![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
4447

45-
## Execute tab
48+
## Execute tab
4649
![Execute tab](../img/tabs/execute/execute.png)
4750

4851
|Button|Action|
4952
| ----------- | --------- |
5053
|![Preview](../img/buttons/execute/preview.png)| Draws in the canvas the resulting path |
5154
|![Clear Preview](../img/buttons/execute/clearpreview.png)| Removes from the canvas objects generated with Preview|
5255
|![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
53-
|![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multiline geometry layer. As many rows as needed|
56+
|![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multi line geometry layer. As many rows as needed|
5457

5558

56-
Depending on the pressed button the layer name will be
59+
Depending on the pressed button the layer name will be
5760
```
5861
(<U|D>) pgr_bdAstar: <source_id> to <target_id> BBOX(<bbox>)
5962
(M <U|D>) pgr_bdAstar: <source_id> to <target_id> BBOX(<bbox>)
60-
```
63+
```

0 commit comments

Comments
 (0)