linting

gweatherrouting/__init__.py

@@ -13,4 +13,4 @@
 
 For detail about GNU see <http://www.gnu.org/licenses/>.
 '''
-from . import core
+from . import core

gweatherrouting/gtk/__init__.py

@@ -12,4 +12,4 @@
 GNU General Public License for more details.
 
 For detail about GNU see <http://www.gnu.org/licenses/>.
-'''
+'''

gweatherrouting/gtk/charts/chartlayer.py

@@ -15,7 +15,6 @@
 '''
 from osgeo import ogr
 
-
 class ChartLayer:
 	def __init__(self, path, ctype, settingsManager, metadata = None, enabled = True):
 		self.path = path
@@ -26,7 +25,7 @@ def __init__(self, path, ctype, settingsManager, metadata = None, enabled = True
 
 	def onRegister(self, onTickHandler = None):
 		""" Called when the dataset is registered on the software """
-		pass
+		return
 
 
 	def getBoundingWKTOfCoords(self, p1lat, p1lon, p2lat, p2lon):
@@ -54,4 +53,4 @@ def getBoundingWKT(self, gpsmap):
 
 	def getBoundingGeometry(self, gpsmap):
 		wktbb = self.getBoundingWKT(gpsmap)
-		return ogr.CreateGeometryFromWkt(wktbb)
+		return ogr.CreateGeometryFromWkt(wktbb)

gweatherrouting/gtk/charts/chartmanager.py

@@ -13,17 +13,9 @@
 
 For detail about GNU see <http://www.gnu.org/licenses/>.
 '''
-
-import gi
-import os
-
-from ...core.core import LinePointValidityProvider
-from ...core.storage import DATA_DIR
-from .gshhs import GSHHSAskDownloadDialog, GSHHSDownloadDialog, GSHHSVectorChart, OSMAskDownloadDialog, OSMDownloadDialog
-
 import logging
-from .gdalvectorchart import GDALVectorChart
-from .gdalrasterchart import GDALRasterChart
+import os
+import gi
 
 gi.require_version("Gtk", "3.0")
 try:
@@ -33,6 +25,13 @@
 
 from gi.repository import Gtk, GObject, OsmGpsMap, Gdk
 
+from ...core.core import LinePointValidityProvider
+from ...core.storage import DATA_DIR
+from .gshhs import GSHHSAskDownloadDialog, GSHHSDownloadDialog, GSHHSVectorChart, OSMAskDownloadDialog, OSMDownloadDialog
+
+from .gdalvectorchart import GDALVectorChart
+from .gdalrasterchart import GDALRasterChart
+
 logger = logging.getLogger ('gweatherrouting')
 
 class ChartManager(GObject.GObject, OsmGpsMap.MapLayer):
@@ -92,7 +91,7 @@ def f():
 		if not self.osmLayer:
 			logger.info("OSM file not found, open a dialog asking for download")
 
-			def f():
+			def ff():
 				Gdk.threads_enter()
 				d = OSMAskDownloadDialog(parent)
 				r = d.run()
@@ -106,7 +105,7 @@ def f():
 
 				Gdk.threads_leave()
 
-			GObject.timeout_add(10, f)
+			GObject.timeout_add(10, ff)
 
 	def loadVectorLayer(self, path, metadata = None, enabled = True):
 		logger.info("Loading vector chart %s" % path)

gweatherrouting/gtk/charts/cm93driver.py

@@ -16,18 +16,18 @@
 # https://github.com/OpenCPN/OpenCPN/blob/master/src/cm93.cpp
 
 def loadCM93Dictionary(path):
-    with open(path, 'r') as f:
-        d = f.read().split('\n')
-        dd = list(map(lambda x: x.split('|'), d))
-        return dict (dd)
+	with open(path, 'r') as f:
+		d = f.read().split('\n')
+		dd = list(map(lambda x: x.split('|'), d))
+		return dict (dd)
 
 class CM93Driver:
-    def __init__(self):
-        pass 
+	def __init__(self):
+		return
 
-    def Open(self, path):
-        attrDict = loadCM93Dictionary(path + 'CM93ATTR.DIC')
-        objDict = loadCM93Dictionary(path + 'CM93OBJ.DIC')
-        limitsDict = loadCM93Dictionary(path + 'LIMITS.DIC')
+	def Open(self, path):
+		attrDict = loadCM93Dictionary(path + 'CM93ATTR.DIC')
+		objDict = loadCM93Dictionary(path + 'CM93OBJ.DIC')
+		limitsDict = loadCM93Dictionary(path + 'LIMITS.DIC')
 
-        return None
+		return None

gweatherrouting/gtk/charts/gdalrasterchart.py

@@ -15,16 +15,17 @@
 """
 
 import logging
-import gi
 import time
-import cairo
 import multiprocessing
-import numpy as np
 from os import listdir
 from os.path import isfile, join
-from osgeo import  osr, gdal
 from threading import Thread, Lock
 
+import gi
+import cairo
+import numpy as np
+from osgeo import  osr, gdal
+
 gi.require_version("Gtk", "3.0")
 try:
 	gi.require_version('OsmGpsMap', '1.2')
@@ -72,13 +73,14 @@ def datasetBBox(dataset):
 	originbr = transform.TransformPoint(minx,miny) 
 
 	return [origin, originbr]
-	
+
 class GDALSingleRasterChart:
+	@staticmethod
 	def getFileInfo(path):
 		dataset = gdal.Open(path, gdal.GA_ReadOnly)
 
 		if not dataset:
-			raise ("Unable to open raster chart %s" % path)
+			raise Exception ("Unable to open raster chart %s" % path)
 
 		bbox = datasetBBox(dataset)
 
@@ -89,7 +91,7 @@ def __init__(self, path):
 		dataset = gdal.Open(path, gdal.GA_ReadOnly)
 
 		if not dataset:
-			raise ("Unable to open raster chart %s" % path)
+			raise Exception ("Unable to open raster chart %s" % path)
 
 		# print("Driver: {}/{}".format(dataset.GetDriver().ShortName,
 		# 					dataset.GetDriver().LongName))
@@ -111,7 +113,8 @@ def worker(i, return_dict):
 		p.start()
 		p.join()
 		surface, bandXSize, bandYSize = return_dict['surface']
-		surf = cairo.ImageSurface.create_for_data(surface, cairo.Format.ARGB32, bandXSize, bandYSize, cairo.Format.RGB24.stride_for_width(bandXSize))
+		surf = cairo.ImageSurface.create_for_data(surface, cairo.Format.ARGB32, bandXSize, 
+			bandYSize, cairo.Format.RGB24.stride_for_width(bandXSize))
 		self.surface = surf
 
 	def bandToSurface(self, i):
@@ -124,7 +127,7 @@ def bandToSurface(self, i):
 
 		colors = {0: 0x00000000}
 		ct = band.GetRasterColorTable()
-		
+
 		for x in range(int(min), int(max) + 1):
 			try: 
 				c = ct.GetColorEntry(x)
@@ -206,7 +209,7 @@ def loadRaster(self, gpsmap, path):
 			gpsmap.queue_draw()
 			Gdk.threads_leave()
 			self.lastRasters.append(r)
-		
+
 	def do_draw(self, gpsmap, cr):
 		p1, p2 = gpsmap.get_bbox()
 		p1lat, p1lon = p1.get_degrees()
@@ -256,7 +259,7 @@ def do_draw(self, gpsmap, cr):
 				if self.cached[x[0]] != 'loading':
 					rasters.append(self.cached[x[0]])
 				continue
-			
+
 			self.cached[x[0]] = 'loading'
 
 			t = Thread(target=self.loadRaster, args=(gpsmap, x[0],))
@@ -266,7 +269,7 @@ def do_draw(self, gpsmap, cr):
 		# Save and render
 		self.lastRect = [p1lat, p1lon, p2lat, p2lon]
 		self.lastRasters = rasters
-		
+
 		# print ('rendering',len(rasters))
 		for x in rasters:
 			x.do_draw(gpsmap, cr)
@@ -282,7 +285,7 @@ def do_draw(self, gpsmap, cr):
 			maxRLat = max(bb[0][0], bb[1][0])
 			minRLon = min(bb[0][1], bb[1][1])
 			maxRLon = max(bb[0][1], bb[1][1])
-			
+
 			xx, yy = gpsmap.convert_geographic_to_screen(
 				OsmGpsMap.MapPoint.new_degrees(minRLat, minRLon)
 			)

gweatherrouting/gtk/charts/gdalvectorchart.py

@@ -13,41 +13,41 @@
 
 For detail about GNU see <http://www.gnu.org/licenses/>.
 """
+from osgeo import ogr
 
 from gweatherrouting.gtk.charts.cm93driver import CM93Driver
 from gweatherrouting.gtk.charts.vectordrawer.osmchartdrawer import OSMChartDrawer
 from .vectordrawer import SimpleChartDrawer
 from .vectordrawer import S57ChartDrawer
 from .vectordrawer import CM93ChartDrawer
-from osgeo import ogr
 
 from .chartlayer import ChartLayer
 
 class GDALVectorChart(ChartLayer):
 	def __init__(self, path, settingsManager, metadata = None, enabled = True):
 		super().__init__(path, 'vector', settingsManager, metadata, enabled)
 
-		self.drawer = None 
+		self.drawer = None
 
 		drvName = None
 		if path.find("geojson") != -1:
 			drvName = "GeoJSON"
-			self.drawer = SimpleChartDrawer()
+			self.drawer = SimpleChartDrawer(settingsManager)
 		elif path.find("shp") != -1:
 			drvName = "ESRI Shapefile"
-			self.drawer = SimpleChartDrawer()
+			self.drawer = SimpleChartDrawer(settingsManager)
 		elif path.find (".000") != -1:
 			drvName = "S57"
-			self.drawer = S57ChartDrawer()
+			self.drawer = S57ChartDrawer(settingsManager)
 		elif path.find ("Cm93") != -1:
 			drvName = "CM93"
-			self.drawer = CM93ChartDrawer()
+			self.drawer = CM93ChartDrawer(settingsManager)
 		elif path.find ("osm") != -1 or path.find ("pbf") != -1:
 			drvName = "OSM"
 			self.drawer = OSMChartDrawer(self.settingsManager)
 
 		if drvName is None and self.drawer is None:
-			raise ("Invalid format")
+			raise Exception ("Invalid format")
 
 		if drvName == 'CM93':
 			drv = CM93Driver()
@@ -56,7 +56,7 @@ def __init__(self, path, settingsManager, metadata = None, enabled = True):
 		self.vectorFile = drv.Open(path)
 
 		if self.vectorFile is None:
-			raise ("Unable to open vector map %s" % path)
+			raise Exception ("Unable to open vector map %s" % path)
 
 	def onRegister(self, onTickHandler = None):
 		pass
@@ -73,4 +73,3 @@ def do_busy(self):
 
 	def do_button_press(self, gpsmap, gdkeventbutton):
 		return False
-