Fix setup.py dependency, fix rf_rasterize signature regression in unit test

Signed-off-by: Jason T. Brown <[email protected]>

Author: vpipkt

pyrasterframes/src/main/python/setup.py

@@ -47,16 +47,6 @@ def _divided(msg):
     return divider + '\n' + msg + '\n' + divider
 
 
-from pweave import PwebPandocFormatter
-
-class PegdownMarkdownFormatter(PwebPandocFormatter):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    # Pegdown doesn't support the width and label options.
-    def make_figure_string(self, figname, width, label, caption=""):
-        return "![%s](%s)" % (caption, figname)
-
 class PweaveDocs(distutils.cmd.Command):
     """A custom command to run documentation scripts through pweave."""
     description = 'Pweave PyRasterFrames documentation scripts'
@@ -67,6 +57,16 @@ class PweaveDocs(distutils.cmd.Command):
         ('quick=', 'q', 'Check to see if the source file is newer than existing output before building. Defaults to `False`.')
     ]
 
+    from pweave import PwebPandocFormatter
+
+    class PegdownMarkdownFormatter(PwebPandocFormatter):
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+
+        # Pegdown doesn't support the width and label options.
+        def make_figure_string(self, figname, width, label, caption=""):
+            return "![%s](%s)" % (caption, figname)
+
     def initialize_options(self):
         """Set default values for options."""
         # Each user option must be listed here with their default value.

pyrasterframes/src/main/python/tests/VectorTypesTests.py

@@ -97,7 +97,7 @@ def some_point(g):
             pandas_df_out.poly_len.values
         )
 
-    def test_rasterize(self):
+    def test_geometry_udf(self):
         from geomesa_pyspark.types import PolygonUDT
         # simple test that raster contents are not invalid
 
@@ -117,12 +117,25 @@ def area(g):
         area_result = area.collect()
         self.assertTrue(all([r[0] for r in area_result]))
 
-        cols = 194
-        rows = 250
-        with_raster = with_poly.withColumn('rasterized', rf_rasterize('poly', 'geometry', lit(16), cols, rows))
-        # expect a 4 by 4 cell
+    def test_rasterize(self):
+        from geomesa_pyspark.types import PolygonUDT
+
+        @udf(PolygonUDT())
+        def buffer(g, d):
+            return g.buffer(d)
+
+        # start with known polygon, the tile extents, **negative buffered**  by 10 cells
+        buf_cells = 10
+        with_poly = self.rf.withColumn('poly', buffer(self.rf.geometry, lit(-15 * buf_cells)))  # cell res is 15x15
+
+        # rasterize value 16 into buffer shape.
+        cols = 194  # from dims of tile
+        rows = 250  # from dims of tile
+        with_raster = with_poly.withColumn('rasterized',
+                                          rf_rasterize('poly', 'geometry', lit(16), lit(cols), lit(rows)))
         result = with_raster.select(rf_tile_sum(rf_local_equal_int(with_raster.rasterized, 16)),
                                     rf_tile_sum(with_raster.rasterized))
+        #
         expected_burned_in_cells = (cols - 2 * buf_cells) * (rows - 2 * buf_cells)
         self.assertEqual(result.first()[0], float(expected_burned_in_cells))
         self.assertEqual(result.first()[1], 16. * expected_burned_in_cells)