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

[situare] / src / coordinates / scenecoordinate.cpp

diff --git a/src/coordinates/scenecoordinate.cpp b/src/coordinates/scenecoordinate.cpp
index 923ad90..14965e6 100644 (file)
--- a/src/coordinates/scenecoordinate.cpp
+++ b/src/coordinates/scenecoordinate.cpp
@@ -19,10 +19,12 @@
     USA.
 */
 
+#include <cmath>
+
 #include <QDebug>
 
 #include "geocoordinate.h"
-#include "map/mapcommon.h"
+#include "map/osm.h"
 
 #include "scenecoordinate.h"
 
@@ -56,10 +58,10 @@ void SceneCoordinate::convertFrom(const GeoCoordinate &coordinate)
     double worldY = static_cast<double>((1.0 - log(tan(coordinate.latitude() * M_PI / 180.0) + 1.0
                                 / cos(coordinate.latitude() * M_PI / 180.0)) / M_PI) / 2.0);
 
-    m_x = worldX * MAX_TILES_PER_SIDE * TILE_SIZE_X;
-    m_y = worldY * MAX_TILES_PER_SIDE * TILE_SIZE_Y;
+    m_x = worldX * OSM_TILES_PER_SIDE * OSM_TILE_SIZE_X;
+    m_y = worldY * OSM_TILES_PER_SIDE * OSM_TILE_SIZE_Y;
 
-    normalize(m_x, MAP_MIN_PIXEL_X, MAP_MAX_PIXEL_X);
+    normalize(m_x, OSM_MAP_MIN_PIXEL_X, OSM_MAP_MAX_PIXEL_X);
 }
 
 bool SceneCoordinate::isNull() const