Changeset 1202:a60e8617562a

Timestamp:

05/16/09 20:37:32 (15 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@1267

Message:

push the storage manager for the spatial index into the liblas:: namespace

Files:

• include/liblas/lasindex.hpp (modified) (3 diffs)
• src/lasindex.cpp (modified) (3 diffs)

include/liblas/lasindex.hpp

@@ -46 +46 @@
 #include <liblas/laspoint.hpp>
 
-
-#ifdef HAVE_SPATIALINDEX
 #include <spatialindex/SpatialIndex.h>
-
-#endif
 
 
@@ -139 +135 @@
 };
 
-} // namespace liblas
-
-namespace SpatialIndex
-{
-
-
-    namespace StorageManager
-    {
-        extern IStorageManager* returnLASStorageManager(Tools::PropertySet& in);
-        extern IStorageManager* createNewLASStorageManager();
-        
-        class LASStorageManager : public SpatialIndex::IStorageManager
-        {
-        public:
-            LASStorageManager(Tools::PropertySet&);
-
-            virtual ~LASStorageManager();
-
-            virtual void loadByteArray(const id_type id, size_t& len, uint8_t** data);
-            virtual void storeByteArray(id_type& id, const size_t len, const uint8_t* const data);
-            virtual void deleteByteArray(const id_type id);
-
-        private:
-            class Entry
-            {
-            public:
-                byte* m_pData;
-                size_t m_length;
-
-                Entry(size_t l, const uint8_t* const d) : m_pData(0), m_length(l)
-                {
-                    m_pData = new uint8_t[m_length];
-                    memcpy(m_pData, d, m_length);
-                }
-
-                ~Entry() { delete[] m_pData; }
-            }; // Entry
-
-            std::vector<Entry*> m_buffer;
-            std::stack<id_type> m_emptyPages;
-        }; // MemoryStorageManager
-    }
-}
-
-namespace liblas
-{
 class LASDataStream : public SpatialIndex::IDataStream
 {
@@ -202 +152 @@
 
     bool readPoint();
+
+protected:
     liblas::LASReader* m_reader;
     SpatialIndex::RTree::Data* m_pNext;
     SpatialIndex::id_type m_id;
 };
+
+
+
+
+extern SpatialIndex::IStorageManager* returnLASStorageManager(Tools::PropertySet& in);
+extern SpatialIndex::IStorageManager* createNewLASStorageManager();
+
+class LASStorageManager : public SpatialIndex::IStorageManager
+{
+public:
+    LASStorageManager(Tools::PropertySet&);
+
+    virtual ~LASStorageManager();
+
+    virtual void loadByteArray(const SpatialIndex::id_type id, size_t& len, uint8_t** data);
+    virtual void storeByteArray(SpatialIndex::id_type& id, const size_t len, const uint8_t* const data);
+    virtual void deleteByteArray(const SpatialIndex::id_type id);
+
+private:
+    class Entry
+    {
+    public:
+        byte* m_pData;
+        size_t m_length;
+
+        Entry(size_t l, const uint8_t* const d) : m_pData(0), m_length(l)
+        {
+            m_pData = new uint8_t[m_length];
+            memcpy(m_pData, d, m_length);
+        }
+
+        ~Entry() { delete[] m_pData; }
+    }; // Entry
+
+    std::vector<Entry*> m_buffer;
+    std::stack<SpatialIndex::id_type> m_emptyPages;
+}; // MemoryStorageManager
+
+
 }
 

src/lasindex.cpp

@@ -58 +58 @@
 LASIndex::LASIndex()
 {
-    m_storage = SpatialIndex::StorageManager::createNewLASStorageManager();
+    m_storage = createNewLASStorageManager();
     Init();
 }
@@ -112 +112 @@
             std::cout << "error creating index" << s <<std::endl; exit(1);
         }
-        }
+    }
 
     Init();
