Changeset 18827

Timestamp:

04/14/17 17:18:31 (8 years ago)

Author:

tbretz

Message:

Changed to upper case, automatically convert to upper case, use an invalid default if string is invalid, added isValid

File:

• trunk/Mars/mcore/nova.h (modified) (2 diffs)

trunk/Mars/mcore/nova.h

@@ -4 +4 @@
 #include <map>
 #include <string>
+#include <algorithm>
 
 #include <libnova/solar.h>
@@ -38 +39 @@
         LnLatPosn() { }
         LnLatPosn(const ln_lnlat_posn &pos) : ln_lnlat_posn(pos) { }
-        LnLatPosn(const std::string &obs)
+        LnLatPosn(std::string obs)
         {
 #ifndef __CINT__
             static const std::map<std::string, ln_lnlat_posn> lut =
             {
-                { "orm",  kORM  },
-                { "hawc", kHAWC },
-                { "spm",  kSPM  },
+                { "ORM",  kORM  },
+                { "HAWC", kHAWC },
+                { "SPM",  kSPM  },
             };
 
+            for (auto &c: obs)
+                c = toupper(c);
+
             const auto it = lut.find(obs);
-            *this = it==lut.end() ? ln_lnlat_posn({0,0}) : it->second;
-#endif
+            *this = it==lut.end() ? ln_lnlat_posn({std::numeric_limits<double>::quiet_NaN(),std::numeric_limits<double>::quiet_NaN()}) : it->second;
+#endif
+        }
+        bool isValid() const
+        {
+            return std::isfinite(lat) && std::isfinite(lng);
         }
     };