Skip to content

v0.2.52..v0.2.53 changeset CountCmdTest.sh

Garret Voltz edited this page Feb 12, 2020 · 1 revision
diff --git a/test-files/cmd/slow/CountCmdTest.sh b/test-files/cmd/slow/CountCmdTest.sh
index d0adb45..24fec5b 100755
--- a/test-files/cmd/slow/CountCmdTest.sh
+++ b/test-files/cmd/slow/CountCmdTest.sh
@@ -6,15 +6,27 @@ rm -rf $OUTPUT_DIR
 mkdir -p $OUTPUT_DIR
 INPUT_FILE_1=test-files/conflate/unified/AllDataTypesA.osm
 INPUT_FILE_2=test-files/conflate/unified/AllDataTypesB.osm
+INPUT_FILE_3=test-files/conflate/generic/rivers/Haiti_CNIGS_Rivers_REF1-cropped-2.osm
+INPUT_FILE_4=test-files/conflate/generic/rivers/Haiti_osm_waterway_ss_REF2-cropped-2.osm
 
-# count all features
+echo "counting all features..."
 hoot count --warn "$INPUT_FILE_1;$INPUT_FILE_2"
 
-# count all elements
+echo "counting all elements..."
 hoot count --warn "$INPUT_FILE_1;$INPUT_FILE_2" --all-elements
 
-# count all POIs
+# LinearWaterwayCriterion is not a map consumer, so streaming I/O can occur.
+
+echo "counting all rivers..."
+hoot count --warn "$INPUT_FILE_3;$INPUT_FILE_4" hoot::LinearWaterwayCriterion
+
+echo "counting all elements that are not rivers..."
+hoot count --warn -D element.criterion.negate=true "$INPUT_FILE_3;$INPUT_FILE_4" hoot::LinearWaterwayCriterion
+
+# PoiCriterion is a map consumer, so streaming I/O cannot occur.
+
+echo "counting all POIs..."
 hoot count --warn "$INPUT_FILE_1;$INPUT_FILE_2" hoot::PoiCriterion
 
-# count all elements that are not POIs
+echo "counting all elements that are not POIs..."
 hoot count --warn -D element.criterion.negate=true "$INPUT_FILE_1;$INPUT_FILE_2" hoot::PoiCriterion
Clone this wiki locally