Merge pull request seandepagnier#206 from did-g/guid

Add GUID to route and position.
rgleason · Jun 8, 2018 · 536da9d · 536da9d
2 parents 8ef61d6 + d7415ae
commit 536da9d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/RouteMap.h b/src/RouteMap.h
@@ -279,17 +279,19 @@ class IsoChron
 typedef std::list<IsoChron*> IsoChronList;
 
 struct RouteMapPosition {
-    RouteMapPosition(wxString n, double lat0, double lon0)
-    : Name(n), lat(lat0), lon(lon0) {}
+    RouteMapPosition(wxString n, double lat0, double lon0, wxString guid = wxEmptyString)
+    : Name(n), GUID(guid), lat(lat0), lon(lon0) {}
 
     wxString Name;
+    wxString GUID;
     double lat, lon;
 };
 
 struct RouteMapConfiguration {
     RouteMapConfiguration () : StartLon(0), EndLon(0), grib_is_data_deficient(false) {} /* avoid waiting forever in update longitudes */
     bool Update();
 
+    wxString RouteGUID;       /* Route GUID if any */
     wxString Start, End;
     wxDateTime StartTime;
 

diff --git a/src/WeatherRouting.cpp b/src/WeatherRouting.cpp
@@ -419,7 +419,7 @@ void WeatherRouting::AddPosition(double lat, double lon)
         AddPosition(lat, lon, pd.GetValue());
 }
 
-void WeatherRouting::AddPosition(double lat, double lon, wxString name)
+void WeatherRouting::AddPosition(double lat, double lon, wxString name, wxString GUID)
 {
     for(std::list<RouteMapPosition>::iterator it = RouteMap::Positions.begin();
         it != RouteMap::Positions.end(); it++) {
@@ -430,6 +430,7 @@ void WeatherRouting::AddPosition(double lat, double lon, wxString name)
                 long index = m_panel->m_lPositions->FindItem(0, name);
                 (*it).lat = lat;
                 (*it).lon = lon;
+                (*it).GUID = wxEmptyString;
                 m_panel->m_lPositions->SetItem(index, POSITION_LAT, wxString::Format(_T("%.5f"), lat));
                 m_panel->m_lPositions->SetColumnWidth(POSITION_LAT, wxLIST_AUTOSIZE);
                 m_panel->m_lPositions->SetItem(index, POSITION_LON, wxString::Format(_T("%.5f"), lon));
@@ -441,7 +442,7 @@ void WeatherRouting::AddPosition(double lat, double lon, wxString name)
         }
     }
 
-    RouteMap::Positions.push_back(RouteMapPosition(name, lat, lon));
+    RouteMap::Positions.push_back(RouteMapPosition(name, lat, lon, GUID));
     UpdateConfigurations();
 
     wxListItem item;
@@ -1352,6 +1353,7 @@ bool WeatherRouting::OpenXML(wxString filename, bool reportfailure)
 
             if(!strcmp(e->Value(), "Position")) {
                 wxString name = wxString::FromUTF8(e->Attribute("Name"));
+                wxString GUID = wxString::FromUTF8(e->Attribute("GUID"));
                 double lat = AttributeDouble(e, "Latitude", NAN);
                 double lon = AttributeDouble(e, "Longitude", NAN);
 
@@ -1369,12 +1371,13 @@ bool WeatherRouting::OpenXML(wxString filename, bool reportfailure)
                         goto skipadd;
                     }
                 }
-                AddPosition(lat, lon, name);
+                AddPosition(lat, lon, name, GUID);
 
             skipadd:;
             } else
                 if(!strcmp(e->Value(), "Configuration")) {
                     RouteMapConfiguration configuration;
+                    configuration.RouteGUID = wxString::FromUTF8(e->Attribute("GUID"));
                     configuration.Start = wxString::FromUTF8(e->Attribute("Start"));
                     wxDateTime date;
                     date.ParseISODate(wxString::FromUTF8(e->Attribute("StartDate")));
@@ -1492,6 +1495,8 @@ void WeatherRouting::SaveXML(wxString filename)
         c->SetAttribute("Name", (*it).Name.mb_str());
         c->SetAttribute("Latitude", wxString::Format(_T("%.5f"), (*it).lat).mb_str());
         c->SetAttribute("Longitude", wxString::Format(_T("%.5f"), (*it).lon).mb_str());
+        if (!(*it).GUID.IsEmpty())
+            c->SetAttribute("GUID", (*it).GUID.mb_str());
 
         root->LinkEndChild(c);
     }
@@ -1503,6 +1508,9 @@ void WeatherRouting::SaveXML(wxString filename)
         RouteMapConfiguration configuration =
             (*it)->routemapoverlay->GetConfiguration();
 
+        if (!configuration.RouteGUID.IsEmpty())
+            c->SetAttribute("GUID", configuration.RouteGUID.mb_str());
+
         c->SetAttribute("Start", configuration.Start.mb_str());
         c->SetAttribute("StartDate", configuration.StartTime.FormatISODate().mb_str());
         c->SetAttribute("StartTime", configuration.StartTime.FormatISOTime().mb_str());

diff --git a/src/WeatherRouting.h b/src/WeatherRouting.h
@@ -109,7 +109,7 @@ class WeatherRouting : public WeatherRoutingBase
     void UpdateDisplaySettings();
 
     void AddPosition(double lat, double lon);
-    void AddPosition(double lat, double lon, wxString name);
+    void AddPosition(double lat, double lon, wxString name, wxString GUID = wxEmptyString);
 
     void CursorRouteChanged();
     void UpdateColumns();