Updated tests cases matching the new tabs

[situare] / src / map / mapcommon.h

diff --git a/src/map/mapcommon.h b/src/map/mapcommon.h
index 71f3819..3eeb869 100644 (file)
--- a/src/map/mapcommon.h
+++ b/src/map/mapcommon.h
@@ -43,13 +43,13 @@ const double MAP_SCENE_VERTICAL_OVERSIZE_FACTOR = 0.5; ///< MapScene vertical ov
 * @var MAP_SCENE_MIN_PIXEL_X
 * @brief First scene horizontal pixel
 */
-const int MAP_SCENE_MIN_PIXEL_X = -OMS_MAP_PIXELS_X * MAP_SCENE_VERTICAL_OVERSIZE_FACTOR;
+const int MAP_SCENE_MIN_PIXEL_X = -OSM_MAP_PIXELS_X * MAP_SCENE_VERTICAL_OVERSIZE_FACTOR;
 
 /**
 * @var MAP_SCENE_MAX_PIXEL_X
 * @brief Last scene horizontal pixel
 */
-const int MAP_SCENE_MAX_PIXEL_X = OMS_MAP_PIXELS_X * (1 + MAP_SCENE_VERTICAL_OVERSIZE_FACTOR) - 1;
+const int MAP_SCENE_MAX_PIXEL_X = OSM_MAP_PIXELS_X * (1 + MAP_SCENE_VERTICAL_OVERSIZE_FACTOR) - 1;
 
 ////////////////////////////////////////////////////////////////////////////////
 // DEFAULT VALUES
@@ -59,16 +59,9 @@ const int MAP_SCENE_MAX_PIXEL_X = OMS_MAP_PIXELS_X * (1 + MAP_SCENE_VERTICAL_OVE
 * @brief Maps Default zoom level, used when latest zoom level is not available.
 */
 const int MAP_DEFAULT_ZOOM_LEVEL = MAP_VIEW_MIN_ZOOM_LEVEL;
-
 const qreal MAP_DEFAULT_LONGITUDE = 0.0000;  ///< Default longitude value
 const qreal MAP_DEFAULT_LATITUDE = 0.0000; ///< Default latitude value
 
-/**
-* @var FRIEND_LOCATION_ICON_Z_LEVEL
-* @brief layer of friend location icon
-*/
-const int FRIEND_LOCATION_ICON_Z_LEVEL = MAP_SCENE_MIN_NORMAL_LEVEL + OSM_MAX_ZOOM_LEVEL + 1;
-
 const int GROUP_ITEM_FRIENDS_COUNT_X = 13;  ///< Group item friends count x value
 const int GROUP_ITEM_FRIENDS_COUNT_Y = 13;  ///< Group item friends count y value
 const int GROUP_ITEM_FRIENDS_COUNT_WIDTH = 17;  ///< Group item friends count width value
@@ -76,22 +69,14 @@ const int GROUP_ITEM_FRIENDS_COUNT_HEIGHT = 17; ///< Group item friends count he
 
 const int PRESS_MANHATTAN_LENGTH = 30;   ///< Friend/group item press manhattan length
 
-/**
-* @var OWN_LOCATION_ICON_Z_LEVEL
-* @brief layer of own location icon
-*/
-const int OWN_LOCATION_ICON_Z_LEVEL = FRIEND_LOCATION_ICON_Z_LEVEL + 1;
-
 const double MIN_LONGITUDE = -180.0;  ///< Minimum longitude value
 const double MAX_LONGITUDE = 180.0;  ///< Maximum longitude value
 
-const qreal EARTH_RADIUS = 6371.01;         ///< Earth radius in km
-
 const int MAP_GRID_PADDING = 0;  ///< Grid padding used in tile grid calculation
 
 const QString OSM_LICENSE = QString::fromUtf8("© OpenStreetMap contributors, CC-BY-SA");
 
-const int AUTO_CENTERING_DISABLE_DISTANCE = 100; ///< Distance in pixels
+const int AUTO_CENTERING_DISABLE_DISTANCE = 50; ///< Distance in pixels
 
 //String constants for storing map settings:
 const QString MAP_LAST_ZOOMLEVEL = "LAST_MAP_ZOOM_LEVEL";   ///< Maps last zoom level before logout
@@ -108,4 +93,15 @@ const QString ERROR_VALUE_NOT_FOUND_ON_SETTINGS = "Value_not_found";
 */
 const int UNDEFINED = INT_MIN;
 
+/**
+* @enum SceneItemZValues
+*
+* @brief Z level values for different MapScene items
+*/
+enum SceneItemZValues {
+    RouteItemZValue = MAP_SCENE_MIN_NORMAL_LEVEL + OSM_MAX_ZOOM_LEVEL + 1,
+    FriendLocationItemZValue,
+    GPSLocationItemZValue
+};
+
 #endif // MAPCOMMON_H