Created osm.h, re-factoring, unit test script bug fix

[situare] / tests / map / mapengine / testmapengine.cpp

diff --git a/tests/map/mapengine/testmapengine.cpp b/tests/map/mapengine/testmapengine.cpp
index 3cdb973..bad3b73 100644 (file)
--- a/tests/map/mapengine/testmapengine.cpp
+++ b/tests/map/mapengine/testmapengine.cpp
@@ -68,11 +68,11 @@ void TestMapEngine::convertLatLonToSceneCoordinate_data()
     QTest::addColumn<QPointF>("coordinate");
     QTest::addColumn<QPoint>("result");
 
-    QTest::newRow("top left") << QPointF(MIN_LONGITUDE, MAX_LATITUDE) << QPoint(0, 0);
+    QTest::newRow("top left") << QPointF(MIN_LONGITUDE, OSM_MAX_LATITUDE) << QPoint(0, 0);
 
-    int x = (1 << MAX_MAP_ZOOM_LEVEL) * TILE_SIZE_X;
-    int y = (1 << MAX_MAP_ZOOM_LEVEL) * TILE_SIZE_Y;
-    QTest::newRow("bottom right") << QPointF(MAX_LONGITUDE, MIN_LATITUDE) << QPoint(x, y);
+    int x = (1 << OSM_MAX_ZOOM_LEVEL) * OSM_TILE_SIZE_X;
+    int y = (1 << OSM_MAX_ZOOM_LEVEL) * OSM_TILE_SIZE_Y;
+    QTest::newRow("bottom right") << QPointF(MAX_LONGITUDE, OSM_MIN_LATITUDE) << QPoint(x, y);
 }
 
 /**
@@ -105,7 +105,7 @@ void TestMapEngine::setLocationNewTilesCount()
 
     // move one tile to east and south, only most right one column and most bottom one row tiles
     // should be downloaded
-    emit setCenterPosition(QPoint((1220+TILE_SIZE_X)*16, (1220+TILE_SIZE_Y)*16));
+    emit setCenterPosition(QPoint((1220+OSM_TILE_SIZE_X)*16, (1220+OSM_TILE_SIZE_Y)*16));
     QTest::qWait(1000);
     QCOMPARE(fetchImageSpy.count(), 4 + 4);
     fetchImageSpy.clear();
@@ -208,7 +208,7 @@ void TestMapEngine::usingLastLocation()
     QVERIFY(parameters.at(0).toInt() == DEFAULT_TEST_ZOOMLEVEL);
 
     parameters = mapEngineSpy.takeFirst();
-    QVERIFY(parameters.at(0).toInt() == DEFAULT_START_ZOOM_LEVEL);
+    QVERIFY(parameters.at(0).toInt() == MAP_DEFAULT_ZOOM_LEVEL);
 
     // Call set location with know parameter to get location changed
     // Store new location and zoomlevel to settings