Merge pull request #128 from mapbox/fix-estimate-area-stream

Validate before filtering so that estimate-area works with multipolygons

Author: e-n-f

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# 1.6.0 (2021-02-16)
+- Fix problem that prevented estimate-area from working for MultiPolygons
+- Improve documentation for delete-source and upload-source
+
 # 1.5.1 (2020-10-19)
 - Update README for estimate-area
 

mapbox_tilesets/__init__.py

@@ -1,3 +1,3 @@
 """mapbox_tilesets package"""
 
-__version__ = "1.5.1"
+__version__ = "1.6.0"

mapbox_tilesets/scripts/cli.py

@@ -707,6 +707,12 @@ def list_sources(username, token=None):
         raise errors.TilesetsError(r.text)
 
 
+def validate_stream(features):
+    for feature in features:
+        utils.validate_geojson(feature)
+        yield feature
+
+
 @cli.command("estimate-area")
 @cligj.features_in_arg
 @click.option(
@@ -745,23 +751,20 @@ def estimate_area(features, precision, no_validation=False, force_1cm=False):
             "The --force-1cm flag is enabled but the precision is not 1cm."
         )
 
-    # builtins.list because there is a list command in the cli & will thrown an error
     try:
+        # expect users to bypass source validation when users rerun command and their features passed validation previously
+        if not no_validation:
+            features = validate_stream(features)
+        # builtins.list because there is a list command in the cli & will thrown an error
+        # It is a list at all because calculate_tiles_area does not work with a stream
         features = builtins.list(filter_features(features))
     except (ValueError, json.decoder.JSONDecodeError):
         raise errors.TilesetsError(
             "Error with feature parsing. Ensure that feature inputs are valid and formatted correctly. Try 'tilesets estimate-area --help' for help."
         )
-    except Exception:
-        raise errors.TilesetsError("Error with feature filtering.")
-
-    # expect users to bypass source validation when users rerun command and their features passed validation previously
-    if not no_validation:
-        for feature in features:
-            utils.validate_geojson(feature)
 
     area = utils.calculate_tiles_area(features, precision)
-    area = str(round(area))
+    area = str(int(round(area)))
 
     click.echo(
         json.dumps(

tests/fixtures/twostates.ldgeojson

@@ -102,6 +102,28 @@ def test_cli_estimate_area_valid_features_files_and_valid_feature_input():
     assert validated_result.output == output
 
 
+def test_cli_estimate_area_large_valid_features_files_and_valid_feature_input():
+    output = '{"km2": "1390828", "precision": "10m", "pricing_docs": "For more information, visit https://www.mapbox.com/pricing/#tilesets"}\n'
+    runner = CliRunner()
+    validated_result = runner.invoke(
+        estimate_area,
+        ["tests/fixtures/twostates.ldgeojson", "-p", "10m"],
+    )
+    assert validated_result.exit_code == 0
+    assert validated_result.output == output
+
+
+def test_cli_estimate_area_large_valid_features_files_and_valid_feature_input_no_validation():
+    output = '{"km2": "1390828", "precision": "10m", "pricing_docs": "For more information, visit https://www.mapbox.com/pricing/#tilesets"}\n'
+    runner = CliRunner()
+    validated_result = runner.invoke(
+        estimate_area,
+        ["tests/fixtures/twostates.ldgeojson", "-p", "10m", "--no-validation"],
+    )
+    assert validated_result.exit_code == 0
+    assert validated_result.output == output
+
+
 def test_cli_estimate_area_valid_features_files_and_1cm_precision():
     output = '{"km2": "0", "precision": "1cm", "pricing_docs": "For more information, visit https://www.mapbox.com/pricing/#tilesets"}\n'
     runner = CliRunner()