changes

src/osmfixer/FixerMain.cpp

@@ -8,8 +8,16 @@
 #include "util/http/Server.h"
 #include "util/log/Log.h"
 
-using osmfixer::StatServer;
+using osmfixer::IdRange;
 using osmfixer::StatIdx;
+using osmfixer::StatServer;
+
+// _____________________________________________________________________________
+void printHelp(int argc, char** argv) {
+  UNUSED(argc);
+  std::cout << "Usage: " << argv[0] << " [-p <port>] [--help] [-h] <fix input files>" << "\n";
+  std::cout << "\nAllowed arguments:\n    -p <port>  Port for server to listen to\n";
+}
 
 // _____________________________________________________________________________
 int main(int argc, char** argv) {
@@ -21,14 +29,44 @@ int main(int argc, char** argv) {
 
   int port = 9090;
 
-  if (argc < 2) {
-    LOG(ERROR) << "Missing path to stations file.";
+  std::vector<std::string> inputPaths;
+
+  for (int i = 1; i < argc; i++) {
+    std::string cur = argv[i];
+    if (cur == "-h" || cur == "--help") {
+      printHelp(argc, argv);
+      exit(0);
+    } else if (cur == "-p") {
+      if (++i >= argc) {
+        LOG(ERROR) << "Missing argument for port (-p).";
+        exit(1);
+      }
+      port = atoi(argv[i]);
+    } else {
+      inputPaths.push_back(cur);
+    }
+  }
+
+  if (inputPaths.size() == 0) {
+    LOG(ERROR) << "Missing path(s) to stations file(s).";
+    printHelp(argc, argv);
     exit(1);
   }
 
-  std::vector<StatIdx> idx(argc - 1);
-  for(int i = 1; i < argc; i++) {
-    idx[i-1].readFromFile(argv[i]);
+  std::vector<std::pair<IdRange, StatIdx>> idx(inputPaths.size());
+  IdRange idRange{0, 0, 0, 0, 0, 0};
+  for (size_t i = 0; i < inputPaths.size(); i++) {
+    idx[i].first = idRange;
+    if (i > 0) {
+      idx[i].first.sidStart = idx[i - 1].first.sidEnd + 1;
+      idx[i].first.gidStart = idx[i - 1].first.gidEnd + 1;
+      idx[i].first.suggIdStart = idx[i - 1].first.suggIdStart + 1;
+    }
+    idx[i].second.readFromFile(inputPaths[i]);
+    idx[i].first.sidEnd = idx[i].first.sidStart + idx[i].second.maxSId() + 1;
+    idx[i].first.gidEnd = idx[i].first.gidStart + idx[i].second.maxGId() + 1;
+    idx[i].first.suggIdEnd =
+        idx[i].first.suggIdStart + idx[i].second.maxSuggId() + 1;
   }
 
   LOG(INFO) << "Starting server...";
@@ -37,3 +75,4 @@ int main(int argc, char** argv) {
   LOG(INFO) << "Listening on port " << port;
   util::http::HttpServer(port, &serv).run();
 }
+

src/osmfixer/index/StatIdx.h

@@ -63,6 +63,10 @@ class StatIdx {
 
   void readFromFile(const std::string& path);
 
+  size_t maxSId() const { return _stations.size() - 1; };
+  size_t maxGId() const { return _groups.size() - 1; };
+  size_t maxSuggId() const { return _suggestions.size() - 1; };
+
   std::vector<const Station*> getStations(const util::geo::DBox bbox) const;
   std::vector<const Group*> getGroups(const util::geo::DBox bbox) const;
   std::vector<const Suggestion*> getSuggestions(

src/osmfixer/server/StatServer.cpp

@@ -3,13 +3,13 @@
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
 #include <vector>
+#include "osmfixer/build.h"
+#include "osmfixer/index.h"
 #include "osmfixer/server/StatServer.h"
 #include "util/Misc.h"
 #include "util/String.h"
 #include "util/geo/Geo.h"
 #include "util/log/Log.h"
-#include "osmfixer/index.h"
-#include "osmfixer/build.h"
 
 using osmfixer::Params;
 using osmfixer::StatServer;
@@ -24,10 +24,15 @@ util::http::Answer StatServer::handle(const util::http::Req& req,
     auto cmd = parseUrl(req.url, req.payload, &params);
 
     if (cmd == "/") {
-      a = util::http::Answer("200 OK", std::string(index_html, index_html + sizeof index_html / sizeof index_html[0]));
+      a = util::http::Answer(
+          "200 OK",
+          std::string(index_html,
+                      index_html + sizeof index_html / sizeof index_html[0]));
       a.params["Content-Type"] = "text/html; charset=utf-8";
     } else if (cmd == "/build.js") {
-      a = util::http::Answer("200 OK", std::string(build_js, build_js + sizeof build_js / sizeof build_js[0]));
+      a = util::http::Answer(
+          "200 OK", std::string(build_js, build_js + sizeof build_js /
+                                                         sizeof build_js[0]));
       a.params["Content-Type"] = "application/javascript; charset=utf-8";
     } else if (cmd == "/map") {
       a = handleMapReq(params);
@@ -90,43 +95,49 @@ util::http::Answer StatServer::handleHeatMapReq(const Params& pars) const {
   json << "{\"ok\":[";
 
   char sep = ' ';
-  for (const auto& idx : _idxs) {
+  for (const auto& idxPair : _idxs) {
+    const auto& idx = idxPair.second;
+
     auto hgOk = idx.getHeatGridOk(bbox, z);
     for (auto cluster : hgOk) {
       json << sep;
       sep = ',';
 
-      json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX() << ","
-           << cluster.size << "]";
+      json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX()
+           << "," << cluster.size << "]";
     }
   }
 
   json << "],\"sugg\":[";
 
   sep = ' ';
-  for (const auto& idx : _idxs) {
+  for (const auto& idxPair : _idxs) {
+    const auto& idx = idxPair.second;
+
     auto hgSugg = idx.getHeatGridSugg(bbox, z);
 
     for (auto cluster : hgSugg) {
       json << sep;
       sep = ',';
 
-      json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX() << ","
-           << cluster.size << "]";
+      json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX()
+           << "," << cluster.size << "]";
     }
   }
 
   json << "],\"err\":[";
 
   sep = ' ';
-  for (const auto& idx : _idxs) {
+  for (const auto& idxPair : _idxs) {
+    const auto& idx = idxPair.second;
+
     auto hgErr = idx.getHeatGridErr(bbox, z);
     for (auto cluster : hgErr) {
       json << sep;
       sep = ',';
 
-      json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX() << ","
-           << cluster.size << "]";
+      json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX()
+           << "," << cluster.size << "]";
     }
   }
 
@@ -148,9 +159,6 @@ util::http::Answer StatServer::handleMapReq(const Params& pars) const {
   if (pars.count("cb")) cb = pars.find("cb")->second.c_str();
   auto box = util::split(pars.find("bbox")->second, ',');
 
-  // TODO!
-  size_t did = 0;
-
   if (box.size() != 4) throw std::invalid_argument("Invalid request.");
 
   double lat1 = atof(box[0].c_str());
@@ -169,7 +177,9 @@ util::http::Answer StatServer::handleMapReq(const Params& pars) const {
   json << "{\"stats\":[";
 
   char sep = ' ';
-  for (const auto& idx : _idxs) {
+  for (size_t did = 0; did < _idxs.size(); did++) {
+    const auto& idx = _idxs[did].second;
+
     auto ret = idx.getStations(bbox);
     for (auto stat : ret) {
       json << sep;
@@ -180,24 +190,28 @@ util::http::Answer StatServer::handleMapReq(const Params& pars) const {
 
   json << "], \"groups\":[";
   sep = ' ';
-  for (const auto& idx : _idxs) {
+  for (size_t did = 0; did < _idxs.size(); did++) {
+    const auto& idx = _idxs[did].second;
+
     auto gret = idx.getGroups(bbox);
     for (auto group : gret) {
       if (group->polyStations.size() == 1 && group->osmid < 2) continue;
       json << sep;
       sep = ',';
-      printGroup(group, &json);
+      printGroup(group, did, &json);
     }
   }
 
   json << "], \"su\":[";
   sep = ' ';
-  for (const auto& idx : _idxs) {
+  for (size_t did = 0; did < _idxs.size(); did++) {
+    const auto& idx = _idxs[did].second;
+
     auto suggs = idx.getSuggestions(bbox);
     for (auto sugg : suggs) {
       json << sep;
       sep = ',';
-      printSugg(sugg, &json);
+      printSugg(sugg, did, &json);
     }
   }
 
@@ -212,13 +226,17 @@ util::http::Answer StatServer::handleMapReq(const Params& pars) const {
 }
 
 // _____________________________________________________________________________
-void StatServer::printStation(const Station* stat, size_t did, std::ostream* out) const {
+void StatServer::printStation(const Station* stat, size_t did,
+                              std::ostream* out) const {
+  const auto& idx = _idxs[did].second;
+  const auto& range = _idxs[did].first;
+
   auto latLng =
       util::geo::webMercToLatLng<double>(stat->pos.getX(), stat->pos.getY());
-  (*out) << "{\"id\":" << stat->id << ",\"lat\":" << latLng.getY()
-         << ",\"lon\":" << latLng.getX();
+  (*out) << "{\"id\":" << stat->id + range.sidStart
+         << ",\"lat\":" << latLng.getY() << ",\"lon\":" << latLng.getX();
 
-  if (stat->origGroup != stat->group || _idxs[did].getGroup(stat->group)->osmid == 1)
+  if (stat->origGroup != stat->group || idx.getGroup(stat->group)->osmid == 1)
     (*out) << ",\"su\":1";
 
   if (stat->attrErrs.size())
@@ -227,15 +245,18 @@ void StatServer::printStation(const Station* stat, size_t did, std::ostream* out
 }
 
 // _____________________________________________________________________________
-void StatServer::printSugg(const Suggestion* sugg, std::ostream* out) {
+void StatServer::printSugg(const Suggestion* sugg, size_t did,
+                           std::ostream* out) const {
+  const auto& range = _idxs[did].first;
+
   std::vector<util::geo::DPoint> projArrow;
 
   for (auto p : sugg->arrow) {
     projArrow.push_back(util::geo::webMercToLatLng<double>(p.getX(), p.getY()));
   }
 
-  (*out) << "{\"id\":" << sugg->station << ",\"type\":" << sugg->type
-         << ",\"arrow\":[";
+  (*out) << "{\"id\":" << sugg->station + range.suggIdStart
+         << ",\"type\":" << sugg->type << ",\"arrow\":[";
   char sep = ' ';
   for (auto p : projArrow) {
     (*out) << sep << "[" << p.getY() << "," << p.getX() << "]";
@@ -246,14 +267,17 @@ void StatServer::printSugg(const Suggestion* sugg, std::ostream* out) {
 }
 
 // _____________________________________________________________________________
-void StatServer::printGroup(const Group* group, std::ostream* out) {
+void StatServer::printGroup(const Group* group, size_t did,
+                            std::ostream* out) const {
+  const auto& range = _idxs[did].first;
+
   std::vector<util::geo::DPoint> projPoly;
 
   for (auto p : group->poly.getOuter()) {
     projPoly.push_back(util::geo::webMercToLatLng<double>(p.getX(), p.getY()));
   }
 
-  (*out) << "{\"id\":" << group->id << ",\"poly\":[";
+  (*out) << "{\"id\":" << group->id + range.gidStart << ",\"poly\":[";
   char sep = ' ';
   for (auto p : projPoly) {
     (*out) << sep << "[" << p.getY() << "," << p.getX() << "]";
@@ -290,6 +314,39 @@ std::string StatServer::parseUrl(std::string u, std::string pl,
 }
 
 // _____________________________________________________________________________
+size_t StatServer::getDidBySid(size_t sid) const {
+  for (size_t i = 0; i < _idxs.size(); i++) {
+    auto idx = _idxs[i].second;
+    auto range = _idxs[i].first;
+    if (sid >= range.sidStart && sid <= range.sidEnd) return i;
+  }
+
+  return 0;
+}
+
+// _____________________________________________________________________________
+size_t StatServer::getDidBySuggid(size_t suggid) const {
+  for (size_t i = 0; i < _idxs.size(); i++) {
+    auto idx = _idxs[i].second;
+    auto range = _idxs[i].first;
+    if (suggid >= range.suggIdStart && suggid <= range.suggIdEnd) return i;
+  }
+
+  return 0;
+}
+
+// _____________________________________________________________________________
+size_t StatServer::getDidByGid(size_t gid) const {
+  for (size_t i = 0; i < _idxs.size(); i++) {
+    auto idx = _idxs[i].second;
+    auto range = _idxs[i].first;
+    if (gid >= range.gidStart && gid <= range.gidEnd) return i;
+  }
+
+  return 0;
+}
+
+// _____________________________________________________________________________
 util::http::Answer StatServer::handleGroupReq(const Params& pars) const {
   if (pars.count("id") == 0 || pars.find("id")->second.empty())
     throw std::invalid_argument("No ID specified.");
@@ -298,10 +355,13 @@ util::http::Answer StatServer::handleGroupReq(const Params& pars) const {
 
   size_t gid = atol(pars.find("id")->second.c_str());
 
-  // TODO!
-  size_t did=0;
+  size_t did = getDidByGid(gid);
+
+  const auto& range = _idxs[did].first;
+  const auto& idx = _idxs[did].second;
+  size_t idxGid = gid - range.gidStart;
 
-  auto group = _idxs[did].getGroup(gid);
+  auto group = idx.getGroup(idxGid);
 
   if (!group) return util::http::Answer("404 Not Found", "Group not found.");
 
@@ -336,10 +396,10 @@ util::http::Answer StatServer::handleGroupReq(const Params& pars) const {
   for (const auto& sid : group->stations) {
     json << sep;
     sep = ',';
-    const auto stat = _idxs[did].getStation(sid);
-    json << "{\"id\":" << sid << ","
+    const auto stat = idx.getStation(sid);
+    json << "{\"id\":" << sid + range.sidStart << ","
          << "\"osmid\":" << stat->osmid << ","
-         << "\"group\":" << stat->group << ","
+         << "\"group\":" << stat->group + range.gidStart << ","
          << "\"orig_group\":" << stat->origGroup << ","
          << "\"attrs\":{";
 
@@ -381,10 +441,14 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
   if (pars.count("cb")) cb = pars.find("cb")->second.c_str();
 
   size_t sid = atol(pars.find("id")->second.c_str());
-  // TODO!
-  size_t did=0;
 
-  auto stat = _idxs[did].getStation(sid);
+  size_t did = getDidBySid(sid);
+
+  const auto& range = _idxs[did].first;
+  const auto& idx = _idxs[did].second;
+  size_t idxSid = sid - range.sidStart;
+
+  auto stat = idx.getStation(idxSid);
 
   if (!stat) return util::http::Answer("404 Not Found", "Station not found.");
 
@@ -421,14 +485,14 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
   for (const auto& err : stat->attrErrs) {
     json << sep;
     sep = ',';
-    const auto otherStat = _idxs[did].getStation(err.otherId);
+    const auto otherStat = idx.getStation(err.otherId);
     json << "{";
     json << "\"attr\":[\"" << err.attr << "\",\"" << stat->attrs.at(err.attr)[0]
          << "\"]";
     json << ",\"other_attr\":[\"" << err.otherAttr << "\",\""
          << otherStat->attrs.at(err.otherAttr)[0] << "\"]";
     json << ",\"conf\":" << err.conf;
-    json << ",\"other\":" << err.otherId;
+    json << ",\"other\":" << err.otherId + range.sidStart;
     json << ",\"other_osmid\":" << otherStat->osmid;
     json << "}";
   }
@@ -440,40 +504,36 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
   char seper = ' ';
 
   // suggestions
-  if (stat->group != stat->origGroup ||
-      _idxs[did].getGroup(stat->group)->osmid == 1) {
-    if (_idxs[did].getGroup(stat->origGroup)->osmid < 2) {
-      if (_idxs[did].getGroup(stat->group)->osmid == 1) {
-        json << "{\"type\": 1, \"target_gid\":" << stat->group << "}";
+  if (stat->group != stat->origGroup || idx.getGroup(stat->group)->osmid == 1) {
+    if (idx.getGroup(stat->origGroup)->osmid < 2) {
+      if (idx.getGroup(stat->group)->osmid == 1) {
+        json << "{\"type\": 1, \"target_gid\":" << stat->group + range.gidStart
+             << "}";
         seper = ',';
-      } else if (_idxs[did].getGroup(stat->group)->osmid > 1) {
-        json << "{\"type\": 2, \"target_gid\":" << stat->group
-             << ",\"target_osm_rel_id\":" << _idxs[did].getGroup(stat->group)->osmid
+      } else if (idx.getGroup(stat->group)->osmid > 1) {
+        json << "{\"type\": 2, \"target_gid\":" << stat->group + range.gidStart
+             << ",\"target_osm_rel_id\":" << idx.getGroup(stat->group)->osmid
              << "}";
         seper = ',';
       }
     } else {
-      if (_idxs[did].getGroup(stat->group)->osmid == 1 &&
-          _idxs[did].getGroup(stat->group)->stations.size() > 1) {
-        json << "{\"type\": 3,\"orig_gid\":" << stat->origGroup
-             << ",\"orig_osm_rel_id\":"
-             << _idxs[did].getGroup(stat->origGroup)->osmid
-             << ",\"target_gid\":" << stat->group << "}";
+      if (idx.getGroup(stat->group)->osmid == 1 &&
+          idx.getGroup(stat->group)->stations.size() > 1) {
+        json << "{\"type\": 3,\"orig_gid\":" << stat->origGroup + range.gidStart
+             << ",\"orig_osm_rel_id\":" << idx.getGroup(stat->origGroup)->osmid
+             << ",\"target_gid\":" << stat->group + range.gidStart << "}";
         seper = ',';
-      } else if (_idxs[did].getGroup(stat->group)->osmid > 1) {
-        json << "{\"type\": 4,\"orig_gid\":" << stat->origGroup
-             << ",\"orig_osm_rel_id\":"
-             << _idxs[did].getGroup(stat->origGroup)->osmid
-             << ",\"target_gid\":" << stat->group
-             << ",\"target_osm_rel_id\":" << _idxs[did].getGroup(stat->group)->osmid
-             << "}";
+      } else if (idx.getGroup(stat->group)->osmid > 1) {
+        json << "{\"type\": 4,\"orig_gid\":" << stat->origGroup + range.gidStart
+             << ",\"orig_osm_rel_id\":" << idx.getGroup(stat->origGroup)->osmid
+             << ",\"target_gid\":" << stat->group << ",\"target_osm_rel_id\":"
+             << idx.getGroup(stat->group)->osmid + range.gidStart << "}";
         seper = ',';
       } else {
-        json << "{\"type\": 5,\"orig_gid\":" << stat->origGroup
-             << ",\"orig_osm_rel_id\":"
-             << _idxs[did].getGroup(stat->origGroup)->osmid
-             << ",\"target_gid\":" << stat->group
-             << ",\"target_osm_rel_id\":" << _idxs[did].getGroup(stat->group)->osmid
+        json << "{\"type\": 5,\"orig_gid\":" << stat->origGroup + range.gidStart
+             << ",\"orig_osm_rel_id\":" << idx.getGroup(stat->origGroup)->osmid
+             << ",\"target_gid\":" << stat->group + range.gidStart
+             << ",\"target_osm_rel_id\":" << idx.getGroup(stat->group)->osmid
              << "}";
         seper = ',';
       }
@@ -481,7 +541,7 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
   }
 
   for (auto attrErr : stat->attrErrs) {
-    const auto otherStat = _idxs[did].getStation(attrErr.otherId);
+    const auto otherStat = idx.getStation(attrErr.otherId);
     if (otherStat->osmid == stat->osmid) {
       // fix attributes
       json << seper << "{\"type\": 6,\"attr\":\"" << attrErr.attr << "\""

src/osmfixer/server/StatServer.h

@@ -12,11 +12,16 @@
 
 namespace osmfixer {
 
+struct IdRange {
+  size_t sidStart, sidEnd, gidStart, gidEnd, suggIdStart, suggIdEnd;
+};
+
 typedef std::map<std::string, std::string> Params;
 
 class StatServer : public util::http::Handler {
  public:
-  explicit StatServer(const std::vector<osmfixer::StatIdx>& idxs)
+  explicit StatServer(
+      const std::vector<std::pair<IdRange, osmfixer::StatIdx>>& idxs)
       : _idxs(idxs) {}
 
   virtual util::http::Answer handle(const util::http::Req& request,
@@ -31,10 +36,14 @@ class StatServer : public util::http::Handler {
   util::http::Answer handleGroupReq(const Params& pars) const;
 
   void printStation(const Station* stat, size_t did, std::ostream* out) const;
-  static void printGroup(const Group* stat, std::ostream* out);
-  static void printSugg(const Suggestion* stat, std::ostream* out);
+  void printGroup(const Group* stat, size_t did, std::ostream* out) const;
+  void printSugg(const Suggestion* stat, size_t did, std::ostream* out) const;
+
+  size_t getDidBySid(size_t sid) const;
+  size_t getDidBySuggid(size_t suggid) const;
+  size_t getDidByGid(size_t gid) const;
 
-  const std::vector<osmfixer::StatIdx>& _idxs;
+  const std::vector<std::pair<IdRange, osmfixer::StatIdx>>& _idxs;
 };
 }  // namespace osmfixer