diff --git a/README.rst b/README.rst index 160c057..e160892 100755 --- a/README.rst +++ b/README.rst @@ -76,11 +76,10 @@ or, optionally, a sequence of individual features. Since most software that reads and writes GeoJSON expects a text containing a single feature collection, that's the default, and a LF-delimited sequence of texts containing one GeoJSON feature each is a feature that is turned on using the ``--sequence`` option. -To write sequences of feature texts that conform to the `JSON Text Sequences -proposed standard -`__ (and might -contain pretty-printed JSON) with the ASCII Record Separator (0x1e) as -a delimiter, use the ``--rs`` option +To write sequences of feature texts that conform to the `RFC 7464 JSON Text +Sequences standard `__ (and might contain +pretty-printed JSON) with the ASCII Record Separator (0x1e) as a delimiter, use +the ``--rs`` option .. code-block:: python diff --git a/cligj/__init__.py b/cligj/__init__.py index e8720f5..14a2a98 100755 --- a/cligj/__init__.py +++ b/cligj/__init__.py @@ -6,6 +6,7 @@ from .features import normalize_feature_inputs + # Arguments. # Multiple input files. @@ -95,18 +96,17 @@ # Feature collection or feature sequence switch. sequence_opt = click.option( '--sequence/--no-sequence', - default=False, + default=True, help="Write a LF-delimited sequence of texts containing individual " - "objects or write a single JSON text containing a feature " - "collection object (the default).") + "objects (the default) or write a single JSON text containing a " + "feature collection object.") use_rs_opt = click.option( '--rs/--no-rs', 'use_rs', default=False, help="Use RS (0x1E) as a prefix for individual texts in a sequence " - "as per http://tools.ietf.org/html/draft-ietf-json-text-sequence-13 " - "(default is False).") + "as per https://tools.ietf.org/html/rfc7464 (default is False).") # GeoJSON output mode option. @@ -119,7 +119,7 @@ def geojson_type_collection_opt(default=False): help="Output as GeoJSON feature collection(s).") -def geojson_type_feature_opt(default=False): +def geojson_type_feature_opt(default=True): return click.option( '--feature', 'geojson_type', diff --git a/setup.py b/setup.py index 34e7e00..e658f78 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup(name='cligj', - version='0.4.0', + version='0.5.0', description=u"Click params for commmand line interfaces to GeoJSON", long_description=long_description, classifiers=[], @@ -20,9 +20,5 @@ packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), include_package_data=True, zip_safe=False, - install_requires=[ - 'click>=4.0' - ], - extras_require={ - 'test': ['pytest-cov'], - }) + install_requires=['click>=4.0'], + extras_require={'test': ['pytest-cov']}) diff --git a/tests/test_cli.py b/tests/test_cli.py index a15b9de..2c004b7 100755 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -163,7 +163,7 @@ def cmd(sequence): result = runner.invoke(cmd) assert not result.exception - assert result.output.splitlines() == ['False'] + assert result.output.splitlines() == ['True'] result = runner.invoke(cmd, ['--sequence']) assert not result.exception