From df2b68042e4feaba9f0715cce6fb7fbf409bda1e Mon Sep 17 00:00:00 2001
From: Erik Broberg <Erik Broberg>
Date: Mon, 20 Jun 2016 11:13:47 -0400
Subject: [PATCH] Better variable names in DiskCache

---
 modules/globebrowsing/tile/tiledataset.cpp   | 19 ++-----------------
 modules/globebrowsing/tile/tiledataset.h     |  4 ++--
 modules/globebrowsing/tile/tilediskcache.cpp | 20 ++++++++++----------
 modules/globebrowsing/tile/tilediskcache.h   |  2 +-
 4 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/modules/globebrowsing/tile/tiledataset.cpp b/modules/globebrowsing/tile/tiledataset.cpp
index 5c3a75699d..d473df92c2 100644
--- a/modules/globebrowsing/tile/tiledataset.cpp
+++ b/modules/globebrowsing/tile/tiledataset.cpp
@@ -102,7 +102,7 @@ namespace openspace {
 
 
 
-    void TileIOResult::serialize(std::ostream& os) {
+    void TileIOResult::serializeMetaData(std::ostream& os) {
         os << dimensions.x << " " << dimensions.y << " " << dimensions.z << std::endl;
         os << chunkIndex.x << " " << chunkIndex.y << " " << chunkIndex.level << std::endl;
         os << error << std::endl;
@@ -114,19 +114,10 @@ namespace openspace {
         }
         
         os << nBytesImageData << std::endl;
-        /*
-        char binaryDataSeparator = 'Ö'; // sweden represent!
-        os << binaryDataSeparator;
-
-        if (nBytesImageData) {
-            char* buffer = reinterpret_cast<char*>(imageData);
-            os.write(buffer, nBytesImageData);
-        }
-        */
     }
 
 
-    TileIOResult TileIOResult::deserialize(std::istream& is) {
+    TileIOResult TileIOResult::deserializeMetaData(std::istream& is) {
         TileIOResult res;
         is >> res.dimensions.x >> res.dimensions.y >> res.dimensions.z;
         is >> res.chunkIndex.x >> res.chunkIndex.y >> res.chunkIndex.level;
@@ -146,12 +137,6 @@ namespace openspace {
         is >> binaryDataSeparator; // not used
         
         char* buffer = new char[res.nBytesImageData]();
-        /*is.read(buffer, res.nBytesImageData);
-        for (size_t i = 0; i < res.nBytesImageData; i++){
-            is.get(buffer[i]);
-        }
-        res.imageData = reinterpret_cast<void*>(buffer);
-        */
         return std::move(res);
     }
 
diff --git a/modules/globebrowsing/tile/tiledataset.h b/modules/globebrowsing/tile/tiledataset.h
index 8db37f67c4..d29db929b4 100644
--- a/modules/globebrowsing/tile/tiledataset.h
+++ b/modules/globebrowsing/tile/tiledataset.h
@@ -73,8 +73,8 @@ namespace openspace {
         CPLErr error;
         size_t nBytesImageData;
 
-        void serialize(std::ostream& s);
-        static TileIOResult deserialize(std::istream& s);
+        void serializeMetaData(std::ostream& s);
+        static TileIOResult deserializeMetaData(std::istream& s);
    
         static TileIOResult createDefaultRes();
 
diff --git a/modules/globebrowsing/tile/tilediskcache.cpp b/modules/globebrowsing/tile/tilediskcache.cpp
index df75d2884b..a8eb6effbb 100644
--- a/modules/globebrowsing/tile/tilediskcache.cpp
+++ b/modules/globebrowsing/tile/tilediskcache.cpp
@@ -55,19 +55,19 @@ namespace openspace {
     }
 
     bool TileDiskCache::has(const ChunkIndex& chunkIndex) const {
-        File metaFile = getMetaFile(chunkIndex);
+        File metaFile = getMetaDataFile(chunkIndex);
         return FileSys.fileExists(metaFile);
     }
 
 
     std::shared_ptr<TileIOResult> TileDiskCache::get(const ChunkIndex& chunkIndex) {
-        File metaFile = getMetaFile(chunkIndex);
+        File metaDataFile = getMetaDataFile(chunkIndex);
         File dataFile = getDataFile(chunkIndex);
-        if (FileSys.fileExists(metaFile) && FileSys.fileExists(dataFile)) {
+        if (FileSys.fileExists(metaDataFile) && FileSys.fileExists(dataFile)) {
             // read meta
             std::ifstream ifsMeta;
-            ifsMeta.open(metaFile.path(), std::ifstream::in);
-            TileIOResult res = TileIOResult::deserialize(ifsMeta);
+            ifsMeta.open(metaDataFile.path(), std::ifstream::in);
+            TileIOResult res = TileIOResult::deserializeMetaData(ifsMeta);
             ifsMeta.close();
 
             // read data
@@ -83,11 +83,11 @@ namespace openspace {
     }
 
     bool TileDiskCache::put(const ChunkIndex& chunkIndex, std::shared_ptr<TileIOResult> tileIOResult) {
-        File metaFile = getMetaFile(chunkIndex);
-        if (!FileSys.fileExists(metaFile)) {
+        File metaDataFile = getMetaDataFile(chunkIndex);
+        if (!FileSys.fileExists(metaDataFile)) {
             std::ofstream ofsMeta;
-            ofsMeta.open(metaFile.path());
-            tileIOResult->serialize(ofsMeta);
+            ofsMeta.open(metaDataFile.path());
+            tileIOResult->serializeMetaData(ofsMeta);
             ofsMeta.close();
 
             std::ofstream ofsData;
@@ -110,7 +110,7 @@ namespace openspace {
         return filePath;
     }
 
-    File TileDiskCache::getMetaFile(const ChunkIndex& chunkIndex) const {
+    File TileDiskCache::getMetaDataFile(const ChunkIndex& chunkIndex) const {
         return File(getFilePath(chunkIndex) + ".meta");
     }
 
diff --git a/modules/globebrowsing/tile/tilediskcache.h b/modules/globebrowsing/tile/tilediskcache.h
index 30cf72124f..87ceb3906e 100644
--- a/modules/globebrowsing/tile/tilediskcache.h
+++ b/modules/globebrowsing/tile/tilediskcache.h
@@ -53,7 +53,7 @@ namespace openspace {
         Directory _cacheDir;
         
         std::string getFilePath(const ChunkIndex& chunkIndex) const;
-        File getMetaFile(const ChunkIndex& chunkIndex) const;
+        File getMetaDataFile(const ChunkIndex& chunkIndex) const;
         File getDataFile(const ChunkIndex& chunkIndex) const;
 
     };