Merge pull request #80 from pgRouting/revert-55-revert-54-master

Revert "Revert "API Changes""

Author: cayetanobv

Test_utils.py

@@ -0,0 +1,140 @@
+import pgRoutingLayer_utils as utils
+import unittest
+import sys
+from qgis.core import *
+from qgis.gui import *
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+import psycopg2
+import sip
+
+
+
+class TestUtils(unittest.TestCase):
+
+    def test_setStartPoint_1(self):
+        args = { 'geometry': 'test_geom','table' : 'test_table'}
+        geomType = 'ST_LineString'
+        utils.setStartPoint(geomType,args)
+        self.assertEqual(args['startpoint'], 'ST_StartPoint(test_geom)')
+
+    def test_setStartPoint_2(self):
+        args = { 'geometry': 'test_geom','table' : 'test_table'}
+        geomType = 'ST_MultiLineString'
+        utils.setStartPoint(geomType,args)
+        self.assertEqual(args['startpoint'], 'ST_StartPoint(ST_GeometryN(test_geom, 1))')
+
+    def test_setEndPoint_1(self):
+        args = { 'geometry': 'test_geom','table' : 'test_table'}
+        geomType = 'ST_LineString'
+        utils.setEndPoint(geomType,args)
+        self.assertEqual(args['endpoint'], 'ST_EndPoint(test_geom)')
+
+    def test_setEndPoint_2(self):
+        args = { 'geometry': 'test_geom','table' : 'test_table'}
+        geomType = 'ST_MultiLineString'
+        utils.setEndPoint(geomType,args)
+        self.assertEqual(args['endpoint'], 'ST_EndPoint(ST_GeometryN(test_geom, 1))')
+
+    def test_isSIPv2(self):
+        self.assertTrue(utils.isSIPv2())
+
+    def test_getStringValue(self):
+        setting = QSettings()
+        setting.setValue('/pgRoutingLayer/Database', 99)
+        self.assertEqual(utils.getStringValue(setting,'/pgRoutingLayer/Database', 99) ,'99')
+
+    def test_getBoolValue(self):
+        setting = QSettings()
+        setting.setValue('/pgRoutingLayer/Database', 99)
+        self.assertTrue(utils.getBoolValue(setting,'/pgRoutingLayer/Database', 99))
+
+    
+    def test_getDestinationCrs(self):
+        app = QApplication(sys.argv)
+        # create a map canvas widget
+        canvas = QgsMapCanvas()
+        canvas.setCanvasColor(QColor('white'))
+        canvas.enableAntiAliasing(True)
+        canvas.setMinimumSize(800, 600)
+        # load a shapefile
+        layer = QgsVectorLayer('test_data' ,'poly', 'ogr')
+        # add the layer to the canvas and zoom to it
+        QgsMapLayerRegistry.instance().addMapLayer(layer)
+        canvas.setLayerSet([QgsMapCanvasLayer(layer)])
+        canvas.setExtent(layer.extent())
+        self.assertIsNotNone(utils.getDestinationCrs(canvas))
+
+    def test_getCanvasSrid(self):
+        crs = QgsCoordinateReferenceSystem()
+        crs.createFromProj4("+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs")
+        self.assertEqual(utils.getCanvasSrid(crs) ,0)
+
+    def test_getRubberBandType_1(self):
+        isPolygon = True
+        self.assertEqual(utils.getRubberBandType(isPolygon),2)
+
+    def test_getRubberBandType_2(self):
+        isPolygon = False
+        self.assertEqual(utils.getRubberBandType(isPolygon),1)
+
+    def test_getNodeQuery(self):
+        args = {'geometry' : 'test_geom','source': 1,'startpoint' : 10,'edge_table':'test_Table','target':100,'endpoint':90}
+        expected_sql=  """
+        WITH node AS (
+            SELECT id::int4,
+                ST_X(test_geom) AS x,
+                ST_Y(test_geom) AS y,
+                test_geom
+                FROM (
+                    SELECT 1::int4 AS id,
+                        ST_StartPoint(ST_GeometryN(test_geom, 1)) AS test_geom
+                        FROM test_Table
+                    UNION
+                    SELECT 100::int4 AS id,
+                        ST_EndPoint(ST_GeometryN(test_geom, 1)) AS test_geom
+                        FROM test_Table
+                ) AS node
+        )""" 
+        self.maxDiff = None
+        geomType = 'ST_MultiLineString'
+        self.assertMultiLineEqual(utils.getNodeQuery(args,geomType),expected_sql)
+
+if __name__ == '__main__':
+    unittest.main()
+
+
+
+
+
+
+
+
+
+    
+
+
+        
+
+    
+
+    
+        
+
+    
+
+        
+
+        
+        
+
+
+
+        
+
+    
+
+        
+        
+
+    

__init__.py

@@ -32,5 +32,5 @@ def icon():
 def qgisMinimumVersion():
     return "1.7"
 def classFactory(iface):
-    from pgRoutingLayer import PgRoutingLayer
-    return PgRoutingLayer(iface)
+    from pgRoutingLayer import pgRoutingLayer
+    return pgRoutingLayer(iface)

connectors/postgis.py

