mavproxy_map: flake8 correctness

not 100% yet, these are the easy bits

Author: peterbarker

MAVProxy/modules/mavproxy_map/GAreader.py

@@ -2,12 +2,12 @@
 '''
 Module to read DTM files published by Geoscience Australia
 Written by Stephen Dade ([email protected]
-'''
 
-import os
-import sys
+AP_FLAKE8_CLEAN
+'''
 
 import numpy
+import os
 
 
 class ERMap:
@@ -37,10 +37,10 @@ def read_ermapper(self, ifile):
         nroflines = int(self.header['nroflines'])
         nrofcellsperlines = int(self.header['nrofcellsperline'])
         self.data = self.read_ermapper_data(data_file, offset=int(self.header['headeroffset']))
-        self.data = numpy.reshape(self.data,(nroflines,nrofcellsperlines))
+        self.data = numpy.reshape(self.data, (nroflines, nrofcellsperlines))
 
-        longy =  numpy.fromstring(self.getHeaderParam('longitude'), sep=':')
-        latty =  numpy.fromstring(self.getHeaderParam('latitude'), sep=':')
+        longy = numpy.fromstring(self.getHeaderParam('longitude'), sep=':')
+        latty = numpy.fromstring(self.getHeaderParam('latitude'), sep=':')
 
         self.deltalatitude = float(self.header['ydimension'])
         self.deltalongitude = float(self.header['xdimension'])
@@ -62,32 +62,32 @@ def read_ermapper_header(self, ifile):
         # function for reading an ERMapper header from file
         header = {}
 
-        fid = open(ifile,'rt')
+        fid = open(ifile, 'rt')
         header_string = fid.readlines()
         fid.close()
 
         for line in header_string:
             if line.find('=') > 0:
                 tmp_string = line.strip().split('=')
-                header[tmp_string[0].strip().lower()]= tmp_string[1].strip()
+                header[tmp_string[0].strip().lower()] = tmp_string[1].strip()
 
         return header
 
-    def read_ermapper_data(self, ifile, data_format = numpy.float32, offset=0):
+    def read_ermapper_data(self, ifile, data_format=numpy.float32, offset=0):
         # open input file in a binary format and read the input string
-        fid = open(ifile,'rb')
+        fid = open(ifile, 'rb')
         if offset != 0:
             fid.seek(offset)
         input_string = fid.read()
         fid.close()
 
         # convert input string to required format (Note default format is numpy.float32)
-        grid_as_float = numpy.fromstring(input_string,data_format)
+        grid_as_float = numpy.fromstring(input_string, data_format)
         return grid_as_float
 
     def getHeaderParam(self, key):
-         '''Find a parameter in the associated .ers file'''
-         return self.header[key]
+        '''Find a parameter in the associated .ers file'''
+        return self.header[key]
 
     def printBoundingBox(self):
         '''Print the bounding box that this DEM covers'''
@@ -113,7 +113,7 @@ def getPercentBlank(self):
 
     def getAltitudeAtPoint(self, latty, longy):
         '''Return the altitude at a particular long/lat'''
-        #check the bounds
+        # check the bounds
         if self.startlongitude > 0 and (longy < self.startlongitude or longy > self.endlongitude):
             return -1
         if self.startlongitude < 0 and (longy > self.startlongitude or longy < self.endlongitude):
@@ -126,20 +126,20 @@ def getAltitudeAtPoint(self, latty, longy):
         x = numpy.abs((latty - self.startlatitude)/self.deltalatitude)
         y = numpy.abs((longy - self.startlongitude)/self.deltalongitude)
 
-        #do some interpolation
+        # do some interpolation
         # print("x,y", x, y)
         x_int = int(x)
         x_frac = x - int(x)
         y_int = int(y)
         y_frac = y - int(y)
-        #print("frac", x_int, x_frac, y_int, y_frac)
+        # print("frac", x_int, x_frac, y_int, y_frac)
         value00 = self.data[x_int, y_int]
         value10 = self.data[x_int+1, y_int]
         value01 = self.data[x_int, y_int+1]
         value11 = self.data[x_int+1, y_int+1]
-        #print("values ", value00, value10, value01, value11)
+        # print("values ", value00, value10, value01, value11)
 
-        #check for null values
+        # check for null values
         if value00 == -99999:
             value00 = 0
         if value10 == -99999:
@@ -151,7 +151,7 @@ def getAltitudeAtPoint(self, latty, longy):
 
         value1 = self._avg(value00, value10, x_frac)
         value2 = self._avg(value01, value11, x_frac)
-        value  = self._avg(value1,  value2, y_frac)
+        value  = self._avg(value1, value2, y_frac)
 
         return value
 
@@ -167,20 +167,19 @@ def _avg(value1, value2, weight):
         return value2 * weight + value1 * (1 - weight)
 
 
-
 if __name__ == '__main__':
 
     print("./Canberra/GSNSW_P756demg")
     mappy = ERMap()
     mappy.read_ermapper(os.path.join(os.environ['HOME'], './Documents/Elevation/Canberra/GSNSW_P756demg'))
 
-    #print some header data
+    # print some header data
     mappy.printBoundingBox()
 
-    #get a measure of data quality
-    #mappy.getPercentBlank()
+    # get a measure of data quality
+    # mappy.getPercentBlank()
 
-    #test the altitude (around Canberra):
+    # test the altitude (around Canberra):
     alt = mappy.getAltitudeAtPoint(-35.274411, 149.097504)
     print("Alt at (-35.274411, 149.097504) is 807m (Google) or " + str(alt))
     alt = mappy.getAltitudeAtPoint(-35.239648, 149.126118)
@@ -197,7 +196,3 @@ def _avg(value1, value2, weight):
     print("Alt at (-35.045126, 149.257482) is 577m (Google) or " + str(alt))
     alt = mappy.getAltitudeAtPoint(-35.564044, 149.177657)
     print("Alt at (-35.564044, 149.177657) is 1113m (Google) or " + str(alt))
-
-
-
-