Updated to use better ODAPI version management

rgleason · Dec 26, 2018 · 44447c1 · 44447c1
1 parent d45e0f7
commit 44447c1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 28 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,8 +21,8 @@ SET(CPACK_PACKAGE_CONTACT "Jon Gough")
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "0")
-SET(VERSION_PATCH "16")
-SET(VERSION_DATE "14/12/2018")
+SET(VERSION_PATCH "18")
+SET(VERSION_DATE "26/12/2018")
 
 SET(BUNDLE_DATA FALSE)
 SET( CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build" )

diff --git a/extinclude/ODAPI.h b/extinclude/ODAPI.h
@@ -74,15 +74,21 @@ enum {
     TEXTPOINT_TEXT_BACKGROUND_TRANSPARANCY_DEFAULT = -1
 };
 
+struct ODAPIVersion_t {
+    int         ODAPIVersionMajor;
+    int         ODAPIVersionMinor;
+    ODAPIVersion_t() : ODAPIVersionMajor(ODAPI_VERSION_MAJOR), ODAPIVersionMinor(ODAPI_VERSION_MINOR) {}
+};
+
 struct HyperLinkList_t {
     wxString    sDescription;
     wxString    sLink;
     wxString    sType;
 };
 
 struct FindPointInAnyBoundary_t {
-    double  dLat;
-    double  dLon;
+    double      dLat;
+    double      dLon;
     wxString    sBoundaryType;
     wxString    sBoundaryState;
     wxString    sName;
@@ -107,10 +113,7 @@ struct FindClosestBoundaryLineCrossing_t {
     wxString    sBoundaryObjectType;
 };
 
-struct CreateBoundaryPoint_t {
-    int         ODAPIVersionMajor;
-    int         ODAPIVersionMinor;
-    CreateBoundaryPoint_t() : ODAPIVersionMajor(ODAPI_VERSION_MAJOR), ODAPIVersionMinor(ODAPI_VERSION_MINOR) {}
+struct CreateBoundaryPoint_t : public ODAPIVersion_t {
     wxString    name;
     wxString    iconname;
     double      lat;
@@ -127,10 +130,7 @@ struct CreateBoundaryPoint_t {
     std::list   <HyperLinkList_t *> BoundaryPointHyperLinkList;
 };
 
-struct CreateBoundary_t {
-    int         ODAPIVersionMajor;
-    int         ODAPIVersionMinor;
-    CreateBoundary_t() : ODAPIVersionMajor(ODAPI_VERSION_MAJOR), ODAPIVersionMinor(ODAPI_VERSION_MINOR) {}
+struct CreateBoundary_t : public ODAPIVersion_t {
     wxString    name;
     int         type;
     bool        pathIsActive;
@@ -144,10 +144,7 @@ struct CreateBoundary_t {
     std::list   <CreateBoundaryPoint_t *> BoundaryPointsList;
 };
 
-struct CreateTextPoint_t {
-    int         ODAPIVersionMajor;
-    int         ODAPIVersionMinor;
-    CreateTextPoint_t() : ODAPIVersionMajor(ODAPI_VERSION_MAJOR), ODAPIVersionMinor(ODAPI_VERSION_MINOR) {}
+struct CreateTextPoint_t : public ODAPIVersion_t{
     wxString    name;               //Point name
     wxString    iconname;           //Icon Name
     double      lat;
@@ -175,26 +172,17 @@ struct CreateTextPoint_t {
     bool        temporary;
 };
 
-struct DeleteTextPoint_t {
-    int         ODAPIVersionMajor;
-    int         ODAPIVersionMinor;
-    DeleteTextPoint_t() : ODAPIVersionMajor(ODAPI_VERSION_MAJOR), ODAPIVersionMinor(ODAPI_VERSION_MINOR) {}
+struct DeleteTextPoint_t : public ODAPIVersion_t {
     wxString    GUID;
 };
 
-struct AddPointIcon_t {
-    int         ODAPIVersionMajor;
-    int         ODAPIVersionMinor;
-    AddPointIcon_t() : ODAPIVersionMajor(ODAPI_VERSION_MAJOR), ODAPIVersionMinor(ODAPI_VERSION_MINOR) {}
+struct AddPointIcon_t : ODAPIVersion_t {
     wxBitmap    PointIcon;
     wxString    PointIconName;
     wxString    PointIconDescription;
 };
 
-struct DeletePointIcon_t {
-    int         ODAPIVersionMajor;
-    int         ODAPIVersionMinor;
-    DeletePointIcon_t() : ODAPIVersionMajor(ODAPI_VERSION_MAJOR), ODAPIVersionMinor(ODAPI_VERSION_MINOR) {}
+struct DeletePointIcon_t :ODAPIVersion_t {
     wxString    PointIconName;
 };