Add output_dims support.

doc/stages/writers.oci.rst

@@ -151,8 +151,17 @@ stream_chunks
 blob_chunk_count
   When streaming, the number of chunks per write to use [Default: **16**]
 
-
-
+scale_x, scale_y, scale_z / offset_x, offset_y, offset_z
+  If ANY of these options are specified the X, Y and Z dimensions are adjusted
+  by subtracting the offset and then dividing the values by the specified
+  scaling factor before being written as 32-bit integers (as opposed to double
+  precision values).  If any of these options is specified, unspecified
+  scale_<x,y,x> options are given the value of 1.0 and unspecified
+  offset_<x,y,z> are given the value of 0.0.
+
+output_dims
+  If specified, limits the dimensions written for each point.  Dimensions
+  are listed by name and separated by commas.
 
 .. _Oracle point cloud: http://docs.oracle.com/cd/B28359_01/appdev.111/b28400/sdo_pc_pkg_ref.htm
 

doc/stages/writers.pgpointcloud.rst

@@ -61,9 +61,6 @@ compression
 overwrite
   To drop the table before writing set to 'true'. To append to the table set to 'false'. [Default: **true**]
 
-pack_ignored_fields
-  Remove ignored fields from schema before creating schema object in pointcloud_schemas. [Default: **true**]
-
 srid
   Spatial reference ID (relative to the `spatial_ref_sys` table in PostGIS) to store with the point cloud schema. [Default: **4326**]
 
@@ -73,5 +70,16 @@ pre_sql
 post_sql
   Optional SQL to execute *after* running the translation. If the value references a file, the file is read and any SQL inside is executed. Otherwise the value is executed as SQL itself.
 
+scale_x, scale_y, scale_z / offset_x, offset_y, offset_z
+  If ANY of these options are specified the X, Y and Z dimensions are adjusted
+  by subtracting the offset and then dividing the values by the specified
+  scaling factor before being written as 32-bit integers (as opposed to double
+  precision values).  If any of these options is specified, unspecified
+  scale_<x,y,x> options are given the value of 1.0 and unspecified
+  offset_<x,y,z> are given the value of 0.0.
+
+output_dims
+  If specified, limits the dimensions written for each point.  Dimensions
+  are listed by name and separated by commas.
 
 .. _PostgreSQL Pointcloud: http://github.com/pramsey/pointcloud

include/pdal/DbWriter.hpp

@@ -59,7 +59,9 @@ class PDAL_DLL DbWriter : public Writer
     size_t readPoint(const PointBuffer& pb, PointId idx, char *outbuf);
 
 private:
+    virtual void prepared(PointContextRef ctx);
     virtual void ready(PointContextRef ctx);
+    DimTypeList dimTypes(PointContextRef ctx);
 
     DimTypeList m_dimTypes;
     int m_xPackedOffset;

include/pdal/PointContext.hpp

@@ -169,10 +169,16 @@ class PointContext
 
         const Dimension::IdList& ids = dims();
         for (auto ii = ids.begin(); ii != ids.end(); ++ii)
-            dimTypes.push_back(DimType (*ii, dimType(*ii)));
+            dimTypes.push_back(DimType(*ii, dimType(*ii)));
         return dimTypes;
     }
 
+    DimType findDimType(const std::string& name) const
+    {
+        Dimension::Id::Enum id = findDim(name);
+        return DimType(id, dimType(id));
+    }
+
     Dimension::Id::Enum findDim(const std::string& name) const
     {
         Dimension::Id::Enum id = Dimension::id(name);

include/pdal/Stage.hpp

@@ -164,6 +164,8 @@ class PDAL_DLL Stage
         {}
     virtual void addDimensions(PointContextRef ctx)
         { (void)ctx; }
+    virtual void prepared(PointContextRef ctx)
+        { (void)ctx; }
     virtual void ready(PointContextRef ctx)
         { (void)ctx; }
     virtual void done(PointContextRef ctx)

include/pdal/Writer.hpp

@@ -75,6 +75,7 @@ class PDAL_DLL Writer : public Stage
     XForm m_xXform;
     XForm m_yXform;
     XForm m_zXform;
+    std::vector<std::string> m_outputDims;
 
     void setAutoOffset(const PointBuffer& buf);
 

plugins/pgpointcloud/io/PgWriter.cpp

@@ -67,8 +67,6 @@ PgWriter::PgWriter()
     , m_patch_capacity(400)
     , m_srid(0)
     , m_pcid(0)
-    , m_have_postgis(false)
-    , m_create_index(true)
     , m_overwrite(true)
     , m_schema_is_initialized(false)
 {}
@@ -88,7 +86,7 @@ void PgWriter::processOptions(const Options& options)
 
     // Schema and column name can be defaulted safely
     m_column_name = options.getValueOrDefault<std::string>("column", "pa");
-    m_schema_name = options.getValueOrDefault<std::string>("schema", "");
+    m_schema_name = options.getValueOrDefault<std::string>("schema");
     //
     // Read compression type and turn into an integer
     std::string compression_str =
@@ -103,8 +101,10 @@ void PgWriter::processOptions(const Options& options)
     m_patch_capacity = options.getValueOrDefault<uint32_t>("capacity", 400);
     m_srid = options.getValueOrDefault<uint32_t>("srid", 4326);
     m_pcid = options.getValueOrDefault<uint32_t>("pcid", 0);
-    m_pack = options.getValueOrDefault<bool>("pack_ignored_fields", true);
-    m_pre_sql = getOptions().getValueOrDefault<std::string>("pre_sql", "");
+    m_pre_sql = options.getValueOrDefault<std::string>("pre_sql");
+    // Post-SQL can be *either* a SQL file to execute, *or* a SQL statement
+    // to execute. We find out which one here.
+    std::string post_sql = options.getValueOrDefault<std::string>("post_sql");
 }
 
 //
