Merge branch 'master' into settings_auto_update

[situare] / src / map / ownlocationitem.cpp

diff --git a/src/map/ownlocationitem.cpp b/src/map/ownlocationitem.cpp
index 1b4dcbf..804ee1b 100644 (file)
--- a/src/map/ownlocationitem.cpp
+++ b/src/map/ownlocationitem.cpp
@@ -21,83 +21,17 @@
 
 #include <QDebug>
 
-#include "ownlocationitem.h"
-#include "mapengine.h"
 #include "mapcommon.h"
 
+#include "ownlocationitem.h"
+
 OwnLocationItem::OwnLocationItem()
 {
     qDebug() << __PRETTY_FUNCTION__;
+    QPixmap ownLocationIcon(":/res/images/led_red.png");
+    setPixmap(ownLocationIcon);
 
-    QPixmap ownLocationIcon(":/res/images/led_red_h.png");
-    if (!ownLocationIcon.isNull()){
-        setPixmap(ownLocationIcon);
-
-        QPointF defaultLocation(DEFAULT_LONGITUDE,DEFAULT_LATITUDE);
-
-        setPos(MapEngine::convertLatLonToSceneCoordinate(defaultLocation));
-        setZValue(OWN_LOCATION_ICON_Z_LEVEL);
-        setOffset(-MAP_OWN_LOCATION_ICON_SIZE/2, -MAP_OWN_LOCATION_ICON_SIZE/2);
-        setFlag(QGraphicsItem::ItemIgnoresTransformations);
-    }
-
-    else
-        qDebug() << "Own Location Icon cannot be loaded";
-}
-
-OwnLocationItem::OwnLocationItem(const qreal &longitude, const qreal &latitude)
-{
-    QPointF ownPosition(longitude,latitude);
-
-    QPixmap ownLocationIcon(":/res/images/led_red_h.png");
-    if (!ownLocationIcon.isNull()){
-        setPixmap(ownLocationIcon);
-
-        setPos(MapEngine::convertLatLonToSceneCoordinate(ownPosition));
-        setZValue(OWN_LOCATION_ICON_Z_LEVEL);
-        setOffset(-MAP_OWN_LOCATION_ICON_SIZE/2, -MAP_OWN_LOCATION_ICON_SIZE/2);
-        setFlag(QGraphicsItem::ItemIgnoresTransformations);
-    }
-
-    else
-        qDebug() << "Own Location Icon cannot be loaded";
-}
-
-OwnLocationItem::OwnLocationItem(const QPointF & ownPosition)
-{
-    QPixmap ownLocationIcon(":/res/images/led_red_h.png");
-    if (!ownLocationIcon.isNull()){
-        setPixmap(ownLocationIcon);
-
-        setPos(MapEngine::convertLatLonToSceneCoordinate(ownPosition));
-        setZValue(OWN_LOCATION_ICON_Z_LEVEL);
-        setOffset(-MAP_OWN_LOCATION_ICON_SIZE/2, -MAP_OWN_LOCATION_ICON_SIZE/2);
-        setFlag(QGraphicsItem::ItemIgnoresTransformations);
-    }
-
-    else
-        qDebug() << "Own Location Icon cannot be loaded";
-}
-
-void OwnLocationItem::setPosition(const QPointF & newPosition)
-{
-    setPos(MapEngine::convertLatLonToSceneCoordinate(newPosition));
-}
-
-QPoint OwnLocationItem::position() const
-{
-    QPointF currentPosition;
-    currentPosition = pos();
-
-    return currentPosition.toPoint();
-}
-
-void OwnLocationItem::hideOwnLocation()
-{
-    hide();
-}
-
-void OwnLocationItem::showOwnLocation()
-{
-    show();
+    setPos(QPoint(UNDEFINED, UNDEFINED));
+    setZValue(OWN_LOCATION_ICON_Z_LEVEL);
+    setOffset(-ownLocationIcon.width()/2, -ownLocationIcon.height()/2);
 }