[Marble-commits] branches/KDE/4.3/kdeedu/marble/src/lib

[Torsten Rahn]

SVN commit 1002190 by rahn:

- Forward port of 1002189. Fixes LineString pole display regression.



 M  +8 -0      ViewportParams.cpp  
 M  +2 -0      ViewportParams.h  


--- branches/KDE/4.3/kdeedu/marble/src/lib/ViewportParams.cpp #1002189:1002190
@@ -339,6 +339,14 @@
     return latLonBox.width() + latLonBox.height() > 2.0 * angularResolution();
 }
 
+
+bool ViewportParams::resolves ( const GeoDataLatLonAltBox &latLonAltBox ) const
+{
+    return    latLonAltBox.width() + latLonAltBox.height() > 2.0 * angularResolution()
+           || latLonAltBox.maxAltitude() - latLonAltBox.minAltitude() > 10000;
+           
+}
+
 bool ViewportParams::resolves ( const GeoDataCoordinates &coord1, 
                                 const GeoDataCoordinates &coord2 ) const
 {
--- branches/KDE/4.3/kdeedu/marble/src/lib/ViewportParams.h #1002189:1002190
@@ -70,6 +70,8 @@
 
     bool resolves ( const GeoDataLatLonBox &latLonBox ) const;
 
+    bool resolves ( const GeoDataLatLonAltBox &latLonAltBox ) const;
+
     // Determines whether two points are located enough apart so that it makes 
     // sense to display them as distinct points. If this is not the case
     // calculation and drawing of one point can be skipped as only a single