@@ -204,23 +204,17 @@ void PgWriter::write(const PointBuffer& buffer)
 
 void PgWriter::done(PointContextRef ctx)
 {
-    if (m_create_index && m_have_postgis)
-    {
-        CreateIndex(m_schema_name, m_table_name, m_column_name);
-    }
+    //CreateIndex(m_schema_name, m_table_name, m_column_name);
 
-    // Post-SQL can be *either* a SQL file to execute, *or* a SQL statement
-    // to execute. We find out which one here.
-    std::string post_sql = getOptions().getValueOrDefault<std::string>("post_sql", "");
-    if (post_sql.size())
+    if (m_post_sql.size())
     {
-        std::string sql = FileUtils::readFileAsString(post_sql);
+        std::string sql = FileUtils::readFileAsString(m_post_sql);
         if (!sql.size())
         {
             // if there was no file to read because the data in post_sql was
             // actually the sql code the user wanted to run instead of the
             // filename to open, we'll use that instead.
-            sql = post_sql;
+            sql = m_post_sql;
         }
         pg_execute(m_session, sql);
     }

plugins/pgpointcloud/io/PgWriter.hpp

@@ -95,13 +95,11 @@ class PDAL_DLL PgWriter : public DbWriter
     uint32_t m_patch_capacity;
     uint32_t m_srid;
     uint32_t m_pcid;
-    bool m_have_postgis;
-    bool m_create_index;
     bool m_overwrite;
     std::string m_insert;
     Orientation::Enum m_orientation;
-    bool m_pack;
     std::string m_pre_sql;
+    std::string m_post_sql;
 
     // lose this
     bool m_schema_is_initialized;

src/DbWriter.cpp

@@ -35,6 +35,37 @@
 namespace pdal
 {
 
+DimTypeList DbWriter::dimTypes(PointContextRef ctx)
+{
+    using namespace Dimension;
+
+    if (m_outputDims.empty())
+        return ctx.dimTypes();
+
+    DimTypeList dims;
+    for (std::string& s : m_outputDims)
+    {
+        DimType dt = ctx.findDimType(s);
+        if (dt.m_id == Id::Unknown)
+        {
+            std::ostringstream oss;
+            oss << "Invalid dimension '" << s << "' specified for "
+                "'output_dims' option.";
+            throw pdal_error(oss.str());
+        }
+        dims.push_back(dt);
+    }
+    return dims;
+}
+
+
+// Placing this here allows validation of dimensions before execution begins.
+void DbWriter::prepared(PointContextRef ctx)
+{
+    m_dimTypes = dimTypes(ctx);
+}
+
+
 void DbWriter::ready(PointContextRef ctx)
 {
     using namespace Dimension;
@@ -43,7 +74,6 @@ void DbWriter::ready(PointContextRef ctx)
     // a scale factor and offset instead of being written as Double.
     m_locationScaling = (m_xXform.nonstandard() || m_yXform.nonstandard() ||
         m_zXform.nonstandard());
-    m_dimTypes = ctx.dimTypes();
 
     auto cmp = [](const DimType& d1, const DimType& d2) -> bool
     {

src/Stage.cpp

@@ -68,6 +68,7 @@ void Stage::prepare(PointContextRef ctx)
     l_initialize(ctx);
     initialize();
     addDimensions(ctx);
+    prepared(ctx);
 }
 
 

src/Writer.cpp

@@ -71,6 +71,8 @@ void Writer::writerProcessOptions(const Options& options)
         m_yXform.m_scale = options.getValueOrThrow<double>("scale_y");
     if (options.hasOption("scale_z"))
         m_zXform.m_scale = options.getValueOrThrow<double>("scale_z");
+    m_outputDims = 
+        options.getValueOrDefault<std::vector<std::string>>("output_dims");
 }