@@ -15,11 +15,15 @@
 System information functions:
 http://www.postgresql.org/docs/8.0/static/functions-info.html
 """
+from __future__ import print_function
+from builtins import str
+from builtins import map
+from qgis.core import QgsDataSourceUri
+from qgis.PyQt.QtCore import QSettings
+from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt.QtWidgets import QInputDialog
 
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
 
-import qgis.core
 
 import psycopg2
 import psycopg2.extensions # for isolation levels
@@ -43,7 +47,7 @@ class TableConstraint(DbConn.TableConstraint):
 
 	def __init__(self, row):
 		self.name, con_type, self.is_defferable, self.is_deffered, keys = row[:5]
-		self.keys = map(int, keys.split(' '))
+		self.keys = list(map(int, keys.split(' ')))
 		self.con_type = TableConstraint.types[con_type]   # convert to enum
 		if self.con_type == TableConstraint.TypeCheck:
 			self.check_src = row[5]
@@ -58,7 +62,7 @@ def __init__(self, row):
 class TableIndex(DbConn.TableIndex):
 	def __init__(self, row):
 		self.name, columns = row
-		self.columns = map(int, columns.split(' '))
+		self.columns = list(map(int, columns.split(' ')))
 
 
 class TableTrigger(DbConn.TableTrigger):
@@ -74,12 +78,12 @@ def __init__(self, row):
 class DbError(DbConn.DbError):
 	def __init__(self, error, query=None):
 		# save error. funny that the variables are in utf8, not 
-		msg = unicode( error.args[0], 'utf-8')
+		msg = str( error.args[0], 'utf-8')
 		if query == None:
 			if hasattr(error, "cursor") and hasattr(error.cursor, "query"):
-				query = unicode(error.cursor.query, 'utf-8')
+				query = str(error.cursor.query, 'utf-8')
 		else:
-			query = unicode(query)
+			query = str(query)
 		DbConn.DbError.__init__(self, msg, query)
 
 
@@ -118,8 +122,8 @@ def connect(self, selected, parent=None):
 		if not settings.contains( "database" ): # non-existent entry?
 			raise DbError( 'there is no defined database connection "%s".' % selected )
 
-		get_value_str = lambda x: unicode(settings.value(x) if Utils.isSIPv2() else settings.value(x).toString())
-		service, host, port, database, username, password = map(get_value_str, ["service", "host", "port", "database", "username", "password"])
+		get_value_str = lambda x: str(settings.value(x) if Utils.isSIPv2() else settings.value(x).toString())
+		service, host, port, database, username, password = list(map(get_value_str, ["service", "host", "port", "database", "username", "password"]))
 
 		# qgis1.5 use 'savePassword' instead of 'save' setting
 		isSave = settings.value("save") if Utils.isSIPv2() else settings.value("save").toBool()
@@ -130,7 +134,7 @@ def connect(self, selected, parent=None):
 
 		settings.endGroup()
 
-		uri = qgis.core.QgsDataSourceURI()
+		uri = qgis.core.QgsDataSourceUri()
 		if service:
 			uri.setConnection(service, database, username, password)
 		else:
@@ -151,7 +155,7 @@ def __init__(self, uri):
 
 		try:
 			self.con = psycopg2.connect(self.con_info())
-		except psycopg2.OperationalError, e:
+		except psycopg2.OperationalError as e:
 			raise DbError(e)
 
 		if not self.dbname:
@@ -722,7 +726,7 @@ def sr_info_for_srid(self, srid):
 			if x is not None:
 				srtext = x.group()
 			return srtext
-		except DbError, e:
+		except DbError as e:
 			return "Unknown"
 
 	def insert_table_row(self, table, values, schema=None, cursor=None):
@@ -788,7 +792,7 @@ def get_named_cursor(self, table=None):
 	def _exec_sql(self, cursor, sql):
 		try:
 			cursor.execute(sql)
-		except psycopg2.Error, e:
+		except psycopg2.Error as e:
 			# do the rollback to avoid a "current transaction aborted, commands ignored" errors
 			self.con.rollback()
 			raise DbError(e)
@@ -804,12 +808,12 @@ def _exec_sql_and_commit(self, sql):
 		#	raise
 
 	def _quote(self, identifier):
-		identifier = unicode(identifier) # make sure it's python unicode string
+		identifier = str(identifier) # make sure it's python unicode string
 		return u'"%s"' % identifier.replace('"', '""')
 
 	def _quote_str(self, txt):
 		""" make the string safe - replace ' with '' """
-		txt = unicode(txt) # make sure it's python unicode string
+		txt = str(txt) # make sure it's python unicode string
 		return txt.replace("'", "''")
 
 	def _table_name(self, schema, table):
@@ -824,25 +828,34 @@ def _table_name(self, schema, table):
 
 	db = GeoDB(host='localhost',dbname='gis',user='gisak',passwd='g')
 
-	print db.list_schemas()
-	print '=========='
+	# fix_print_with_import
+	print(db.list_schemas())
+	# fix_print_with_import
+	print('==========')
 
 	for row in db.list_geotables():
-		print row
+		# fix_print_with_import
+		print(row)
 
-	print '=========='
+	# fix_print_with_import
+	print('==========')
 
 	for row in db.get_table_indexes('trencin'):
-		print row
+		# fix_print_with_import
+		print(row)
 
-	print '=========='
+	# fix_print_with_import
+	print('==========')
 
 	for row in db.get_table_constraints('trencin'):
-		print row
+		# fix_print_with_import
+		print(row)
 
-	print '=========='
+	# fix_print_with_import
+	print('==========')
 
-	print db.get_table_rows('trencin')
+	# fix_print_with_import
+	print(db.get_table_rows('trencin'))
 
 	#for fld in db.get_table_metadata('trencin'):
 	#	print fld