Cleans up the projection code.

There was no longer any point in providing the
screen <-> 3d scene position functions, which
meant that the projection class was just
doing coordinate <-> mercator conversions and
intepolating coordinates.

The interpolation code was moved out and the
mercator conversions were made static.

We have future changes coming which will allow
people who want different projections to provide
them, so it's not to big a deal to specialize
the class towards the mercator projection.

There were some other small changes made which
make the map actually pay attention to the size
of the tiles and the maximum zoom level as per
the plugin.

Actually enforcing the tilt / bearing / zoom
parameters will appear in a separate commit
before very long.

Change-Id: I31dc39165bde123fbe8e3e2e70e401c5d73932b3
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>

1 files changed, 1 insertions, 11 deletions

diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h
index 50be8199..f6f0c5a3 100644
--- a/src/location/maps/qgeomap_p_p.h
+++ b/src/location/maps/qgeomap_p_p.h
@@ -89,7 +89,7 @@ class QGLPainter;
 class QGeoMapPrivate
 {
 public:
-    QGeoMapPrivate(QGeoMap *parent, QGeoTileCache *cache, int maxZoom, int tileSize);
+    QGeoMapPrivate(QGeoMap *parent, QGeoTileCache *cache);
     virtual ~QGeoMapPrivate();
 
     QGeoTileCache* tileCache();
@@ -128,8 +128,6 @@ private:
     QString pluginString_;
     QGeoMapController *controller_;
 
-    QSharedPointer<QGeoProjection> projection_;
-
     QGeoCameraData cameraData_;
     QSet<QGeoTileSpec> visibleTiles_;
 
@@ -138,14 +136,6 @@ private:
     QGeoMapImages *mapImages_;
 
     QGeoMapType activeMapType_;
-
-    // from map2d_p.h
-
-    int maxZoom_;
-    int tileSize_;
-
-    double baseHeight_;
-    double sideLength_;
 };
 
 QT_END_NAMESPACE