[vidalia-svn] r3494: Weight the relay placemark filtering based on the minimum of (vidalia/trunk/src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-01-31 18:56:04 -0500 (Sat, 31 Jan 2009)
New Revision: 3494

Modified:
   vidalia/trunk/src/vidalia/network/tormapwidget.cpp
Log:

Weight the relay placemark filtering based on the minimum of the three
bandwidth values.


Modified: vidalia/trunk/src/vidalia/network/tormapwidget.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/tormapwidget.cpp	2009-01-31 23:43:42 UTC (rev 3493)
+++ vidalia/trunk/src/vidalia/network/tormapwidget.cpp	2009-01-31 23:56:04 UTC (rev 3494)
@@ -69,6 +69,10 @@
   QString kml;
   qreal lon = geoip.longitude();
   qreal lat = geoip.latitude();
+  quint64 bw;
+  
+  bw = qMin(desc.averageBandwidth(), desc.burstBandwidth());
+  bw = qMin(bw, desc.observedBandwidth());
 
   kml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
              "<kml xmlns=\"http://earth.google.com/kml/2.0\";>"
@@ -85,7 +89,7 @@
   kml.append(QString("<role>1</role>"));
   kml.append(QString("<address>%1</address>").arg(geoip.toString()));
   kml.append(QString("<CountryNameCode>%1</CountryNameCode>").arg(geoip.country()));
-  kml.append(QString("<pop>%1</pop>").arg(10 * desc.observedBandwidth()));
+  kml.append(QString("<pop>%1</pop>").arg(10 * bw));
   kml.append(QString("<Point>"
                      "  <coordinates>%1,%2</coordinates>"
                      "</Point>").arg(lon).arg(lat));