Added the current projection epsg value into the computed md5hex.

jiagithub · Mar 19, 2014 · d4503e9 · d4503e9
1 parent 6b94851
commit d4503e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/QMapControl/src/QMapControl/ImageManager.cpp b/QMapControl/src/QMapControl/ImageManager.cpp
@@ -29,6 +29,9 @@
 #include <QtCore/QCryptographicHash>
 #include <QtGui/QPainter>
 
+// Local includes.
+#include "Projection.h"
+
 namespace qmapcontrol
 {
     namespace
@@ -240,9 +243,8 @@ namespace qmapcontrol
 
     QString ImageManager::md5hex(const QUrl& url)
     {
-        // Return the md5 hex value of the given url at a specific tile size.
-        /// @todo encode projection into md5 hex as well.
-        return QString(QCryptographicHash::hash((url.toString() + QString::number(m_tile_size_px)).toUtf8(), QCryptographicHash::Md5).toHex());
+        // Return the md5 hex value of the given url at a specific projection and tile size.
+        return QString(QCryptographicHash::hash((url.toString() + QString::number(projection::get().epsg()) + QString::number(m_tile_size_px)).toUtf8(), QCryptographicHash::Md5).toHex());
     }
 
     QString ImageManager::persistentCacheFilename(const QUrl& url)

diff --git a/QMapControl/src/QMapControl/ImageManager.h b/QMapControl/src/QMapControl/ImageManager.h
@@ -83,10 +83,8 @@ namespace qmapcontrol
         /*!
          * Enables the persistent cache, specifying the directory and expiry timeout.
          * @param path The path where the images should be stored.
-         * @param expiry The max age (in minutes) of an image before its removed and a new one is
-         * requested (0 to keep forever).
+         * @param expiry The max age (in minutes) of an image before its removed and a new one is requested (0 to keep forever).
          * @return whether the persistent cache was enabled.
-         * @todo add maximum size?
          */
         bool enablePersistentCache(const std::chrono::minutes& expiry, const QDir& path);