changes

.gitignore

@@ -0,0 +1,20 @@
+Makefile
+CMakeCache.txt
+*.o
+*.a
+cmake_install.cmake
+*~
+CMakeFiles
+*.cfg
+*.cmake
+/build/
+*.pyc
+compile_commands.json
+.vimrc
+.clang_complete
+/.idea
+*.vs
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.cppr
+*.hr

src/osmfixer/FixerMain.cpp

@@ -3,6 +3,13 @@
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
 #include <iostream>
+#include "osmfixer/index/StatIdx.h"
+#include "osmfixer/server/StatServer.h"
+#include "util/http/Server.h"
+#include "util/log/Log.h"
+
+using osmfixer::StatServer;
+using osmfixer::StatIdx;
 
 // _____________________________________________________________________________
 int main(int argc, char** argv) {
@@ -12,6 +19,16 @@ int main(int argc, char** argv) {
   // initialize randomness
   srand(time(NULL) + rand());  // NOLINT
 
+  if (argc < 2) {
+    LOG(ERROR) << "Missing path to stations file.";
+    exit(1);
+  }
+
+  StatIdx idx;
+  idx.readFromFile(argv[1]);
+
+  // start server
 
-  std::cout << "Hello." << std::endl;
+  StatServer serv;
+  util::http::HttpServer(9090, &serv).run();
 }

src/osmfixer/index/StatIdx.cpp

@@ -0,0 +1,51 @@
+// Copyright 2019, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include "osmfixer/index/StatIdx.h"
+
+using osmfixer::StatIdx;
+using osmfixer::OsmAttrs;
+using osmfixer::Station;
+
+// _____________________________________________________________________________
+void StatIdx::readFromFile(const std::string& path) {
+  std::ifstream f(path);
+
+  std::string line;
+
+  // first, parse nodes
+  while (std::getline(f, line)) {
+    // empty line is separator between blocks
+    if (line.size() == 0) break;
+
+    std::stringstream rec(line);
+    size_t osmid;
+    double lat, lng;
+    OsmAttrs attrs;
+
+    rec >> osmid;
+    rec >> lat;
+    rec >> lng;
+
+    addStation(osmid, lat, lng, attrs);
+  }
+
+  std::cout << util::geo::getWKT(_bbox) << std::endl;
+}
+
+// _____________________________________________________________________________
+void StatIdx::addStation(size_t osmid, double lat, double lng,
+                         const OsmAttrs& attrs) {
+  std::cout << "Record: " << osmid << " " << lat << " " << lng << std::endl;
+  auto point = util::geo::latLngToWebMerc<double>(lat, lng);
+
+  _stations.emplace_back(Station{osmid, point, attrs});
+
+  // extend bounding box
+  _bbox = util::geo::extendBox(point, _bbox);
+}

src/osmfixer/index/StatIdx.h

@@ -0,0 +1,39 @@
+// Copyright 2019, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef OSMFIXER_INDEX_STATIDX_H_
+#define OSMFIXER_INDEX_STATIDX_H_
+
+#include <map>
+#include <string>
+#include <vector>
+#include "util/geo/Geo.h"
+
+namespace osmfixer {
+
+typedef std::map<std::string, std::vector<std::string>> OsmAttrs;
+
+struct Station{
+  size_t osmid;
+  util::geo::DPoint pos;
+  OsmAttrs attrs;
+};
+
+class StatIdx {
+ public:
+  StatIdx() {}
+
+  void readFromFile(const std::string& path);
+
+ private:
+  void addStation(size_t id, double lat, double lng, const OsmAttrs& attrs);
+
+  void initIndex();
+
+  std::vector<Station> _stations;
+  util::geo::DBox _bbox;
+};
+}
+
+#endif

src/osmfixer/server/StatServer.cpp

@@ -0,0 +1,64 @@
+// Copyright 2019, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#include "osmfixer/server/StatServer.h"
+#include "util/Misc.h"
+#include "util/String.h"
+
+using osmfixer::StatServer;
+using osmfixer::Params;
+
+// _____________________________________________________________________________
+util::http::Answer StatServer::handle(const util::http::Req& req,
+                                      int con) const {
+  UNUSED(con);
+  util::http::Answer a;
+  try {
+    Params params;
+    auto cmd = parseUrl(req.url, req.payload, &params);
+
+    if (cmd == "/") {
+      a = util::http::Answer("200 OK", "osmfixer");
+    } else {
+      a = util::http::Answer("404 Not Found", "dunno");
+    }
+  } catch (std::runtime_error e) {
+    a = util::http::Answer("400 Bad Request", e.what());
+  } catch (std::invalid_argument e) {
+    a = util::http::Answer("400 Bad Request", e.what());
+  } catch (...) {
+    a = util::http::Answer("500 Internal Server Error",
+                           "Internal Server Error.");
+  }
+
+  a.params["Access-Control-Allow-Origin"] = "*";
+  a.params["Server"] = "osmfixer";
+
+  return a;
+}
+
+// _____________________________________________________________________________
+std::string StatServer::parseUrl(std::string u, std::string pl,
+                                 std::map<std::string, std::string>* params) {
+  auto parts = util::split(u, '?');
+
+  if (parts.size() > 1) {
+    auto kvs = util::split(parts[1], '&');
+    for (auto kv : kvs) {
+      auto kvp = util::split(kv, '=');
+      if (kvp.size() == 1) kvp.push_back("");
+      (*params)[util::urlDecode(kvp[0])] = kvp[1];
+    }
+  }
+
+  // also parse post data
+  auto kvs = util::split(pl, '&');
+  for (auto kv : kvs) {
+    auto kvp = util::split(kv, '=');
+    if (kvp.size() == 1) kvp.push_back("");
+    (*params)[util::urlDecode(kvp[0])] = kvp[1];
+  }
+
+  return util::urlDecode(parts.front());
+}

src/osmfixer/server/StatServer.h

@@ -0,0 +1,26 @@
+// Copyright 2019, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef OSMFIXER_SERVER_STATSERVER_H_
+#define OSMFIXER_SERVER_STATSERVER_H_
+
+#include "util/http/Server.h"
+
+namespace osmfixer {
+
+typedef std::map<std::string, std::string> Params;
+
+class StatServer : public util::http::Handler {
+ public:
+  StatServer() {}
+
+  virtual util::http::Answer handle(const util::http::Req& request,
+                                    int connection) const;
+
+ private:
+  static std::string parseUrl(std::string u, std::string pl, Params* params);
+};
+}
+
+#endif