Merge pull request #76 from AndreMiras/feature/pep8_fixes

Various PEP8 fixes and test against py36

Author: AndreMiras

examples/clustered_geojson.py

@@ -2,7 +2,7 @@
 import sys
 
 if __name__ == '__main__' and __package__ is None:
-    from os import sys, path
+    from os import path
     sys.path.append(path.dirname(path.dirname(path.abspath(__file__))))
 
 from mapview import MapView, MapMarker

examples/map_with_marker_popup.py

@@ -3,7 +3,7 @@
 from kivy.lang import Builder
 
 if __name__ == '__main__' and __package__ is None:
-    from os import sys, path
+    from os import path
     sys.path.append(path.dirname(path.dirname(path.abspath(__file__))))
 
 import mapview

examples/simple_geojson.py

@@ -2,7 +2,7 @@
 import sys
 
 if __name__ == '__main__' and __package__ is None:
-    from os import sys, path
+    from os import path
     sys.path.append(path.dirname(path.dirname(path.abspath(__file__))))
 
 from mapview import MapView, MapMarker

examples/simple_map.py

@@ -2,7 +2,7 @@
 from kivy.base import runTouchApp
 
 if __name__ == '__main__' and __package__ is None:
-    from os import sys, path
+    from os import path
     sys.path.append(path.dirname(path.dirname(path.abspath(__file__))))
 
 from mapview import MapView, MapSource

examples/simple_mbtiles.py

@@ -12,7 +12,7 @@
 from kivy.base import runTouchApp
 
 if __name__ == '__main__' and __package__ is None:
-    from os import sys, path
+    from os import path
     sys.path.append(path.dirname(path.dirname(path.abspath(__file__))))
 from mapview import MapView
 from mapview.mbtsource import MBTilesMapSource

mapview/clustered_marker_layer.py

@@ -195,7 +195,6 @@ def _within(self, ids, coords, qx, qy, r, node_size):
                         result.append(ids[i])
                 continue
 
-
             m = int(floor((left + right) / 2.))
 
             x = coords[2 * m]
@@ -262,6 +261,7 @@ def __repr__(self):
         return "<Marker lon={} lat={} source={}>".format(self.lon, self.lat,
                                                          self.source)
 
+
 class SuperCluster(object):
     """Port of supercluster from mapbox in pure python
     """
@@ -353,8 +353,10 @@ def _cluster(self, points, zoom):
                     num_points2 = 1
                     if isinstance(b, Cluster):
                         num_points2 = b.num_points
-                    b.zoom = zoom # save the zoom (so it doesn't get processed twice)
-                    wx += b.x * num_points2 # accumulate coordinates for calculating weighted center
+                    # save the zoom (so it doesn't get processed twice)
+                    b.zoom = zoom
+                    #  accumulate coordinates for calculating weighted center
+                    wx += b.x * num_points2
                     wy += b.y * num_points2
                     num_points += num_points2
                     b.parent_id = i
@@ -372,6 +374,7 @@ class ClusterMapMarker(MapMarker):
     cluster = ObjectProperty()
     num_points = NumericProperty()
     text_color = ListProperty([.1, .1, .1, 1])
+
     def on_cluster(self, instance, cluster):
         self.num_points = cluster.num_points
 

mapview/geojson.py

@@ -27,7 +27,6 @@
 from kivy.graphics.tesselator import Tesselator, WINDING_ODD, TYPE_POLYGONS
 from kivy.utils import get_color_from_hex
 from kivy.metrics import dp
-from kivy.utils import get_color_from_hex
 from mapview import CACHE_DIR
 from mapview.view import MapLayer
 from mapview.downloader import Downloader

mapview/mbtsource.py

@@ -75,7 +75,7 @@ def _load_tile(self, tile):
         # no-file loading
         try:
             data = io.BytesIO(row[0])
-        except:
+        except Exception:
             # android issue, "buffer" does not have the buffer interface
             # ie row[0] buffer is not compatible with BytesIO on Android??
             data = io.BytesIO(bytes(row[0]))

mapview/source.py

@@ -30,11 +30,11 @@ class MapSource(object):
         "thunderforest-transport": (0, 0, 19, "http://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png", attribution_thunderforest),
         "thunderforest-landscape": (0, 0, 19, "http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png", attribution_thunderforest),
         "thunderforest-outdoors": (0, 0, 19, "http://{s}.tile.thunderforest.com/outdoors/{z}/{x}/{y}.png", attribution_thunderforest),
-        
+
         # no longer available
         #"mapquest-osm": (0, 0, 19, "http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpeg", "Tiles Courtesy of Mapquest", {"subdomains": "1234", "image_ext": "jpeg"}),
         #"mapquest-aerial": (0, 0, 19, "http://oatile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpeg", "Tiles Courtesy of Mapquest", {"subdomains": "1234", "image_ext": "jpeg"}),
-        
+
         # more to add with
         # https://github.com/leaflet-extras/leaflet-providers/blob/master/leaflet-providers.js
         # not working ?
@@ -43,11 +43,11 @@ class MapSource(object):
     }
 
     def __init__(self,
-        url="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
-        cache_key=None, min_zoom=0, max_zoom=19, tile_size=256,
-        image_ext="png",
-        attribution="© OpenStreetMap contributors",
-        subdomains="abc", **kwargs):
+            url="http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+            cache_key=None, min_zoom=0, max_zoom=19, tile_size=256,
+            image_ext="png",
+            attribution="© OpenStreetMap contributors",
+            subdomains="abc", **kwargs):
         super(MapSource, self).__init__()
         if cache_key is None:
             # possible cache hit, but very unlikely
@@ -91,7 +91,7 @@ def get_y(self, zoom, lat):
         """
         lat = clamp(-lat, MIN_LATITUDE, MAX_LATITUDE)
         lat = lat * pi / 180.
-        return ((1.0 - log(tan(lat) + 1.0 / cos(lat)) / pi) / \
+        return ((1.0 - log(tan(lat) + 1.0 / cos(lat)) / pi) /
             2. * pow(2., zoom)) * self.dp_tile_size
 
     def get_lon(self, zoom, x):

mapview/types.py

@@ -6,6 +6,7 @@
 
 Coordinate = namedtuple("Coordinate", ["lat", "lon"])
 
+
 class Bbox(tuple):
     def collide(self, *args):
         if isinstance(args[0], Coordinate):