Namespaces

Better File handling

utilities/include/stringExtensions.hpp

@@ -1,53 +0,0 @@
-#ifndef GERMANAIRLINESVA_GACONNECTOR_STRINGEXTENSIONS_H
-#define GERMANAIRLINESVA_GACONNECTOR_STRINGEXTENSIONS_H
-
-#include <algorithm>
-#include <sstream>
-#include <string>
-#include <vector>
-
-// trim from start (in place)
-static inline void ltrim(std::string &s)
-{
-  s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
-            return !std::isspace(ch);
-          }));
-}
-
-// trim from end (in place)
-static inline void rtrim(std::string &s)
-{
-  s.erase(std::find_if(s.rbegin(),
-                       s.rend(),
-                       [](unsigned char ch) { return !std::isspace(ch); })
-              .base(),
-          s.end());
-}
-
-static inline std::string rtrim_copy(std::string s)
-{
-  rtrim(s);
-  return s;
-}
-
-// trim from both ends (in place)
-static inline void trim(std::string &s)
-{
-  ltrim(s);
-  rtrim(s);
-}
-
-static inline std::vector<std::string> split(const std::string &s, char delim)
-{
-  std::vector<std::string> result;
-  std::stringstream ss(s);
-  std::string item;
-
-  while (getline(ss, item, delim)) {
-    result.push_back(item);
-  }
-
-  return result;
-}
-
-#endif

utilities/include/util.hpp

@@ -31,54 +31,15 @@
 #endif
 
 #include <cmath>
+#include <fstream>
 #include <functional>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
-namespace util
+namespace germanairlinesva_util
 {
-  static inline double to_feet(double value) { return value * 3.280839895; }
-
-  static inline double to_degrees(double value) { return value * 180 / M_PI; }
-
-  static inline double to_radians(double value) { return value * M_PI / 180; }
-
-  static inline double normalize(double value)
-  {
-    return fmod(value + 360, 360);
-  }
-
-  static inline double bearing(double fromLatitude,
-                               double fromLongitude,
-                               double toLatitude,
-                               double toLongitude)
-  {
-    double y = sin(to_radians(toLongitude) - to_radians(fromLongitude)) *
-               cos(to_radians(toLatitude));
-    double x = cos(to_radians(fromLatitude)) * sin(to_radians(toLatitude)) -
-               sin(to_radians(fromLatitude)) * cos(to_radians(toLatitude)) *
-                   cos(to_radians(toLongitude) - to_radians(fromLongitude));
-
-    return normalize(to_degrees(atan2(y, x)));
-  }
-
-  static inline double distanceEarth(double fromLatitude,
-                                     double fromLongitude,
-                                     double toLatitude,
-                                     double toLongitude)
-  {
-    double lat1r, lon1r, lat2r, lon2r, u, v;
-    lat1r = to_radians(fromLatitude);
-    lon1r = to_radians(fromLongitude);
-    lat2r = to_radians(toLatitude);
-    lon2r = to_radians(toLongitude);
-    u = sin((lat2r - lat1r) / 2);
-    v = sin((lon2r - lon1r) / 2);
-    return 2.0 * EARTH_M * asin(sqrt(u * u + cos(lat1r) * cos(lat2r) * v * v));
-  }
-
   template <typename T>
   static inline std::vector<T>
       select_T(const std::vector<T> &inVec,
@@ -90,7 +51,7 @@ namespace util
   }
 
 #if defined APL || defined LIN
-  static unsigned long get_size_by_fd(int fd)
+  static inline unsigned long get_size_by_fd(int fd)
   {
     struct stat buf {
     };
@@ -100,7 +61,7 @@ namespace util
   }
 #endif
 
-  static void to_hex(const char *hash, char *buffer)
+  static inline void to_hex(const char *hash, char *buffer)
   {
     for (int i = 0; i < MD5LEN; i++) {
       if (buffer != nullptr) {
@@ -109,6 +70,11 @@ namespace util
     }
   }
 
+  static inline bool fileExists(const char *path)
+  {
+    return static_cast<bool>(std::ifstream(path));
+  }
+
 #ifdef IBM
   static inline int
       generateMD5(const char *filepath,
@@ -293,6 +259,50 @@ namespace util
   }
 #pragma clang diagnostic pop
 
-} // namespace util
+  // trim from start (in place)
+  static inline void ltrim(std::string &s)
+  {
+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
+              return !std::isspace(ch);
+            }));
+  }
+
+  // trim from end (in place)
+  static inline void rtrim(std::string &s)
+  {
+    s.erase(std::find_if(s.rbegin(),
+                         s.rend(),
+                         [](unsigned char ch) { return !std::isspace(ch); })
+                .base(),
+            s.end());
+  }
+
+  static inline std::string rtrim_copy(std::string s)
+  {
+    rtrim(s);
+    return s;
+  }
+
+  // trim from both ends (in place)
+  static inline void trim(std::string &s)
+  {
+    ltrim(s);
+    rtrim(s);
+  }
+
+  static inline std::vector<std::string> split(const std::string &s, char delim)
+  {
+    std::vector<std::string> result;
+    std::stringstream ss(s);
+    std::string item;
+
+    while (getline(ss, item, delim)) {
+      result.push_back(item);
+    }
+
+    return result;
+  }
+
+} // namespace germanairlinesva_util
 
 #endif