Changeset 4670 in ntrip for trunk/BNC

Timestamp:

Sep 8, 2012, 11:41:28 PM (12 years ago)

Author:

weber

Message:

Keep lat/lon relations in distribution plot

File:

• trunk/BNC/src/bncmap_svg.cpp (modified) (2 diffs)

trunk/BNC/src/bncmap_svg.cpp

@@ -179 +179 @@
   double height = _maxPointLat - _minPointLat;
   if (width > 0 && height > 0) {
+
+    // Extend plot area by 10 percent
+    // ------------------------------
     double eps = 0.1;
     double epsLon    = eps * (_maxPointLon - _minPointLon);
@@ -186 +189 @@
     double minLon    = _minPointLon - epsLon;
     double minLat    = _minPointLat - epsLat;
-    if (minLon < -180.) minLon = -180.0;
-    if (minLat <  -90.) minLat =  -90.0;
-    if (widthExt < 270.0 && heightExt < 135.0) {
-      QRectF rect(minLon, minLat, widthExt, heightExt);
+
+    // Keep lat/lon relations
+    // ----------------------
+    double widthBorder = widthExt;
+    double heightBorder = heightExt;
+    double scale = widthExt/heightExt/2.;
+    if ( scale < 1.) {
+      widthBorder = widthExt / scale;
+      minLon = minLon - (widthBorder - widthExt)/2.;
+    }
+    else {
+      heightBorder = heightExt * scale;
+      minLat = minLat - (heightBorder - heightExt)/2.;
+    }
+
+    // Borders shall not exceed min or max values
+    // ------------------------------------------
+    if (minLon < -180.) minLon = -180.;
+    if (minLat <  -90.) minLat =  -90.;
+    double maxLat = minLat + heightBorder;
+    if ( maxLat >  90) minLat = minLat - (maxLat -  90.);
+    double maxLon = minLon + widthBorder;
+    if ( maxLon > 180) minLon = minLon - (maxLon - 180.);
+
+    // Area large enough to justify world map
+    // --------------------------------------
+    if (widthBorder < 270.0 && heightBorder < 135.0) {
+      QRectF rect(minLon, minLat, widthBorder, heightBorder);
       _mapPlotZoomer->zoom(rect);
     }