Use raster types as PDAL types when creating dimensions.

PDAL · Mar 13, 2018 · 590a501 · 590a501
1 parent be953b8
commit 590a501
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/filters/ColorizationFilter.cpp b/filters/ColorizationFilter.cpp
@@ -131,6 +131,12 @@ void ColorizationFilter::addArgs(ProgramArgs& args)
 
 void ColorizationFilter::initialize()
 {
+    gdal::registerDrivers();
+
+    m_raster.reset(new gdal::Raster(m_rasterFilename));
+    auto bandTypes = m_raster->getPDALDimensionTypes();
+    m_raster->close();
+
     if (m_dimSpec.empty())
         m_dimSpec = { "Red", "Green", "Blue" };
 
@@ -141,6 +147,8 @@ void ColorizationFilter::initialize()
         {
             BandInfo bi = parseDim(dim, defaultBand);
             defaultBand = bi.m_band + 1;
+            if (bi.m_band < bandTypes.size())
+                bi.m_type = bandTypes[bi.m_band];
             m_bands.push_back(bi);
         }
         catch(const std::string& what)
@@ -149,15 +157,13 @@ void ColorizationFilter::initialize()
         }
     }
 
-    gdal::registerDrivers();
 }
 
 
 void ColorizationFilter::addDimensions(PointLayoutPtr layout)
 {
     for (auto& band : m_bands)
-        band.m_dim = layout->registerOrAssignDim(band.m_name,
-            Dimension::defaultType(Dimension::Id::Red));
+        band.m_dim = layout->registerOrAssignDim(band.m_name, band.m_type);
 }
 
 

diff --git a/filters/ColorizationFilter.hpp b/filters/ColorizationFilter.hpp
@@ -59,7 +59,7 @@ class PDAL_DLL ColorizationFilter : public Filter, public Streamable
     {
         BandInfo(const std::string& name, uint32_t band, double scale) :
             m_name(name), m_band(band), m_scale(scale),
-            m_dim(Dimension::Id::Unknown)
+            m_dim(Dimension::Id::Unknown), m_type(Dimension::Type::Double)
         {}
 
         BandInfo() : m_band(0), m_scale(1.0), m_dim(Dimension::Id::Unknown)
@@ -69,6 +69,7 @@ class PDAL_DLL ColorizationFilter : public Filter, public Streamable
         uint32_t m_band;
         double m_scale;
         Dimension::Id m_dim;
+        Dimension::Type m_type;
     };
 
 

diff --git a/io/GDALReader.cpp b/io/GDALReader.cpp
@@ -78,6 +78,7 @@ void GDALReader::initialize()
     }
 
     m_count = m_raster->width() * m_raster->height();
+    m_bandTypes = m_raster->getPDALDimensionTypes();
     m_raster->close();
 }
 
@@ -111,7 +112,7 @@ void GDALReader::addDimensions(PointLayoutPtr layout)
     {
         std::ostringstream oss;
         oss << "band-" << (i + 1);
-        layout->registerOrAssignDim(oss.str(), Dimension::Type::Double);
+        layout->registerOrAssignDim(oss.str(), m_bandTypes[i]);
     }
 }
 
@@ -142,13 +143,11 @@ point_count_t GDALReader::read(PointViewPtr view, point_count_t num)
     }
 
     std::vector<uint8_t> band;
-    std::vector<Dimension::Type> band_types =
-        m_raster->getPDALDimensionTypes();
 
     for (int b = 0; b < m_raster->bandCount(); ++b)
     {
         // Bands count from 1
-        switch (band_types[b])
+        switch (m_bandTypes[b])
         {
         case Dimension::Type::Signed8:
             readBandData<int8_t>(b + 1, view, count);

diff --git a/io/GDALReader.hpp b/io/GDALReader.hpp
@@ -72,6 +72,7 @@ class PDAL_DLL GDALReader : public Reader
     void readBandData(int band, PointViewPtr view, point_count_t count);
 
     std::unique_ptr<gdal::Raster> m_raster;
+    std::vector<Dimension::Type> m_bandTypes;
     point_count_t m_index;
 
 };