Merge pull request calvinmetcalf#20 from calvinmetcalf/scw-python3

Further Python 3 + testing updates

setup.py

@@ -5,5 +5,5 @@
     version="0.1.0",
     license="BSD",
     packages=find_packages(),
-    test_suite = 'test.topojson_test'
+    test_suite="tests"
 )

tests/__init__.py

@@ -0,0 +1 @@
+from .topojson_test import TestTopojson

tests/data/square.geojson

@@ -0,0 +1,21 @@
+{
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "description": "A 20°x20° box surrounding Null Island."
+            },
+            "geometry": {
+                "type": "Polygon",
+                "coordinates": [[
+                    [-10, 10],
+                    [ 10, 10],
+                    [ 10, -10],
+                    [-10, -10],
+                    [-10, 10]
+                ]]
+            }
+        }
+    ]
+}

tests/topojson_test.py

@@ -0,0 +1,15 @@
+import json
+import unittest
+
+from topojson.conversion import convert
+
+
+class TestTopojson(unittest.TestCase):
+
+    def setUp(self):
+        with open("tests/data/square.geojson") as f:
+            self.square_geojson = json.load(f)
+
+    def test_convert_geojson_to_topojson(self):
+        tj = convert(self.square_geojson)
+        self.assertEqual(tj['type'], 'Topology')

topojson/coordinatesystems.py

@@ -1,4 +1,5 @@
 # coding=utf8
+from __future__ import division
 from math import sqrt, pi, cos, sin, atan2, tan, atan, asin
 
 PI4 = pi / 4
@@ -115,4 +116,4 @@ def distance(self, x0, y0, x1, y1):
         return 2.0 * asin(sqrt(self.haversin(y1 - y0) + cos(y0) * cos(y1) * self.haversin(x1 - x0)))
 
 
-systems = {'cartesian': Cartesian(), 'spherical': Spherical()}
+systems = {'cartesian': Cartesian(), 'spherical': Spherical()}

topojson/hashtable.py

@@ -1,5 +1,7 @@
+from __future__ import division
 from math import ceil, log
 
+
 def hasher(size):
     mask = int(size) - 1
 

topojson/simplify.py

@@ -1,4 +1,5 @@
 #from https://github.com/omarestrella/simplify.py
+from __future__ import division
 from .mytypes import Types
 
 def getSquareDistance(p1, p2):

topojson/topology.py

@@ -1,4 +1,5 @@
 # coding=utf8
+from __future__ import division
 from .mytypes import Types
 from .stitchpoles import stitch
 from .coordinatesystems import systems