merge in master

Author: dnomadb

.pre-commit-config.yaml

@@ -2,13 +2,13 @@ repos:
     -
         repo: 'https://github.com/ambv/black'
         # 18.6b1
-        rev: stable
+        rev: 20.8b1
         hooks:
             - id: black
               args: ['--safe']
     -
-        repo: 'https://github.com/pre-commit/pre-commit-hooks'
-        rev: v2.0.0
+        repo: 'https://gitlab.com/pycqa/flake8'
+        rev: 3.9.0
         hooks:
             - id: flake8
               args: [

CHANGELOG.md

@@ -1,8 +1,17 @@
 # Unreleased
 
-# 1.5.2
+=======
+
+# 1.7.1 (2021-04-16)
 - Switch to codecov python module
 
+# 1.7.0 (2021-04-02)
+- Update `tilesets publish` success message to include link to studio.mapbox.com/tilesets/* endpoint and include `tilesets job` command to view the status.
+
+# 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
 

README.md

@@ -40,7 +40,7 @@ export MAPBOX_ACCESS_TOKEN=my.token
   * *deprecated* [`add-source`](#deprecated-add-source)
   * [`validate-source`](#validate-source)
   * [`view-source`](#view-source)
-  * [`list-sources`](#list-source)
+  * [`list-sources`](#list-sources)
   * [`delete-source`](#delete-source)
   * [`estimate-area`](#estimate-area)
 * Recipes
@@ -61,11 +61,13 @@ export MAPBOX_ACCESS_TOKEN=my.token
 ### upload-source
 
 ```shell
-tilesets upload-source <username> <id> <file>
+tilesets upload-source <username> <source_id> <file>
 ```
 
 Uploads GeoJSON files to a source for tiling. Accepts line-delimited GeoJSON or GeoJSON feature collections as files or via `stdin`. The CLI automatically converts data to line-delimited GeoJSON prior to uploading. Can be used to add data to a source or to replace all of the data in a source with the `--replace` flag.
 
+Please note that if your source data is a FeatureCollection, `tilesets` must read it all into memory to split it up into separate features before uploading it to the Tilesets API. You are strongly encouraged to provide your data in line-delimited GeoJSON format instead, especially if it is large.
+
 Flags:
 
 * `--no-validation` [optional]: do not validate source data locally before uploading
@@ -76,26 +78,28 @@ Usage
 
 ```shell
 # single file
-tilesets upload-source <username> <id> ./file.geojson
+tilesets upload-source <username> <source_id> ./file.geojson
 
 # multiple files
-tilesets upload-source <username> <id> file-1.geojson file-4.geojson
+tilesets upload-source <username> <source_id> file-1.geojson file-4.geojson
 
 # directory of files
 # Reading from a directory will not distinguish between GeoJSON files and non GeoJSON files. All source files will be run through our validator unless you pass the `--no-validation` flag.
-tilesets upload-source <username> <id> ./path/to/multiple/files/
+tilesets upload-source <username> <source_id> ./path/to/multiple/files/
 ```
 
 ### *deprecated* add-source
 
 *WARNING: add-source is maintained for legacy purposes. Please use the `upload-source` command instead.*
 
 ```shell
-tilesets add-source <username> <id> <file>
+tilesets add-source <username> <source_id> <file>
 ```
 
 Adds GeoJSON files to a source for tiling. Accepts line-delimited GeoJSON or GeoJSON feature collections as files or via `stdin`. The CLI automatically converts data to line-delimited GeoJSON prior to uploading.
 
+Please note that if your source data is a FeatureCollection, `tilesets` must read it all into memory to split it up into separate features before uploading it to the Tilesets API. You are strongly encouraged to provide your data in line-delimited GeoJSON format instead, especially if it is large.
+
 Flags:
 
 * `--no-validation` [optional]: do not validate source data locally before uploading
@@ -105,14 +109,14 @@ Usage
 
 ```shell
 # single file
-tilesets add-source <username> <id> ./file.geojson
+tilesets add-source <username> <source_id> ./file.geojson
 
 # multiple files
-tilesets add-source <username> <id> file-1.geojson file-4.geojson
+tilesets add-source <username> <source_id> file-1.geojson file-4.geojson
 
 # directory of files
 # Reading from a directory will not distinguish between GeoJSON files and non GeoJSON files. All source files will be run through our validator unless you pass the `--no-validation` flag.
-tilesets add-source <username> <id> ./path/to/multiple/files/
+tilesets add-source <username> <source_id> ./path/to/multiple/files/
 ```
 
 ### validate-source
@@ -130,7 +134,7 @@ Invalid line delimited geojson.
 ### view-source
 
 ```
-tilesets view-source <username> <id>
+tilesets view-source <username> <source_id>
 ```
 
 Get information for a tileset source, such as number of files, the size in bytes, and the ID in mapbox:// protocol format.
@@ -146,11 +150,22 @@ List all tileset sources from a particular account. Response is an array of sour
 ### delete-source
 
 ```
-tilesets delete-source
+tilesets delete-source <username> <source_id>
 ```
 
 Permanently delete a tileset source and all of its files. This is not a recoverable action!
 
+Flags:
+
+* `-f` or `--force`: Do not ask for confirmation before deleting
+
+Usage
+
+```shell
+# to delete mapbox://tileset-source/user/source_id
+tilesets delete-source user source_id
+```
+
 ### estimate-area 
 
 ```shell

codecov.yml

@@ -6,8 +6,9 @@ codecov:
   notify:
     require_ci_to_pass: yes
 
- coverage:
-   status:
-     project:
-      threshold: 3%
-      base: auto
+coverage:
+  status:
+    project:
+      default:
+        threshold: 3%
+        base: auto

mapbox_tilesets/__init__.py

@@ -1,3 +1,3 @@
 """mapbox_tilesets package"""
 
-__version__ = "1.5.2"
+__version__ = "1.7.1"

mapbox_tilesets/scripts/cli.py

@@ -119,10 +119,19 @@ def publish(tileset, token=None, indent=None):
     )
     r = s.post(url)
     if r.status_code == 200:
-        click.echo(json.dumps(r.json(), indent=indent))
+        response_msg = r.json()
+        click.echo(json.dumps(response_msg, indent=indent))
+
+        studio_url = click.style(
+            f"https://studio.mapbox.com/tilesets/{tileset}", bold=True
+        )
+        job_id = response_msg["jobId"]
+        job_cmd = click.style(f"tilesets job {tileset} {job_id}", bold=True)
+        message = f"\n✔ Tileset job received. Visit {studio_url} or run {job_cmd} to view the status of your tileset."
+        # print(message)
         click.echo(
-            f"You can view the status of your tileset with the `tilesets status {tileset}` command.",
-            err=True,
+            message,
+            err=True,  # print to stderr so the JSON output can be parsed separately from the success message
         )
     else:
         raise errors.TilesetsError(r.text)
@@ -388,7 +397,7 @@ def list(
     If you would like an array of all tileset's information,
     use the --versbose flag.
 
-    tilests list <username>
+    tilesets list <username>
     """
     mapbox_api = utils._get_api()
     mapbox_token = utils._get_token(token)
@@ -525,7 +534,7 @@ def _upload_source(
 ):
     """Create/add a tileset source
 
-    tilesets add-source <username> <id> <path/to/source/data>
+    tilesets add-source <username> <source_id> <path/to/source/data>
     """
     mapbox_api = utils._get_api()
     mapbox_token = utils._get_token(token)
@@ -620,7 +629,7 @@ def add_source(
 ):
     """Create/add/replace a tileset source
 
-    tilesets add-source <username> <id> <path/to/source/data>
+    tilesets add-source <username> <source_id> <path/to/source/data>
     """
     return _upload_source(
         ctx, username, id, features, no_validation, quiet, False, token, indent
@@ -635,7 +644,7 @@ def add_source(
 def view_source(username, id, token=None, indent=None):
     """View a Tileset Source's information
 
-    tilesets view-source <username> <id>
+    tilesets view-source <username> <source_id>
     """
     mapbox_api = utils._get_api()
     mapbox_token = utils._get_token(token)
@@ -658,7 +667,7 @@ def view_source(username, id, token=None, indent=None):
 def delete_source(username, id, force, token=None):
     """Delete a Tileset Source + all of its files.
 
-    tilesets delete-source <username> <id>
+    tilesets delete-source <username> <source_id>
     """
     if not force:
         val = click.prompt(
@@ -707,6 +716,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 +760,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(

package-lock.json

@@ -41,12 +41,13 @@ def read(fname):
     zip_safe=False,
     extras_require={
         "test": [
+            "codecov",
             "pytest==4.6.11",
             "pytest-cov",
             "pre-commit",
-            "black",
+            "black==20.8b1",
             "pep8",
-            "codecov",
+            "toml==0.10.2",
         ]
     },
     entry_points="""

setup.py

@@ -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()