[Needs review] add zoom range "min..max" options for burn + other changes

.travis.yml

@@ -21,7 +21,7 @@ env:
     - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels
 
 python:
-  - "2.7"
+  - "3.6"
 
 addons:
   apt:

supermercado/edge_finder.py

@@ -23,7 +23,7 @@ def findedges(inputtiles, parsenames):
     # Using the indices to roll + stack the array, find the minimum along the rolled / stacked axis
     xys_edge = (np.min(np.dstack((
         np.roll(np.roll(burn, i[0], 0), i[1], 1) for i in idxs
-        )), axis=2) - burn)
+        )), axis=2) ^ burn)
 
     # Set missed non-tiles to False
     xys_edge[burn == False] = False

supermercado/scripts/cli.py

@@ -1,4 +1,8 @@
-import click, json
+import re
+import json
+import itertools
+
+import click
 import cligj
 from supermercado import edge_finder, uniontiles, burntiles, super_utils
 
@@ -7,7 +11,8 @@
 def cli():
     pass
 
-@click.command('edges')
+
+@cli.command('edges', short_help="Return edge tiles for a stream of [<x>, <y>, <z>] tiles.")
 @click.argument('inputtiles', default='-', required=False)
 @click.option('--parsenames', is_flag=True)
 def edges(inputtiles, parsenames):
@@ -25,9 +30,8 @@ def edges(inputtiles, parsenames):
     for t in tiles:
         click.echo(t.tolist())
 
-cli.add_command(edges)
 
-@click.command('union')
+@cli.command('union', short_help="Returns the unioned shape of a stream of [<x>, <y>, <z>] tiles")
 @click.argument('inputtiles', default='-', required=False)
 @click.option('--parsenames', is_flag=True)
 def union(inputtiles, parsenames):
@@ -42,22 +46,43 @@ def union(inputtiles, parsenames):
     for u in unioned:
         click.echo(json.dumps(u))
 
-cli.add_command(union)
 
+class zoomCustomType(click.ParamType):
+    """Custom zoom type."""
+
+    name = "zoom"
+
+    def convert(self, value, param, ctx):
+        """Validate and parse band index."""
+        try:
+            assert re.match(r"^[0-9]+(..[0-9]+)?$", value)
+            zooms = list(map(int, value.split("..")))
+            assert all(z > 0 for z in zooms)
+            return min(zooms), max(zooms)
+
+        except (AssertionError):
+            raise click.ClickException(
+                "zoom must be a integer or a 'min..max' string "
+                "representing a zoom range, e.g. 9..12"
+            )
 
-@click.command('burn')
+
+@cli.command('burn')
 @cligj.features_in_arg
 @cligj.sequence_opt
-@click.argument('zoom', type=int)
+@click.argument(
+    'zoom',
+    type=zoomCustomType()
+)
 def burn(features, sequence, zoom):
     """
     Burn a stream of GeoJSONs into a output stream of the tiles they intersect for a given zoom.
     """
     features = [f for f in super_utils.filter_polygons(features)]
 
-    tiles = burntiles.burn(features, zoom)
-    for t in tiles:
-        click.echo(t.tolist())
+    tiles = (
+        burntiles.burn(features, zoom) for zoom in range(zoom[0], zoom[1] + 1)
+    )
 
-
-cli.add_command(burn)
+    for t in itertools.chain.from_iterable(tiles):
+        click.echo(t.tolist())