Bladeren bron

ORStools imports --> OSMtools imports

master
nilsnolde 1 jaar geleden
bovenliggende
commit
59a0f35a77
8 gewijzigde bestanden met toevoegingen van 10 en 9 verwijderingen
  1. 3
    3
      client.py
  2. 1
    1
      dialog.py
  3. 1
    1
      geocode.py
  4. 1
    1
      isochrones.py
  5. 3
    1
      metadata.txt
  6. 1
    1
      osm_tools.py
  7. BIN
      osmtools.png
  8. 0
    1
      pointtool.py

+ 3
- 3
client.py Bestand weergeven

@@ -14,10 +14,10 @@ import time
14 14
 import collections
15 15
 from urllib.parse import urlencode
16 16
 
17
-import ORStools
17
+import OSMtools
18 18
 from . import exceptions, aux
19 19
 
20
-_USER_AGENT = "ORSClientQGIS/%s".format(ORStools.__version__)
20
+_USER_AGENT = "ORSClientQGIS/%s".format(OSMtools.__version__)
21 21
 _RETRIABLE_STATUSES = [503]
22 22
 _DEFAULT_BASE_URL = "https://api.openrouteservice.org"
23 23
 
@@ -218,7 +218,7 @@ class Client(object):
218 218
             return path + "?" + _urlencode_params(params)
219 219
 
220 220
         raise ValueError("No API key specified. "
221
-                         "Visit https://go.ORStools.org/dev-dashboard/ "
221
+                         "Visit https://go.openrouteservice.org/dev-dashboard/ "
222 222
                          "to create one.")
223 223
         
224 224
 

+ 1
- 1
dialog.py Bestand weergeven

@@ -1,7 +1,7 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 """
3 3
 /***************************************************************************
4
- ORStoolsDialog
4
+ OSMtoolsDialog
5 5
                                  A QGIS plugin
6 6
  falk
7 7
                              -------------------

+ 1
- 1
geocode.py Bestand weergeven

@@ -6,7 +6,7 @@ Created on Sun Feb 18 00:49:36 2018
6 6
 @author: nilsnolde
7 7
 """
8 8
 
9
-from ORStools import convert
9
+from . import convert
10 10
 
11 11
 def reverse_geocode(client, point_in):
12 12
     params = dict()

+ 1
- 1
isochrones.py Bestand weergeven

@@ -19,7 +19,7 @@ from qgis.core import (QgsPointXY,
19 19
                        QgsRendererCategory,
20 20
                        QgsCategorizedSymbolRenderer)
21 21
 
22
-from ORStools import (geocode,
22
+from . import (geocode,
23 23
                       convert,
24 24
                       aux
25 25
                       )

+ 3
- 1
metadata.txt Bestand weergeven

@@ -26,7 +26,9 @@ repository=https://github.com/nilsnolde/OSMtools.git
26 26
 
27 27
 # Uncomment the following line and add your changelog:
28 28
 
29
-changelog=2018/02/20 v.4b3 beta for QGIS2.99. Complete code refactoring with major improvements (isochrone ranges as list, calculate from selected points in map canvas), solved #4, #38, #40
29
+changelog=2018/02/21 v3.0.6b fixed calls to ORStools instead of OSMtools
30
+   2018/02/20 v3.0.5b handles Python error on Project startup
31
+   2018/02/20 v.4b3 beta for QGIS2.99. Complete code refactoring with major improvements (isochrone ranges as list, calculate from selected points in map canvas), solved #4, #38, #40
30 32
    2017/10/07 v.0.3.4 Fixed zoomToLayer bug (#35)
31 33
    2017/09/24 v.0.3.3 Handled deprecated mapRenderer() function
32 34
    2017/09/23 v.0.3.2 Added avoid_type feature for routing, auto-styling for acc areas

+ 1
- 1
osm_tools.py Bestand weergeven

@@ -33,7 +33,7 @@ from PyQt5.Qt import PYQT_VERSION_STR
33 33
 from PyQt5.QtGui import QIcon
34 34
 from PyQt5.QtWidgets import QAction, QApplication
35 35
 
36
-from ORStools.dialog import OSMtoolsDialog
36
+from OSMtools.dialog import OSMtoolsDialog
37 37
 from . import isochrones, client, directions, exceptions
38 38
 
39 39
 import logging

BIN
osmtools.png Bestand weergeven


+ 0
- 1
pointtool.py Bestand weergeven

@@ -13,7 +13,6 @@ from qgis.core import (QgsCoordinateReferenceSystem,
13 13
                        QgsProject)
14 14
 from qgis.gui import QgsMapTool
15 15
 
16
-
17 16
 import os
18 17
 
19 18
 # Find cursor icon in plugin tree

Laden…
Annuleren
Opslaan