Change instances of "which" to "that"

Author: sgillies

CHANGES

@@ -34,12 +34,12 @@ This is the 1.0.0 release. There have been no changes since 1.0rc1.
 
 - Add shapely.ops functions (#23).
 - Add builtin buffer, distance, length, simplify, and set_precision functions
-  which allow projected computation of these values (#27).
+  that allow projected computation of these values (#27).
 
 1.0a2 (2023-03-01)
 ------------------
 
-- Added a new builtin area function which allows projected area computation
+- Added a new builtin area function that allows projected area computation
   (#21).
 - Add short options -r for raw mode and -n for no input (#18).
 - The expression parser has been fixed so that functions with underscores and

README.md

@@ -7,7 +7,7 @@ A package of Fiona CLI plugins from Planet Labs.
 [![](https://github.com/planetlabs/fio-planet/actions/workflows/test.yml/badge.svg)](https://github.com/planetlabs/fio-planet/actions/workflows/test.yml)
 [![Documentation Status](https://readthedocs.org/projects/fio-planet/badge/?version=latest)](https://fio-planet.readthedocs.io/en/latest/?badge=latest)
 
-These CLI commands are for creating Unix pipelines which manipulate streams of
+These CLI commands are for creating Unix pipelines that manipulate streams of
 GeoJSON features. Such pipelines provide a subset of the functionality of more
 complicated tools such as GeoPandas, PostGIS, or QGIS, and are intended for use
 with streams of hundreds of features, where the overhead of JSON serialization
@@ -44,7 +44,7 @@ table.  fio-filter decimates a seqence of features, fio-map multiplies and
 transforms features, and fio-reduce turns a sequence of many features into a
 sequence of exactly one.  In combination, many transformations are possible.
 
-Expressions take the form of parenthesized lists which may contain other
+Expressions take the form of parenthesized lists that may contain other
 expressions. The first item in a list is the name of a function or method, or
 an expression that evaluates to a function. The second item is the function's
 first argument or the object to which the method is bound. The remaining list
@@ -94,7 +94,7 @@ given point.
 ```
 
 fio-reduce evaluates expressions in the context of the sequence of all input
-geometries, which is named `c`. For example, this expression dissolves input
+geometries, named `c`. For example, this expression dissolves input
 geometries using Shapely's `unary_union`.
 
 ```lisp

docs/expressions.md

@@ -1,7 +1,7 @@
 Expressions and functions
 =========================
 
-Expressions take the form of parenthesized lists which may contain other
+Expressions take the form of parenthesized lists that may contain other
 expressions. The first item in a list is the name of a function or method, or
 an expression that evaluates to a function. The second item is the function's
 first argument or the object to which the method is bound. The remaining list
@@ -166,7 +166,7 @@ of the given point.
 ```
 
 `fio-reduce` evaluates expressions in the context of the sequence of all input
-geometries, which is named `c`. For example, this expression dissolves input
+geometries, named `c`. For example, this expression dissolves input
 geometries using Shapely's `unary_union`.
 
 ```lisp

docs/index.md

@@ -4,7 +4,7 @@ fio-planet
 A package of [Fiona CLI](https://fiona.readthedocs.io/en/stable/cli.html)
 plugins from Planet Labs.
 
-These CLI commands are for creating Unix pipelines which manipulate streams of
+These CLI commands are for creating Unix pipelines that manipulate streams of
 GeoJSON features. Such pipelines provide a subset of the functionality of more
 complicated tools such as GeoPandas, PostGIS, or QGIS, and are intended for use
 with streams of hundreds of features, where the overhead of JSON serialization
@@ -27,7 +27,7 @@ table.  fio-filter decimates a seqence of features, fio-map multiplies and
 transforms features, and fio-reduce turns a sequence of many features into a
 sequence of exactly one.  In combination, many transformations are possible.
 
-Expressions take the form of parenthesized lists which may contain other
+Expressions take the form of parenthesized lists that may contain other
 expressions. The first item in a list is the name of a function or method, or
 an expression that evaluates to a function. The second item is the function's
 first argument or the object to which the method is bound. The remaining list
@@ -78,7 +78,7 @@ given point.
 ```
 
 fio-reduce evaluates expressions in the context of the sequence of all input
-geometries, which is named `c`. For example, this expression dissolves input
+geometries, named `c`. For example, this expression dissolves input
 geometries using Shapely's `unary_union`.
 
 ```lisp

src/fio_planet/cli.py

@@ -63,9 +63,9 @@ def map_cmd(pipeline, raw, no_input, dump_parts, use_rs):
     command prints pipeline results without wrapping them in a feature
     object.
 
-    The pipeline is a string which, when evaluated by fio-map, produces
+    The pipeline is a string that, when evaluated by fio-map, produces
     a new geometry object. The pipeline consists of expressions in the
-    form of parenthesized lists which may contain other expressions.
+    form of parenthesized lists that may contain other expressions.
     The first item in a list is the name of a function or method, or an
     expression that evaluates to a function. The second item is the
     function's first argument or the object to which the method is
@@ -123,12 +123,12 @@ def map_cmd(pipeline, raw, no_input, dump_parts, use_rs):
 def filter_cmd(pipeline, use_rs):
     """Evaluate pipeline expressions to filter GeoJSON features.
 
-    The pipeline is a string which, when evaluated, gives a new value
+    The pipeline is a string that, when evaluated, gives a new value
     for each input feature. If the value evaluates to True, the feature
     passes through the filter. Otherwise the feature does not pass.
 
     The pipeline consists of expressions in the
-    form of parenthesized lists which may contain other expressions.
+    form of parenthesized lists that may contain other expressions.
     The first item in a list is the name of a function or method, or an
     expression that evaluates to a function. The second item is the
     function's first argument or the object to which the method is
@@ -178,9 +178,9 @@ def reduce_cmd(pipeline, raw, use_rs, zip_properties):
     Given a sequence of GeoJSON features (RS-delimited or not) on stdin
     this prints a single value using a provided transformation pipeline.
 
-    The pipeline is a string which, when evaluated, produces
+    The pipeline is a string that, when evaluated, produces
     a new geometry object. The pipeline consists of expressions in the
-    form of parenthesized lists which may contain other expressions.
+    form of parenthesized lists that may contain other expressions.
     The first item in a list is the name of a function or method, or an
     expression that evaluates to a function. The second item is the
     function's first argument or the object to which the method is

src/fio_planet/features.py

@@ -298,7 +298,7 @@ def map_feature(
 def reduce_features(expression: str, features: Iterable[Mapping]) -> Generator:
     """Reduce a collection of features to a single value.
 
-    The pipeline is a string which, when evaluated by snuggs, produces
+    The pipeline is a string that, when evaluated by snuggs, produces
     a new value. The name of the input feature collection in the
     context of the pipeline is "c".