[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/dataengines/weather/ions
From:       Shawn Starr <shawn.starr () rogers ! com>
Date:       2009-03-31 20:41:26
Message-ID: 1238532086.541066.25483.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 947594 by spstarr:

Export lat/long from envcan ion, we can use for marble fun

 M  +17 -0     ion_envcan.cpp  
 M  +4 -0      ion_envcan.h  


--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.cpp #947593:947594
@@ -811,6 +811,8 @@
     data.condition = "N/A";
     data.comforttemp = "N/A";
     data.stationID = "N/A";
+    data.stationLat = "N/A";
+    data.stationLon = "N/A";
     data.pressure = 0.0;
     data.pressureTendency = "N/A";
     data.visibility = 0;
@@ -827,6 +829,8 @@
         if (xml.isStartElement()) {
             if (xml.name() == "station") {
                 data.stationID = xml.attributes().value("code").toString();
+                data.stationLat = xml.attributes().value("lat").toString();
+                data.stationLon = xml.attributes().value("lon").toString();
             } else if (xml.name() == "dateTime") {
                 parseDateTime(data, xml);
             } else if (xml.name() == "condition") {
@@ -1281,6 +1285,9 @@
     setData(source, "Region", region(source));
     setData(source, "Station", station(source));
 
+    setData(source, "Latitude", latitude(source));
+    setData(source, "Longitude", longitude(source));
+   
     // Real weather - Current conditions
     setData(source, "Observation Period", observationTime(source));
     setData(source, "Current Conditions", condition(source));
@@ -1471,6 +1478,16 @@
     return "N/A";
 }
 
+QString EnvCanadaIon::latitude(const QString& source)
+{    
+    return d->m_weatherData[source].stationLat;
+}
+
+QString EnvCanadaIon::longitude(const QString& source)
+{
+    return d->m_weatherData[source].stationLon;
+}
+
 QString EnvCanadaIon::observationTime(const QString& source)
 {
     return d->m_weatherData[source].obsTimestamp;
--- trunk/KDE/kdebase/workspace/plasma/dataengines/weather/ions/ion_envcan.h #947593:947594
@@ -71,6 +71,8 @@
     QString cityName;
     QString regionName;
     QString stationID;
+    QString stationLat;
+    QString stationLon;
 
     // Current observation information.
     QString obsTimestamp;
@@ -165,6 +167,8 @@
     QString city(const QString& source);
     QString region(const QString& source);
     QString station(const QString& source);
+    QString latitude(const QString& source);
+    QString longitude(const QString& source);
 
     // Current Conditions Weather info
     QString observationTime(const QString& source);
[prev in list] [next in list] [prev in thread] [next in thread]