Align readers.tindex & readers.stac with normal FileSpec (PDAL#4740)

* reader args fix

* docs update

Author: ibell13

doc/stages/readers.stac.md

@@ -119,7 +119,7 @@ reader_args
 
 ```bash
 --readers.stac.reader_args \
-'{"type": "readers.copc", "filespec": {"headers": {"your_header_key": "header_val"}, "query": {"your_query_key": "query_val"}}}'
+'{"type": "readers.copc", "filename": {"headers": {"your_header_key": "header_val"}, "query": {"your_query_key": "query_val"}}}'
 ```
 
 catalog_schema_url

doc/stages/readers.tindex.md

@@ -76,7 +76,7 @@ reader_args
 
 ```bash
 --readers.tindex.reader_args \
-'{"type": "readers.copc", "filespec": {"headers": {"your_header_key": "header_val"}, "query": {"your_query_key": "query_val"}}}'
+'{"type": "readers.copc", "filename": {"headers": {"your_header_key": "header_val"}, "query": {"your_query_key": "query_val"}}}'
 ```
 
 srs_column

io/TIndexReader.cpp

@@ -123,26 +123,28 @@ Options setReaderOptions(const NL::json& readerArgs, const std::string& driver,
     const std::string& filename)
 {
     Options readerOptions;
-    readerOptions.add("filename", filename);
+    bool filenameSet = false;
     if (readerArgs.contains(driver)) {
         NL::json args = readerArgs.at(driver).get<NL::json>();
         for (auto& arg : args.items()) {
-            NL::detail::value_t type = readerArgs.at(driver).at(arg.key()).type();
-
-            // We treat the partial FileSpec as a special case
-            if (arg.key() == "file_spec" || arg.key() == "filespec")
+            if (arg.key() == "filename")
             {
-                NL::json filespecArg = arg.value();
+                NL::json filespecArg = arg.value().get<NL::json>();
                 if (!filespecArg.is_object())
-                    throw pdal_error("value for " + driver + "'file_spec' argument " +
-                        " must be a valid JSON object.");
+                    throw pdal_error("Value for " + driver + " 'filename' argument " +
+                        "expected to be a 'FileSpec' JSON object.");
+                if (filespecArg.contains("path"))
+                    filespecArg.erase("path");
                 filespecArg += {"path", filename};
 
                 // This doesn't check if the driver supports headers/queries: if not,
                 // the reader will only use the filename
-                readerOptions.replace("filename", filespecArg.dump());
+                readerOptions.add("filename", filespecArg.dump());
+                filenameSet = true;
                 continue;
             }
+
+            NL::detail::value_t type = readerArgs.at(driver).at(arg.key()).type();
             switch(type)
             {
                 case NL::detail::value_t::string:
@@ -174,6 +176,9 @@ Options setReaderOptions(const NL::json& readerArgs, const std::string& driver,
             }
         }
     }
+    if (!filenameSet)
+        readerOptions.add("filename", filename);
+
 
     return readerOptions;
 }

io/private/stac/Item.cpp

@@ -139,7 +139,7 @@ Options Item::setReaderOptions(const NL::json& readerArgs,
     const std::string& driver, const std::string& filename) const
 {
     Options readerOptions;
-    readerOptions.add("filename", filename);
+    bool filenameSet = false;
     if (readerArgs.contains(driver)) {
         NL::json args = jsonValue(readerArgs, driver);
         for (auto& arg : args.items())
@@ -148,16 +148,19 @@ Options Item::setReaderOptions(const NL::json& readerArgs,
             NL::json val = arg.value();
             NL::detail::value_t type = val.type();
             // We treat a partial FileSpec as a special case
-            if (key == "file_spec" || key == "filespec")
+            if (key == "filename")
             {
                 if (!val.is_object())
-                    throw pdal_error("value for " + driver + "'file_spec' argument " +
-                        " must be a valid JSON object.");
+                    throw pdal_error("Value for " + driver + " 'filename' argument " +
+                        "expected to be a 'FileSpec' JSON object.");
+                if (val.contains("path"))
+                    val.erase("path");
                 val += {"path", filename};
 
                 // This doesn't check if the driver supports headers/queries: if not,
                 // the reader will only use the filename
-                readerOptions.replace("filename", val.dump());
+                readerOptions.add("filename", val.dump());
+                filenameSet = true;
                 continue;
             }
 
@@ -171,6 +174,8 @@ Options Item::setReaderOptions(const NL::json& readerArgs,
             readerOptions.add(key, v);
         }
     }
+    if (!filenameSet)
+        readerOptions.add("filename", filename);
 
     return readerOptions;
 }