Merge branch 'master' of https://github.com/seandepagnier/weather_rou…

…ting_pi

.travis.yml

@@ -36,16 +36,13 @@ script:
   - mkdir build && cd build
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]];
     then
-       cmake -DCMAKE_BUILD_TYPE=Release ../;
-       make -sj2 package;
+       cmake -DCMAKE_BUILD_TYPE=Release ../ && make -sj2 package;
     fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]];
     then
-        cmake -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx312_opencpn50_macos109/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx312_opencpn50_macos109" -DCMAKE_INSTALL_PREFIX=/tmp/opencpn -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..;
-        make -sj2;
-        make create-pkg;
-        ls -l;
+        cmake -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx312_opencpn50_macos109/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx312_opencpn50_macos109" -DCMAKE_INSTALL_PREFIX=/tmp/opencpn -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 .. && make -sj2 && make create-pkg;
      fi
+  - ls -l;
 
 notifications:
     email: false

cmake/PluginConfigure.cmake

@@ -100,6 +100,25 @@ INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/s
 
 # SET(PROFILING 1)
 
+if (CMAKE_VERSION VERSION_LESS "3.1")
+  include(CheckCXXCompilerFlag)
+  CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+  CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+  if(COMPILER_SUPPORTS_CXX11)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    message(STATUS "Setting C++11 standard via CXX flags")
+  elseif(COMPILER_SUPPORTS_CXX0X)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    message(STATUS "Setting C++0x standard via CXX FLAGS")
+  else()
+        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+  endif()
+else ()
+  set (CMAKE_CXX_STANDARD 11)
+  message(STATUS "Setting C++11 standard via cmake standard mecahnism")
+endif ()
+
+
 #  IF NOT DEBUGGING CFLAGS="-O2 -march=native"
 IF(NOT MSVC)
  ADD_DEFINITIONS( "-fvisibility=hidden" )

src/RouteMap.cpp

@@ -83,6 +83,7 @@
 
 #define distance(X, Y) sqrt((X)*(X) + (Y)*(Y)) // much faster than hypot
 
+long RouteMapPosition::s_ID = 0;
 
 static double Swell(RouteMapConfiguration &configuration, double lat, double lon)
 {
@@ -2385,16 +2386,34 @@ void IsoChron::ResetDrawnFlag()
 bool RouteMapConfiguration::Update()
 {
     bool havestart = false, haveend = false;
-    for(std::list<RouteMapPosition>::iterator it = RouteMap::Positions.begin();
-        it != RouteMap::Positions.end(); it++) {
-        if(Start == (*it).Name) {
-            StartLat = (*it).lat;
-            StartLon = (*it).lon;
+    PlugIn_Waypoint waypoint;
+
+    if (!RouteGUID.IsEmpty()) {
+        havestart = true;
+        haveend = true;
+    }
+    else for(const auto &it : RouteMap::Positions ) {
+        if(Start == it.Name) {
+            double lat = it.lat;
+            double lon = it.lon;
+            if (!it.GUID.IsEmpty() && GetSingleWaypoint( it.GUID, &waypoint )) {
+                lat = waypoint.m_lat;
+                lon = waypoint.m_lon;
+            }
+            StartLat = lat;
+            StartLon = lon;
+
             havestart = true;
         }
-        if(End == (*it).Name) {
-            EndLat = (*it).lat;
-            EndLon = (*it).lon;
+        if(End == it.Name) {
+            double lat = it.lat;
+            double lon = it.lon;
+            if (!it.GUID.IsEmpty() && GetSingleWaypoint( it.GUID, &waypoint )) {
+                lat = waypoint.m_lat;
+                lon = waypoint.m_lon;
+            }
+            EndLat = lat;
+            EndLon = lon;
             haveend = true;
         }
     }

src/RouteMap.h

@@ -280,11 +280,13 @@ typedef std::list<IsoChron*> IsoChronList;
 
 struct RouteMapPosition {
     RouteMapPosition(wxString n, double lat0, double lon0, wxString guid = wxEmptyString)
-    : Name(n), GUID(guid), lat(lat0), lon(lon0) {}
+    : Name(n), GUID(guid), lat(lat0), lon(lon0) {ID = ++s_ID;}
 
     wxString Name;
     wxString GUID;
     double lat, lon;
+    long  ID;
+    static long s_ID;
 };
 
 struct RouteMapConfiguration {