removing pyproj from fauxgeo

wbierbower · May 28, 2015 · 8722686 · 8722686
1 parent 0c59bff
commit 8722686
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/fauxgeo/raster.py b/fauxgeo/raster.py
@@ -14,7 +14,7 @@
 # from affine import Affine
 from shapely.geometry import Polygon
 import shapely
-import pyproj
+# import pyproj
 import PIL
 import pygeoprocessing as pygeo
 
@@ -871,21 +871,21 @@ def reproject(self, proj, resample_method, pixel_size=None):
 
         return Raster.from_tempfile(dataset_out_uri)
 
-    def reproject_georef_point(self, x, y, dst_proj):
-        reproj = functools.partial(
-            pyproj.transform,
-            pyproj.Proj(init="epsg:%i" % self.get_projection()),
-            pyproj.Proj(init="epsg:%i" % dst_proj))
+    # def reproject_georef_point(self, x, y, dst_proj):
+    #     reproj = functools.partial(
+    #         pyproj.transform,
+    #         pyproj.Proj(init="epsg:%i" % self.get_projection()),
+    #         pyproj.Proj(init="epsg:%i" % dst_proj))
 
-        return reproj(x, y)
+    #     return reproj(x, y)
 
-    def reproject_shapely_object(self, shapely_object, dst_proj):
-        reproj = functools.partial(
-            pyproj.transform,
-            pyproj.Proj(init="epsg:%i" % self.get_projection()),
-            pyproj.Proj(init="epsg:%i" % dst_proj))
+    # def reproject_shapely_object(self, shapely_object, dst_proj):
+    #     reproj = functools.partial(
+    #         pyproj.transform,
+    #         pyproj.Proj(init="epsg:%i" % self.get_projection()),
+    #         pyproj.Proj(init="epsg:%i" % dst_proj))
 
-        return shapely.ops.transform(reproj, shapely_object)
+    #     return shapely.ops.transform(reproj, shapely_object)
 
     def resize_pixels(self, pixel_size, resample_method):
         bounding_box = self.get_bounding_box()

diff --git a/requirements.txt b/requirements.txt
@@ -3,5 +3,4 @@ numpy
 gdal
 pygeoprocessing
 shapely
-pyproj
 pillow
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
     "shapely",
     "pygeoprocessing",
     "wheel",
-    "pyproj",
+    # "pyproj",
     "pillow"
 ]
 
@@ -30,7 +30,7 @@
     "shapely",
     "pygeoprocessing",
     "wheel",
-    "pyproj",
+    # "pyproj",
     "pillow",
     "nose",
     "coverage"

diff --git a/tests/test_raster.py b/tests/test_raster.py
@@ -484,6 +484,17 @@ def test_set_slice(self):
         raster[1:9:2, 1:9:2] = 2
         assert(raster[1][3] == 2)
 
+    def test_set_slice(self):
+        raster = self.factory.alternating(0, 1)
+        raster[1:3, 1:3] = (np.ones((2, 2)) * 5)
+        assert(raster[1][1] == 5)
+
+    def test_reclass_slice(self):
+        raster = self.factory.alternating(0, 1)
+        block = raster[1:3, 1:3]
+        block[block == 1] = 0
+        raster[1:3, 1:3] = block
+        assert(raster[1][1] == 0)
 
 if __name__ == '__main__':
     unittest.main()