Geometry changes for precision issues.

This also removes / cleans up a few classes that are
made partially redundant by this change.

Change-Id: Ib8118cc3e3df3ecd024a11184ff2523af43d7b03
Task-number: QTBUG-23413
Task-number: QTBUG-23501
Task-number: QTBUG-23166
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>

1 files changed, 4 insertions, 20 deletions

diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h
index 68ed7dab..50be8199 100644
--- a/src/location/maps/qgeomap_p_p.h
+++ b/src/location/maps/qgeomap_p_p.h
@@ -63,7 +63,6 @@
 #include <QSharedPointer>
 
 #include "qgeocameradata_p.h"
-#include "qgeofrustum_p.h"
 #include "qgeomaptype.h"
 
 #include "qdoublevector3d_p.h"
@@ -77,10 +76,11 @@ class QGeoTileCache;
 class QGeoTileSpec;
 class QGeoMap;
 class QGeoMapController;
-class QGeoMapSphere;
 class QGeoProjection;
 
 class QGeoCameraTiles;
+class QGeoMapImages;
+class QGeoMapGeometry;
 
 class QGLCamera;
 class QGLSceneNode;
@@ -109,13 +109,6 @@ public:
     int height() const;
     double aspectRatio() const;
 
-    QGLSceneNode* createTileSpecNode(const QGeoTileSpec &tileSpec);
-    QGLSceneNode* createTileNode(const QGeoTile &tile);
-
-    QRect specToRect(const QGeoTileSpec &tileSpec) const;
-
-    void update();
-
     const QGeoMapType activeMapType() const;
     void setActiveMapType(const QGeoMapType &mapType);
 
@@ -125,9 +118,6 @@ public:
     void tileFetched(const QGeoTileSpec &spec);
 
 private:
-    void updateGlCamera(QGLCamera* glCamera);
-    void updateFrustum(QGeoFrustum &frustum);
-
     int width_;
     int height_;
     double aspectRatio_;
@@ -140,15 +130,13 @@ private:
 
     QSharedPointer<QGeoProjection> projection_;
 
-    QGLCamera *glCamera_;
-
     QGeoCameraData cameraData_;
-    QGeoFrustum frustum_;
     QSet<QGeoTileSpec> visibleTiles_;
 
     QGeoCameraTiles *cameraTiles_;
+    QGeoMapGeometry *mapGeometry_;
+    QGeoMapImages *mapImages_;
 
-    QGeoMapSphere *sphere_;
     QGeoMapType activeMapType_;
 
     // from map2d_p.h
@@ -158,10 +146,6 @@ private:
 
     double baseHeight_;
     double sideLength_;
-
-    QSizeF viewSize_;
-    QDoubleVector3D eye_;
-    QMatrix4x4 projectionMatrix_;
 };
 
 QT_END_NAMESPACE