refactoring

src/util/geo/Geo.h

@@ -13,6 +13,7 @@
 #include <iostream>
 #include <sstream>
 #include "util/Misc.h"
+#include "util/String.h"
 #include "util/geo/Box.h"
 #include "util/geo/Line.h"
 #include "util/geo/Point.h"
@@ -734,6 +735,45 @@ inline double dist(const Point<T>& p1, const Point<T>& p2) {
   return dist(p1.getX(), p1.getY(), p2.getX(), p2.getY());
 }
 
+// _____________________________________________________________________________
+template <typename T>
+inline Point<T> pointFromWKT(std::string wkt) {
+  wkt = util::normalizeWhiteSpace(util::trim(wkt));
+  if (wkt.rfind("POINT") == 0 || wkt.rfind("MPOINT") == 0) {
+    size_t b = wkt.find("(") + 1;
+    size_t e = wkt.find(")", b);
+    if (b > e) throw std::runtime_error("Could not parse WKT");
+    auto xy = util::split(util::trim(wkt.substr(b, e - b)), ' ');
+    if (xy.size() < 2) throw std::runtime_error("Could not parse WKT");
+    double x = atof(xy[0].c_str());
+    double y = atof(xy[1].c_str());
+    return Point<T>(x, y);
+  }
+  throw std::runtime_error("Could not parse WKT");
+}
+
+// _____________________________________________________________________________
+template <typename T>
+inline Line<T> lineFromWKT(std::string wkt) {
+  wkt = util::normalizeWhiteSpace(util::trim(wkt));
+  if (wkt.rfind("LINESTRING") == 0 || wkt.rfind("MLINESTRING") == 0) {
+    Line<T> ret;
+    size_t b = wkt.find("(") + 1;
+    size_t e = wkt.find(")", b);
+    if (b > e) throw std::runtime_error("Could not parse WKT");
+    auto pairs = util::split(wkt.substr(b, e - b), ',');
+    for (const auto& p : pairs) {
+      auto xy = util::split(util::trim(p), ' ');
+      if (xy.size() < 2) throw std::runtime_error("Could not parse WKT");
+      double x = atof(xy[0].c_str());
+      double y = atof(xy[1].c_str());
+      ret.push_back({x, y});
+    }
+    return ret;
+  }
+  throw std::runtime_error("Could not parse WKT");
+}
+
 // _____________________________________________________________________________
 template <typename T>
 inline std::string getWKT(const Point<T>& p) {
@@ -1479,6 +1519,24 @@ inline double webMercMeterDist(const G1& a, const G2& b) {
 
   return util::geo::dist(a, b) * cos((latA + latB) / 2.0);
 }
+
+// _____________________________________________________________________________
+template <typename T>
+inline double webMercLen(const Line<T>& g) {
+  double ret = 0;
+  for (size_t i = 1; i < g.size(); i++) ret += webMercMeterDist(g[i - 1], g[i]);
+  return ret;
+}
+
+// _____________________________________________________________________________
+template <typename G>
+inline double webMercDistFactor(const G& a) {
+  // euclidean distance on web mercator is in meters on equator,
+  // and proportional to cos(lat) in both y directions
+
+  double lat = 2 * atan(exp(a.getY() / 6378137.0)) - 1.5707965;
+  return cos(lat);
+}
 }
 }
 

src/util/geo/output/GeoGraphJsonOutput.h

@@ -11,9 +11,6 @@
 #include "util/geo/output/GeoJsonOutput.h"
 #include "util/graph/Graph.h"
 
-using util::toString;
-using util::graph::Graph;
-
 namespace util {
 namespace geo {
 namespace output {
@@ -22,7 +19,7 @@ class GeoGraphJsonOutput {
  public:
   inline GeoGraphJsonOutput(){};
   template <typename N, typename E>
-  void print(const Graph<N, E>& outG, std::ostream& str);
+  void print(const util::graph::Graph<N, E>& outG, std::ostream& str);
 
  private:
   template <typename T>

src/util/geo/output/GeoGraphJsonOutput.tpp

@@ -22,10 +22,10 @@ void GeoGraphJsonOutput::print(const util::graph::Graph<N, E>& outG,
   for (util::graph::Node<N, E>* n : outG.getNds()) {
     if (!n->pl().getGeom()) continue;
 
-    json::Dict props{{"id", toString(n)},
-                   {"deg", toString(n->getDeg())},
-                   {"deg_out", toString(n->getOutDeg())},
-                   {"deg_in", toString(n->getInDeg())}};
+    json::Dict props{{"id", util::toString(n)},
+                     {"deg", util::toString(n->getDeg())},
+                     {"deg_out", util::toString(n->getOutDeg())},
+                     {"deg_in", util::toString(n->getInDeg())}};
 
     auto addProps = n->pl().getAttrs();
     props.insert(addProps.begin(), addProps.end());
@@ -38,9 +38,9 @@ void GeoGraphJsonOutput::print(const util::graph::Graph<N, E>& outG,
     for (graph::Edge<N, E>* e : n->getAdjListOut()) {
       // to avoid double output for undirected graphs
       if (e->getFrom() != n) continue;
-      json::Dict props{{"from", toString(e->getFrom())},
-                  {"to", toString(e->getTo())},
-                  {"id", toString(e)}};
+      json::Dict props{{"from", util::toString(e->getFrom())},
+                       {"to", util::toString(e->getTo())},
+                       {"id", util::toString(e)}};
 
       auto addProps = e->pl().getAttrs();
       props.insert(addProps.begin(), addProps.end());

src/util/geo/output/GeoJsonOutput.cpp

@@ -17,9 +17,18 @@ GeoJsonOutput::GeoJsonOutput(std::ostream& str) : _wr(&str, 10, true) {
 }
 
 // _____________________________________________________________________________
-GeoJsonOutput::~GeoJsonOutput() {
-  flush();
+GeoJsonOutput::GeoJsonOutput(std::ostream& str, json::Val attrs)
+    : _wr(&str, 10, true) {
+  _wr.obj();
+  _wr.keyVal("type", "FeatureCollection");
+  _wr.key("properties");
+  _wr.val(attrs);
+  _wr.key("features");
+  _wr.arr();
 }
 
+// _____________________________________________________________________________
+GeoJsonOutput::~GeoJsonOutput() { flush(); }
+
 // _____________________________________________________________________________
 void GeoJsonOutput::flush() { _wr.closeAll(); }

src/util/geo/output/GeoJsonOutput.h

@@ -19,6 +19,7 @@ namespace output {
 class GeoJsonOutput {
  public:
   GeoJsonOutput(std::ostream& str);
+  GeoJsonOutput(std::ostream& str, json::Val attrs);
   ~GeoJsonOutput();
   template <typename T>
   void print(const Point<T>& p, json::Val attrs);