@@ -188 +188 @@
 
 
-} // namespace liblas
-
-
-
-
-SpatialIndex::IStorageManager* SpatialIndex::StorageManager::returnLASStorageManager(Tools::PropertySet& ps)
-{
-        IStorageManager* sm = new LASStorageManager(ps);
-        return sm;
-}
-
-SpatialIndex::IStorageManager* SpatialIndex::StorageManager::createNewLASStorageManager()
-{
-        Tools::PropertySet ps;
-        return returnLASStorageManager(ps);
-}
-
-SpatialIndex::StorageManager::LASStorageManager::LASStorageManager(Tools::PropertySet& ps)
-{
-}
-
-SpatialIndex::StorageManager::LASStorageManager::~LASStorageManager()
-{
-        for (std::vector<Entry*>::iterator it = m_buffer.begin(); it != m_buffer.end(); it++) delete *it;
-}
-
-void SpatialIndex::StorageManager::LASStorageManager::loadByteArray(const id_type id, size_t& len, uint8_t** data)
-{
-        Entry* e;
-        try
-        {
-                e = m_buffer.at(id);
-                if (e == 0) throw Tools::InvalidPageException(id);
-        }
-        catch (std::out_of_range)
-        {
-                throw Tools::InvalidPageException(id);
-        }
-
-        len = e->m_length;
-        *data = new uint8_t[len];
-
-        memcpy(*data, e->m_pData, len);
-}
-
-void SpatialIndex::StorageManager::LASStorageManager::storeByteArray(id_type& id, const size_t len, const uint8_t* const data)
-{
-        if (id == NewPage)
-        {
-                Entry* e = new Entry(len, data);
-
-                if (m_emptyPages.empty())
-                {
-                        m_buffer.push_back(e);
-                        id = m_buffer.size() - 1;
-                }
-                else
-                {
-                        id = m_emptyPages.top(); m_emptyPages.pop();
-                        m_buffer[id] = e;
-                }
-        }
-        else
-        {
-                Entry* e_old;
-                try
-                {
-                        e_old = m_buffer.at(id);
-                        if (e_old == 0) throw Tools::InvalidPageException(id);
-                }
-                catch (std::out_of_range)
-                {
-                        throw Tools::InvalidPageException(id);
-                }
-
-                Entry* e = new Entry(len, data);
-
-                delete e_old;
-                m_buffer[id] = e;
-        }
-}
-
-void SpatialIndex::StorageManager::LASStorageManager::deleteByteArray(const id_type id)
-{
-        Entry* e;
-        try
-        {
-                e = m_buffer.at(id);
-                if (e == 0) throw Tools::InvalidPageException(id);
-        }
-        catch (std::out_of_range)
-        {
-                throw Tools::InvalidPageException(id);
-        }
-
-        m_buffer[id] = 0;
-        m_emptyPages.push(id);
-
-        delete e;
-}
-
-
-namespace liblas
-{
+
+
+
+SpatialIndex::IStorageManager* returnLASStorageManager(Tools::PropertySet& ps)
+{
+    SpatialIndex::IStorageManager* sm = new LASStorageManager(ps);
+    return sm;
+}
+
+SpatialIndex::IStorageManager* createNewLASStorageManager()
+{
+    Tools::PropertySet ps;
+    return returnLASStorageManager(ps);
+}
+
+LASStorageManager::LASStorageManager(Tools::PropertySet& ps)
+{
+}
+
+LASStorageManager::~LASStorageManager()
+{
+    for (std::vector<Entry*>::iterator it = m_buffer.begin(); it != m_buffer.end(); it++) delete *it;
+}
+
+void LASStorageManager::loadByteArray(const SpatialIndex::id_type id, size_t& len, uint8_t** data)
+{
+    Entry* e;
+    try
+    {
+        e = m_buffer.at(id);
+        if (e == 0) throw Tools::InvalidPageException(id);
+    }
+    catch (std::out_of_range)
+    {
+        throw Tools::InvalidPageException(id);
+    }
+
+    len = e->m_length;
+    *data = new uint8_t[len];
+
+    memcpy(*data, e->m_pData, len);
+}
+
+void LASStorageManager::storeByteArray(SpatialIndex::id_type& id, const size_t len, const uint8_t* const data)
+{
+    if (id == SpatialIndex::StorageManager::NewPage)
+    {
+        Entry* e = new Entry(len, data);
+
+        if (m_emptyPages.empty())
+        {
+            m_buffer.push_back(e);
+            id = m_buffer.size() - 1;
+        }
+        else
+        {
+            id = m_emptyPages.top(); m_emptyPages.pop();
+            m_buffer[id] = e;
+        }
+    }
+    else
+    {
+        Entry* e_old;
+        try
+        {
+            e_old = m_buffer.at(id);
+            if (e_old == 0) throw Tools::InvalidPageException(id);
+        }
+        catch (std::out_of_range)
+        {
+            throw Tools::InvalidPageException(id);
+        }
+
+        Entry* e = new Entry(len, data);
+
+        delete e_old;
+        m_buffer[id] = e;
+    }
+}
+
+void LASStorageManager::deleteByteArray(const SpatialIndex::id_type id)
+{
+    Entry* e;
+    try
+    {
+        e = m_buffer.at(id);
+        if (e == 0) throw Tools::InvalidPageException(id);
+    }
+    catch (std::out_of_range)
+    {
+        throw Tools::InvalidPageException(id);
+    }
+
+    m_buffer[id] = 0;
+    m_emptyPages.push(id);
+
+    delete e;
+}
+