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

[situare] / tests / coordinates / geocoordinate / testgeocoordinate.cpp

diff --git a/tests/coordinates/geocoordinate/testgeocoordinate.cpp b/tests/coordinates/geocoordinate/testgeocoordinate.cpp
index 0c95012..6efc36f 100644 (file)
--- a/tests/coordinates/geocoordinate/testgeocoordinate.cpp
+++ b/tests/coordinates/geocoordinate/testgeocoordinate.cpp
@@ -86,14 +86,14 @@ void TestGeoCoordinate::conversion_data()
     QTest::addColumn<SceneCoordinate>("sceneCoordinate");
     QTest::addColumn<GeoCoordinate>("result");
 
-    QTest::newRow("top left") << SceneCoordinate(MAP_MIN_PIXEL_X, MAP_MIN_PIXEL_Y)
-                              << GeoCoordinate(MAX_LATITUDE, MIN_LONGITUDE);
+    QTest::newRow("top left") << SceneCoordinate(OSM_MAP_MIN_PIXEL_X, OSM_MAP_MIN_PIXEL_Y)
+                              << GeoCoordinate(OSM_MAX_LATITUDE, MIN_LONGITUDE);
 
     const double LAST_SCENE_HORIZONTAL_PIXEL_LONGITUDE = MAX_LONGITUDE
                                                          - ONE_SCENE_PIXEL_WIDTH_IN_DEGREES;
 
-    QTest::newRow("bottom right") << SceneCoordinate(MAP_MAX_PIXEL_X, MAP_MAX_PIXEL_Y)
-                                  << GeoCoordinate(MIN_LATITUDE, LAST_SCENE_HORIZONTAL_PIXEL_LONGITUDE);
+    QTest::newRow("bottom right") << SceneCoordinate(OSM_MAP_MAX_PIXEL_X, OSM_MAP_MAX_PIXEL_Y)
+                                  << GeoCoordinate(OSM_MIN_LATITUDE, LAST_SCENE_HORIZONTAL_PIXEL_LONGITUDE);
 }
 
 void TestGeoCoordinate::isNull()