diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/pureimagecache.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/pureimagecache.cpp
index 676ad83a3..7bab34211 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/pureimagecache.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/pureimagecache.cpp
@@ -1,363 +1,363 @@
-/**
-******************************************************************************
-*
-* @file       pureimagecache.cpp
-* @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
-* @brief      
-* @see        The GNU Public License (GPL) Version 3
-* @defgroup   OPMapWidget
-* @{
-* 
-*****************************************************************************/
-/* 
-* This program is free software; you can redistribute it and/or modify 
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 3 of the License, or 
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful, but 
-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
-* for more details.
-* 
-* You should have received a copy of the GNU General Public License along 
-* with this program; if not, write to the Free Software Foundation, Inc., 
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "pureimagecache.h"
-#include <QDateTime>
- 
-//#define DEBUG_PUREIMAGECACHE
-namespace core {
-qlonglong PureImageCache::ConnCounter=0;
-
-PureImageCache::PureImageCache()
-{
-    gtilecache=QDir::currentPath()+QDir::separator()+"mapscache"+QDir::separator();
-}
-
-void PureImageCache::setGtileCache(const QString &value)
-{
-    gtilecache=value;
-}
-
-QString PureImageCache::GtileCache()
-{
-    return gtilecache;
-}
-
-
-bool PureImageCache::CreateEmptyDB(const QString &file)
-{
-#ifdef DEBUG_PUREIMAGECACHE
-    qDebug()<<"Create database at!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!:"<<file;
-#endif //DEBUG_PUREIMAGECACHE
-    QFileInfo File(file);
-    QDir dir=File.absoluteDir();
-    QString path=dir.absolutePath();
-    QString filename=File.fileName();
-    if(File.exists())   QFile(filename).remove();
-    if(!dir.exists())
-    {
-#ifdef DEBUG_PUREIMAGECACHE
-        qDebug()<<"CreateEmptyDB: Cache path doesn't exist, try to create";
-#endif //DEBUG_PUREIMAGECACHE
-        if(!dir.mkpath(path))
-        {
-#ifdef DEBUG_PUREIMAGECACHE
-            qDebug()<<"CreateEmptyDB: Could not create path";
-#endif //DEBUG_PUREIMAGECACHE
-            return false;
-        }
-    }
-    QSqlDatabase db;
-
-    db = QSqlDatabase::addDatabase("QSQLITE",QLatin1String("CreateConn"));
-    db.setDatabaseName(file);
-    if (!db.open())
-    {
-#ifdef DEBUG_PUREIMAGECACHE
-        qDebug()<<"CreateEmptyDB: Unable to create database";
-#endif //DEBUG_PUREIMAGECACHE
-
-        return false;
-    }
-    QSqlQuery query(db);
-    query.exec("CREATE TABLE IF NOT EXISTS Tiles (id INTEGER NOT NULL PRIMARY KEY, X INTEGER NOT NULL, Y INTEGER NOT NULL, Zoom INTEGER NOT NULL, Type INTEGER NOT NULL,Date TEXT)");
-    if(query.numRowsAffected()==-1)
-    {
-#ifdef DEBUG_PUREIMAGECACHE
-        qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
-#endif //DEBUG_PUREIMAGECACHE
-        db.close();
-        return false;
-    }
-    query.exec("CREATE TABLE IF NOT EXISTS TilesData (id INTEGER NOT NULL PRIMARY KEY CONSTRAINT fk_Tiles_id REFERENCES Tiles(id) ON DELETE CASCADE, Tile BLOB NULL)");
-    if(query.numRowsAffected()==-1)
-    {
-#ifdef DEBUG_PUREIMAGECACHE
-        qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
-#endif //DEBUG_PUREIMAGECACHE
-        db.close();
-        return false;
-    }
-    query.exec(           
-            "CREATE TRIGGER fki_TilesData_id_Tiles_id "
-            "BEFORE INSERT ON [TilesData] "
-            "FOR EACH ROW BEGIN "
-            "SELECT RAISE(ROLLBACK, 'insert on table TilesData violates foreign key constraint fki_TilesData_id_Tiles_id') "
-            "WHERE (SELECT id FROM Tiles WHERE id = NEW.id) IS NULL; "
-            "END");
-    if(query.numRowsAffected()==-1)
-    {
-#ifdef DEBUG_PUREIMAGECACHE
-        qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
-#endif //DEBUG_PUREIMAGECACHE
-        db.close();
-        return false;
-    }
-    query.exec(
-            "CREATE TRIGGER fku_TilesData_id_Tiles_id "
-            "BEFORE UPDATE ON [TilesData] "
-            "FOR EACH ROW BEGIN "
-            "SELECT RAISE(ROLLBACK, 'update on table TilesData violates foreign key constraint fku_TilesData_id_Tiles_id') "
-            "WHERE (SELECT id FROM Tiles WHERE id = NEW.id) IS NULL; "
-            "END");
-    if(query.numRowsAffected()==-1)
-    {
-#ifdef DEBUG_PUREIMAGECACHE
-        qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
-#endif //DEBUG_PUREIMAGECACHE
-        db.close();
-        return false;
-    }
-    query.exec(
-            "CREATE TRIGGER fkdc_TilesData_id_Tiles_id "
-            "BEFORE DELETE ON Tiles "
-            "FOR EACH ROW BEGIN "
-            "DELETE FROM TilesData WHERE TilesData.id = OLD.id; "
-            "END");
-    if(query.numRowsAffected()==-1)
-    {
-#ifdef DEBUG_PUREIMAGECACHE
-        qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
-#endif //DEBUG_PUREIMAGECACHE
-        db.close();
-        return false;
-    }
-    db.close();
-    QSqlDatabase::removeDatabase(QLatin1String("CreateConn"));
-    return true;
-}
-bool PureImageCache::PutImageToCache(const QByteArray &tile, const MapType::Types &type,const Point &pos,const int &zoom)
-{
-#ifdef DEBUG_PUREIMAGECACHE
-    qDebug()<<"PutImageToCache Start:";//<<pos;
-#endif //DEBUG_PUREIMAGECACHE
-    bool ret=true;
-    QDir d;
-    QString dir=gtilecache;
-    Mcounter.lock();
-    qlonglong id=++ConnCounter;
-    Mcounter.unlock();
-#ifdef DEBUG_PUREIMAGECACHE
-    qDebug()<<"PutImageToCache Cache dir="<<dir;
-    qDebug()<<"PutImageToCache Cache dir="<<dir<<" Try to PUT:"<<pos.ToString();
-#endif //DEBUG_PUREIMAGECACHE
-    if(!d.exists(dir))
-    {
-        d.mkdir(dir);
-#ifdef DEBUG_PUREIMAGECACHE
-        qDebug()<<"Create Cache directory";
-#endif //DEBUG_PUREIMAGECACHE
-    }
-    {
-        QString db=dir+"Data.qmdb";
-        if(!QFileInfo(db).exists())
-        {
-#ifdef DEBUG_PUREIMAGECACHE
-            qDebug()<<"Try to create EmptyDB";
-#endif //DEBUG_PUREIMAGECACHE
-            ret=CreateEmptyDB(db);
-        }
-        if(ret)
-        {
-            QSqlDatabase cn;
-
-            cn = QSqlDatabase::addDatabase("QSQLITE",QString::number(id));
-
-            cn.setDatabaseName(db);
-            if(cn.open())
-            {
-                {
-                    QSqlQuery query(cn);
-                    query.prepare("INSERT INTO Tiles(X, Y, Zoom, Type,Date) VALUES(?, ?, ?, ?,?)");
-                    query.addBindValue(pos.X());
-                    query.addBindValue(pos.Y());
-                    query.addBindValue(zoom);
-
-                    query.addBindValue((int)type);
-                    query.addBindValue(QDateTime::currentDateTime().toString());
-                    query.exec();
-                }
-                {
-                    QSqlQuery query(cn);
-                    query.prepare("INSERT INTO TilesData(id, Tile) VALUES((SELECT last_insert_rowid()), ?)");
-                    query.addBindValue(tile);
-                    query.exec();
-                }
-                cn.close();
-
-            }
-            else return false;
-        }
-        else
-        {
-#ifdef DEBUG_PUREIMAGECACHE
-            qDebug()<<"PutImageToCache Could not create DB";
-#endif //DEBUG_PUREIMAGECACHE
-            return false;
-        }
-    }
-    QSqlDatabase::removeDatabase(QString::number(id));
-    return true;
-}
-QByteArray PureImageCache::GetImageFromCache(MapType::Types type, Point pos, int zoom)
-{
-    bool ret=true;
-    QByteArray ar;
-    QString dir=gtilecache;
-    Mcounter.lock();
-    qlonglong id=++ConnCounter;
-    Mcounter.unlock();
-#ifdef DEBUG_PUREIMAGECACHE
-  //  qDebug()<<"Cache dir="<<dir<<" Try to GET:"<<pos.X()+","+pos.Y();
-#endif //DEBUG_PUREIMAGECACHE
-
-    {
-        QString db=dir+"Data.qmdb";
-        ret=QFileInfo(db).exists();
-        if(ret)
-        {
-            QSqlDatabase cn;
-
-            cn = QSqlDatabase::addDatabase("QSQLITE",QString::number(id));
-            cn.setDatabaseName(db);
-            if(cn.open())
-            {
-                {
-                    QSqlQuery query(cn);
-                    query.exec(QString("SELECT Tile FROM TilesData WHERE id = (SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4)").arg(pos.X()).arg(pos.Y()).arg(zoom).arg((int) type));
-                    query.next();
-                    if(query.isValid())
-                    {
-
-                        ar=query.value(0).toByteArray();
-                    }
-                }
-
-                cn.close();
-            }
-
-
-        }
-    }
-    QSqlDatabase::removeDatabase(QString::number(id));
-    return ar;
-}
-void PureImageCache::deleteOlderTiles(int const& days)
-{
-    QList<long> add;
-    bool ret=true;
-    QString dir=gtilecache;
-
-    {
-        QString db=dir+"Data.qmdb";
-        ret=QFileInfo(db).exists();
-        if(ret)
-        {
-            QSqlDatabase cn;
-            Mcounter.lock();
-            qlonglong id=++ConnCounter;
-            Mcounter.unlock();
-            cn = QSqlDatabase::addDatabase("QSQLITE",QString::number(id));
-            cn.setDatabaseName(db);
-            if(cn.open())
-            {
-                {
-                    QSqlQuery query(cn);
-                    query.exec(QString("SELECT id, X, Y, Zoom, Type, Date FROM Tiles"));
-                    while(query.next())
-                    {
-                        if(QDateTime::fromString(query.value(5).toString()).daysTo(QDateTime::currentDateTime())>days)
-                            add.append(query.value(0).toLongLong());
-                    }
-                    foreach(long i,add)
-                    {
-                        query.exec(QString("DELETE FROM Tiles WHERE id = %1;").arg(i));
-                    }
-                }
-
-                cn.close();
-            }
-            QSqlDatabase::removeDatabase(QString::number(id));
-        }
-    }
-}
-// PureImageCache::ExportMapDataToDB("C:/Users/Xapo/Documents/mapcontrol/debug/mapscache/data.qmdb","C:/Users/Xapo/Documents/mapcontrol/debug/mapscache/data2.qmdb");
-bool PureImageCache::ExportMapDataToDB(QString sourceFile, QString destFile)
-{
-    bool ret=true;
-    QList<long> add;
-    if(!QFileInfo(destFile).exists())
-    {
-#ifdef DEBUG_PUREIMAGECACHE
-        qDebug()<<"Try to create EmptyDB";
-#endif //DEBUG_PUREIMAGECACHE
-        ret=CreateEmptyDB(destFile);
-    }
-    if(!ret) return false;
-    QSqlDatabase ca = QSqlDatabase::addDatabase("QSQLITE","ca");
-    ca.setDatabaseName(sourceFile);
-
-    if(ca.open())
-    {
-        QSqlDatabase cb = QSqlDatabase::addDatabase("QSQLITE","cb");
-        cb.setDatabaseName(destFile);
-        if(cb.open())
-        {
-            QSqlQuery queryb(cb);
-            queryb.exec(QString("ATTACH DATABASE \"%1\" AS Source").arg(sourceFile));
-            QSqlQuery querya(ca);
-            querya.exec("SELECT id, X, Y, Zoom, Type, Date FROM Tiles");
-            while(querya.next())
-            {
-                long id=querya.value(0).toLongLong();
-                queryb.exec(QString("SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4;").arg(querya.value(1).toLongLong()).arg(querya.value(2).toLongLong()).arg(querya.value(3).toLongLong()).arg(querya.value(4).toLongLong()));
-                if(!queryb.next())
-                {
-                    add.append(id);
-                }
-
-            }
-            long f;
-            foreach(f,add)
-            {
-                queryb.exec(QString("INSERT INTO Tiles(X, Y, Zoom, Type, Date) SELECT X, Y, Zoom, Type, Date FROM Source.Tiles WHERE id=%1").arg(f));
-                queryb.exec(QString("INSERT INTO TilesData(id, Tile) Values((SELECT last_insert_rowid()), (SELECT Tile FROM Source.TilesData WHERE id=%1))").arg(f));
-            }
-            add.clear();
-            ca.close();
-            cb.close();
-
-        }
-        else return false;
-    }
-    else return false;
-    QSqlDatabase::removeDatabase("ca");
-    QSqlDatabase::removeDatabase("cb");
-    return true;
-
-}
-
-}
+/**
+******************************************************************************
+*
+* @file       pureimagecache.cpp
+* @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
+* @brief      
+* @see        The GNU Public License (GPL) Version 3
+* @defgroup   OPMapWidget
+* @{
+* 
+*****************************************************************************/
+/* 
+* This program is free software; you can redistribute it and/or modify 
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 3 of the License, or 
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful, but 
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+* for more details.
+* 
+* You should have received a copy of the GNU General Public License along 
+* with this program; if not, write to the Free Software Foundation, Inc., 
+* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+#include "pureimagecache.h"
+#include <QDateTime>
+
+//#define DEBUG_PUREIMAGECACHE
+namespace core {
+    qlonglong PureImageCache::ConnCounter=0;
+
+    PureImageCache::PureImageCache()
+    {
+        gtilecache=QDir::currentPath()+QDir::separator()+"mapscache"+QDir::separator();
+        QDir d;
+        if(!d.exists(gtilecache))
+        {
+            d.mkdir(gtilecache);
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"Create Cache directory";
+#endif //DEBUG_PUREIMAGECACHE
+        }
+        {
+            QString db=gtilecache+"Data.qmdb";
+            if(!QFileInfo(db).exists())
+            {
+#ifdef DEBUG_PUREIMAGECACHE
+                qDebug()<<"Try to create EmptyDB";
+#endif //DEBUG_PUREIMAGECACHE
+                CreateEmptyDB(db);
+            }
+        }
+    }
+
+    void PureImageCache::setGtileCache(const QString &value)
+    {
+        gtilecache=value;
+        QDir d;
+        if(!d.exists(gtilecache))
+        {
+            d.mkdir(gtilecache);
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"Create Cache directory";
+#endif //DEBUG_PUREIMAGECACHE
+        }
+        {
+            QString db=gtilecache+"Data.qmdb";
+            if(!QFileInfo(db).exists())
+            {
+#ifdef DEBUG_PUREIMAGECACHE
+                qDebug()<<"Try to create EmptyDB";
+#endif //DEBUG_PUREIMAGECACHE
+                CreateEmptyDB(db);
+            }
+        }
+    }
+    QString PureImageCache::GtileCache()
+    {
+        return gtilecache;
+    }
+
+
+    bool PureImageCache::CreateEmptyDB(const QString &file)
+    {
+#ifdef DEBUG_PUREIMAGECACHE
+        qDebug()<<"Create database at!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!:"<<file;
+#endif //DEBUG_PUREIMAGECACHE
+        QFileInfo File(file);
+        QDir dir=File.absoluteDir();
+        QString path=dir.absolutePath();
+        QString filename=File.fileName();
+        if(File.exists())
+            QFile(filename).remove();
+        if(!dir.exists())
+        {
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"CreateEmptyDB: Cache path doesn't exist, try to create";
+#endif //DEBUG_PUREIMAGECACHE
+            if(!dir.mkpath(path))
+            {
+#ifdef DEBUG_PUREIMAGECACHE
+                qDebug()<<"CreateEmptyDB: Could not create path";
+#endif //DEBUG_PUREIMAGECACHE
+                return false;
+            }
+        }
+        QSqlDatabase db;
+
+        db = QSqlDatabase::addDatabase("QSQLITE",QLatin1String("CreateConn"));
+        db.setDatabaseName(file);
+        if (!db.open())
+        {
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"CreateEmptyDB: Unable to create database";
+#endif //DEBUG_PUREIMAGECACHE
+
+            return false;
+        }
+        QSqlQuery query(db);
+        query.exec("CREATE TABLE IF NOT EXISTS Tiles (id INTEGER NOT NULL PRIMARY KEY, X INTEGER NOT NULL, Y INTEGER NOT NULL, Zoom INTEGER NOT NULL, Type INTEGER NOT NULL,Date TEXT)");
+        if(query.numRowsAffected()==-1)
+        {
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
+#endif //DEBUG_PUREIMAGECACHE
+            db.close();
+            return false;
+        }
+        query.exec("CREATE TABLE IF NOT EXISTS TilesData (id INTEGER NOT NULL PRIMARY KEY CONSTRAINT fk_Tiles_id REFERENCES Tiles(id) ON DELETE CASCADE, Tile BLOB NULL)");
+        if(query.numRowsAffected()==-1)
+        {
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
+#endif //DEBUG_PUREIMAGECACHE
+            db.close();
+            return false;
+        }
+        query.exec(
+                "CREATE TRIGGER fki_TilesData_id_Tiles_id "
+                "BEFORE INSERT ON [TilesData] "
+                "FOR EACH ROW BEGIN "
+                "SELECT RAISE(ROLLBACK, 'insert on table TilesData violates foreign key constraint fki_TilesData_id_Tiles_id') "
+                "WHERE (SELECT id FROM Tiles WHERE id = NEW.id) IS NULL; "
+                "END");
+        if(query.numRowsAffected()==-1)
+        {
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
+#endif //DEBUG_PUREIMAGECACHE
+            db.close();
+            return false;
+        }
+        query.exec(
+                "CREATE TRIGGER fku_TilesData_id_Tiles_id "
+                "BEFORE UPDATE ON [TilesData] "
+                "FOR EACH ROW BEGIN "
+                "SELECT RAISE(ROLLBACK, 'update on table TilesData violates foreign key constraint fku_TilesData_id_Tiles_id') "
+                "WHERE (SELECT id FROM Tiles WHERE id = NEW.id) IS NULL; "
+                "END");
+        if(query.numRowsAffected()==-1)
+        {
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
+#endif //DEBUG_PUREIMAGECACHE
+            db.close();
+            return false;
+        }
+        query.exec(
+                "CREATE TRIGGER fkdc_TilesData_id_Tiles_id "
+                "BEFORE DELETE ON Tiles "
+                "FOR EACH ROW BEGIN "
+                "DELETE FROM TilesData WHERE TilesData.id = OLD.id; "
+                "END");
+        if(query.numRowsAffected()==-1)
+        {
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"CreateEmptyDB: "<<query.lastError().driverText();
+#endif //DEBUG_PUREIMAGECACHE
+            db.close();
+            return false;
+        }
+        db.close();
+        QSqlDatabase::removeDatabase(QLatin1String("CreateConn"));
+        return true;
+    }
+    bool PureImageCache::PutImageToCache(const QByteArray &tile, const MapType::Types &type,const Point &pos,const int &zoom)
+    {
+#ifdef DEBUG_PUREIMAGECACHE
+        qDebug()<<"PutImageToCache Start:";//<<pos;
+#endif //DEBUG_PUREIMAGECACHE
+        Mcounter.lock();
+        qlonglong id=++ConnCounter;
+        Mcounter.unlock();
+        {
+            QSqlDatabase cn;
+            cn = QSqlDatabase::addDatabase("QSQLITE",QString::number(id));
+            QString db=gtilecache+"Data.qmdb";
+            cn.setDatabaseName(db);
+            if(cn.open())
+            {
+                {
+                    QSqlQuery query(cn);
+                    query.prepare("INSERT INTO Tiles(X, Y, Zoom, Type,Date) VALUES(?, ?, ?, ?,?)");
+                    query.addBindValue(pos.X());
+                    query.addBindValue(pos.Y());
+                    query.addBindValue(zoom);
+
+                    query.addBindValue((int)type);
+                    query.addBindValue(QDateTime::currentDateTime().toString());
+                    query.exec();
+                }
+                {
+                    QSqlQuery query(cn);
+                    query.prepare("INSERT INTO TilesData(id, Tile) VALUES((SELECT last_insert_rowid()), ?)");
+                    query.addBindValue(tile);
+                    query.exec();
+                }
+                cn.close();
+            }
+        }
+        QSqlDatabase::removeDatabase(QString::number(id));
+        return true;
+    }
+    QByteArray PureImageCache::GetImageFromCache(MapType::Types type, Point pos, int zoom)
+    {
+        bool ret=true;
+        QByteArray ar;
+        QString dir=gtilecache;
+        Mcounter.lock();
+        qlonglong id=++ConnCounter;
+        Mcounter.unlock();
+#ifdef DEBUG_PUREIMAGECACHE
+        //  qDebug()<<"Cache dir="<<dir<<" Try to GET:"<<pos.X()+","+pos.Y();
+#endif //DEBUG_PUREIMAGECACHE
+
+        {
+            QString db=dir+"Data.qmdb";
+            ret=QFileInfo(db).exists();
+            if(ret)
+            {
+                QSqlDatabase cn;
+
+                cn = QSqlDatabase::addDatabase("QSQLITE",QString::number(id));
+                cn.setDatabaseName(db);
+                if(cn.open())
+                {
+                    {
+                        QSqlQuery query(cn);
+                        query.exec(QString("SELECT Tile FROM TilesData WHERE id = (SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4)").arg(pos.X()).arg(pos.Y()).arg(zoom).arg((int) type));
+                        query.next();
+                        if(query.isValid())
+                        {
+
+                            ar=query.value(0).toByteArray();
+                        }
+                    }
+
+                    cn.close();
+                }
+
+
+            }
+        }
+        QSqlDatabase::removeDatabase(QString::number(id));
+        return ar;
+    }
+    void PureImageCache::deleteOlderTiles(int const& days)
+    {
+        QList<long> add;
+        bool ret=true;
+        QString dir=gtilecache;
+        {
+            QString db=dir+"Data.qmdb";
+            ret=QFileInfo(db).exists();
+            if(ret)
+            {
+                QSqlDatabase cn;
+                Mcounter.lock();
+                qlonglong id=++ConnCounter;
+                Mcounter.unlock();
+                cn = QSqlDatabase::addDatabase("QSQLITE",QString::number(id));
+                cn.setDatabaseName(db);
+                if(cn.open())
+                {
+                    {
+                        QSqlQuery query(cn);
+                        query.exec(QString("SELECT id, X, Y, Zoom, Type, Date FROM Tiles"));
+                        while(query.next())
+                        {
+                            if(QDateTime::fromString(query.value(5).toString()).daysTo(QDateTime::currentDateTime())>days)
+                                add.append(query.value(0).toLongLong());
+                        }
+                        foreach(long i,add)
+                        {
+                            query.exec(QString("DELETE FROM Tiles WHERE id = %1;").arg(i));
+                        }
+                    }
+
+                    cn.close();
+                }
+                QSqlDatabase::removeDatabase(QString::number(id));
+            }
+        }
+    }
+    // PureImageCache::ExportMapDataToDB("C:/Users/Xapo/Documents/mapcontrol/debug/mapscache/data.qmdb","C:/Users/Xapo/Documents/mapcontrol/debug/mapscache/data2.qmdb");
+    bool PureImageCache::ExportMapDataToDB(QString sourceFile, QString destFile)
+    {
+        bool ret=true;
+        QList<long> add;
+        if(!QFileInfo(destFile).exists())
+        {
+#ifdef DEBUG_PUREIMAGECACHE
+            qDebug()<<"Try to create EmptyDB";
+#endif //DEBUG_PUREIMAGECACHE
+            ret=CreateEmptyDB(destFile);
+        }
+        if(!ret) return false;
+        QSqlDatabase ca = QSqlDatabase::addDatabase("QSQLITE","ca");
+        ca.setDatabaseName(sourceFile);
+
+        if(ca.open())
+        {
+            QSqlDatabase cb = QSqlDatabase::addDatabase("QSQLITE","cb");
+            cb.setDatabaseName(destFile);
+            if(cb.open())
+            {
+                QSqlQuery queryb(cb);
+                queryb.exec(QString("ATTACH DATABASE \"%1\" AS Source").arg(sourceFile));
+                QSqlQuery querya(ca);
+                querya.exec("SELECT id, X, Y, Zoom, Type, Date FROM Tiles");
+                while(querya.next())
+                {
+                    long id=querya.value(0).toLongLong();
+                    queryb.exec(QString("SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4;").arg(querya.value(1).toLongLong()).arg(querya.value(2).toLongLong()).arg(querya.value(3).toLongLong()).arg(querya.value(4).toLongLong()));
+                    if(!queryb.next())
+                    {
+                        add.append(id);
+                    }
+
+                }
+                long f;
+                foreach(f,add)
+                {
+                    queryb.exec(QString("INSERT INTO Tiles(X, Y, Zoom, Type, Date) SELECT X, Y, Zoom, Type, Date FROM Source.Tiles WHERE id=%1").arg(f));
+                    queryb.exec(QString("INSERT INTO TilesData(id, Tile) Values((SELECT last_insert_rowid()), (SELECT Tile FROM Source.TilesData WHERE id=%1))").arg(f));
+                }
+                add.clear();
+                ca.close();
+                cb.close();
+
+            }
+            else return false;
+        }
+        else return false;
+        QSqlDatabase::removeDatabase("ca");
+        QSqlDatabase::removeDatabase("cb");
+        return true;
+
+    }
+
+}
diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/tilecachequeue.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/tilecachequeue.cpp
index 130963a24..166e66a29 100644
--- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/tilecachequeue.cpp
+++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/tilecachequeue.cpp
@@ -1,128 +1,128 @@
-/**
-******************************************************************************
-*
-* @file       tilecachequeue.cpp
-* @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
-* @brief      
-* @see        The GNU Public License (GPL) Version 3
-* @defgroup   OPMapWidget
-* @{
-* 
-*****************************************************************************/
-/* 
-* This program is free software; you can redistribute it and/or modify 
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation; either version 3 of the License, or 
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful, but 
-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
-* for more details.
-* 
-* You should have received a copy of the GNU General Public License along 
-* with this program; if not, write to the Free Software Foundation, Inc., 
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "tilecachequeue.h"
-
-
-//#define DEBUG_TILECACHEQUEUE
- 
-namespace core {
-TileCacheQueue::TileCacheQueue()
-{
-
-}
-TileCacheQueue::~TileCacheQueue()
-{
-   // QThread::wait(10000);
-}
-
-void TileCacheQueue::EnqueueCacheTask(CacheItemQueue *task)
-{
-#ifdef DEBUG_TILECACHEQUEUE
-    qDebug()<<"DB Do I EnqueueCacheTask"<<task->GetPosition().X()<<","<<task->GetPosition().Y();
-#endif //DEBUG_TILECACHEQUEUE
-    if(!tileCacheQueue.contains(task))
-    {
-#ifdef DEBUG_TILECACHEQUEUE
-        qDebug()<<"EnqueueCacheTask"<<task->GetPosition().X()<<","<<task->GetPosition().Y();
-#endif //DEBUG_TILECACHEQUEUE
-        mutex.lock();
-        tileCacheQueue.enqueue(task);
-        mutex.unlock();
-        if(this->isRunning())
-        {
-#ifdef DEBUG_TILECACHEQUEUE
-            qDebug()<<"Wake Thread";
-#endif //DEBUG_TILECACHEQUEUE
-            this->start(QThread::NormalPriority);
-            //waitmutex.lock();
-            waitc.wakeAll();
-            //waitmutex.unlock();
-        }
-        else
-        {
-#ifdef DEBUG_TILECACHEQUEUE
-            qDebug()<<"Start Thread";
-#endif //DEBUG_TILECACHEQUEUE
-            this->start(QThread::NormalPriority);
-        }
-    }
-
-}
-void TileCacheQueue::run()
-{
-#ifdef DEBUG_TILECACHEQUEUE
-    qDebug()<<"Cache Engine Start";
-#endif //DEBUG_TILECACHEQUEUE
-    while(true)
-    {
-        CacheItemQueue *task;
-#ifdef DEBUG_TILECACHEQUEUE
-        qDebug()<<"Cache";
-#endif //DEBUG_TILECACHEQUEUE
-        if(tileCacheQueue.count()>0)
-        {
-            mutex.lock();
-            task=tileCacheQueue.dequeue();
-            mutex.unlock();
-#ifdef DEBUG_TILECACHEQUEUE
-            qDebug()<<"Cache engine Put:"<<task->GetPosition().X()<<","<<task->GetPosition().Y();
-#endif //DEBUG_TILECACHEQUEUE
-            Cache::Instance()->ImageCache.PutImageToCache(task->GetImg(),task->GetMapType(),task->GetPosition(),task->GetZoom());
-            usleep(44);
-            delete task;
-        }
-
-        else
-        {
-            qDebug()<<"Cache engine BEGIN WAIT";
-            waitmutex.lock();
-            int tout=4000;
-            if(!waitc.wait(&waitmutex,tout))
-            {
-                waitmutex.unlock();
-#ifdef DEBUG_TILECACHEQUEUE
-                qDebug()<<"Cache Engine TimeOut";
-#endif //DEBUG_TILECACHEQUEUE
-                mutex.lock();
-                if(tileCacheQueue.count()==0)
-                {
-                    mutex.unlock();
-                    break;
-                }
-                mutex.unlock();
-            }
-            qDebug()<<"Cache Engine DID NOT TimeOut";
-            waitmutex.unlock();
-        }
-    }
-#ifdef DEBUG_TILECACHEQUEUE
-    qDebug()<<"Cache Engine Stopped";
-#endif //DEBUG_TILECACHEQUEUE
-}
-
-
-}
+/**
+******************************************************************************
+*
+* @file       tilecachequeue.cpp
+* @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
+* @brief      
+* @see        The GNU Public License (GPL) Version 3
+* @defgroup   OPMapWidget
+* @{
+* 
+*****************************************************************************/
+/* 
+* This program is free software; you can redistribute it and/or modify 
+* it under the terms of the GNU General Public License as published by 
+* the Free Software Foundation; either version 3 of the License, or 
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful, but 
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+* for more details.
+* 
+* You should have received a copy of the GNU General Public License along 
+* with this program; if not, write to the Free Software Foundation, Inc., 
+* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+#include "tilecachequeue.h"
+
+
+//#define DEBUG_TILECACHEQUEUE
+ 
+namespace core {
+TileCacheQueue::TileCacheQueue()
+{
+
+}
+TileCacheQueue::~TileCacheQueue()
+{
+   // QThread::wait(10000);
+}
+
+void TileCacheQueue::EnqueueCacheTask(CacheItemQueue *task)
+{
+#ifdef DEBUG_TILECACHEQUEUE
+    qDebug()<<"DB Do I EnqueueCacheTask"<<task->GetPosition().X()<<","<<task->GetPosition().Y();
+#endif //DEBUG_TILECACHEQUEUE
+    if(!tileCacheQueue.contains(task))
+    {
+#ifdef DEBUG_TILECACHEQUEUE
+        qDebug()<<"EnqueueCacheTask"<<task->GetPosition().X()<<","<<task->GetPosition().Y();
+#endif //DEBUG_TILECACHEQUEUE
+        mutex.lock();
+        tileCacheQueue.enqueue(task);
+        mutex.unlock();
+        if(this->isRunning())
+        {
+#ifdef DEBUG_TILECACHEQUEUE
+            qDebug()<<"Wake Thread";
+#endif //DEBUG_TILECACHEQUEUE
+            //this->start(QThread::NormalPriority);
+            //waitmutex.lock();
+            waitc.wakeAll();
+            //waitmutex.unlock();
+        }
+        else
+        {
+#ifdef DEBUG_TILECACHEQUEUE
+            qDebug()<<"Start Thread";
+#endif //DEBUG_TILECACHEQUEUE
+            this->start(QThread::NormalPriority);
+        }
+    }
+
+}
+void TileCacheQueue::run()
+{
+#ifdef DEBUG_TILECACHEQUEUE
+    qDebug()<<"Cache Engine Start";
+#endif //DEBUG_TILECACHEQUEUE
+    while(true)
+    {
+        CacheItemQueue *task;
+#ifdef DEBUG_TILECACHEQUEUE
+        qDebug()<<"Cache";
+#endif //DEBUG_TILECACHEQUEUE
+        if(tileCacheQueue.count()>0)
+        {
+            mutex.lock();
+            task=tileCacheQueue.dequeue();
+            mutex.unlock();
+#ifdef DEBUG_TILECACHEQUEUE
+            qDebug()<<"Cache engine Put:"<<task->GetPosition().X()<<","<<task->GetPosition().Y();
+#endif //DEBUG_TILECACHEQUEUE
+            Cache::Instance()->ImageCache.PutImageToCache(task->GetImg(),task->GetMapType(),task->GetPosition(),task->GetZoom());
+            usleep(44);
+            delete task;
+        }
+
+        else
+        {
+            qDebug()<<"Cache engine BEGIN WAIT";
+            waitmutex.lock();
+            int tout=4000;
+            if(!waitc.wait(&waitmutex,tout))
+            {
+                waitmutex.unlock();
+#ifdef DEBUG_TILECACHEQUEUE
+                qDebug()<<"Cache Engine TimeOut";
+#endif //DEBUG_TILECACHEQUEUE
+                mutex.lock();
+                if(tileCacheQueue.count()==0)
+                {
+                    mutex.unlock();
+                    break;
+                }
+                mutex.unlock();
+            }
+            qDebug()<<"Cache Engine DID NOT TimeOut";
+            waitmutex.unlock();
+        }
+    }
+#ifdef DEBUG_TILECACHEQUEUE
+    qDebug()<<"Cache Engine Stopped";
+#endif //DEBUG_TILECACHEQUEUE
+}
+
+
+}