prepare multi index support

CMakeLists.txt

@@ -69,3 +69,9 @@ else()
 endif()
 
 add_subdirectory(src)
+
+# install target
+install(
+  FILES build/osmfixer DESTINATION bin
+  PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
+)

src/osmfixer/FixerMain.cpp

@@ -26,11 +26,13 @@ int main(int argc, char** argv) {
     exit(1);
   }
 
-  StatIdx idx;
-  idx.readFromFile(argv[1]);
+  std::vector<StatIdx> idx(argc);
+  for(int i = 1; i < argc; i++) {
+    idx[i].readFromFile(argv[i]);
+  }
 
   LOG(INFO) << "Starting server...";
-  StatServer serv(&idx);
+  StatServer serv(idx);
 
   LOG(INFO) << "Listening on port " << port;
   util::http::HttpServer(port, &serv).run();

src/osmfixer/server/StatServer.cpp

@@ -89,40 +89,45 @@ util::http::Answer StatServer::handleHeatMapReq(const Params& pars) const {
   if (cb.size()) json << cb << "(";
   json << "{\"ok\":[";
 
-  auto hgOk = _idx->getHeatGridOk(bbox, z);
   char sep = ' ';
-  for (auto cluster : hgOk) {
-    json << sep;
-    sep = ',';
+  for (const auto& idx : _idxs) {
+    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\":[";
 
-  auto hgSugg = _idx->getHeatGridSugg(bbox, z);
-
   sep = ' ';
-  for (auto cluster : hgSugg) {
-    json << sep;
-    sep = ',';
+  for (const auto& idx : _idxs) {
+    auto hgSugg = idx.getHeatGridSugg(bbox, z);
 
-    json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX() << ","
-         << cluster.size << "]";
+    for (auto cluster : hgSugg) {
+      json << sep;
+      sep = ',';
+
+      json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX() << ","
+           << cluster.size << "]";
+    }
   }
 
   json << "],\"err\":[";
 
-  auto hgErr = _idx->getHeatGridErr(bbox, z);
-
   sep = ' ';
-  for (auto cluster : hgErr) {
-    json << sep;
-    sep = ',';
+  for (const auto& idx : _idxs) {
+    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 << "]";
+    }
   }
 
   json << "]}";
@@ -143,6 +148,9 @@ 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());
@@ -160,31 +168,37 @@ util::http::Answer StatServer::handleMapReq(const Params& pars) const {
   if (cb.size()) json << cb << "(";
   json << "{\"stats\":[";
 
-  auto ret = _idx->getStations(bbox);
   char sep = ' ';
-  for (auto stat : ret) {
-    json << sep;
-    sep = ',';
-    printStation(stat, &json);
+  for (const auto& idx : _idxs) {
+    auto ret = idx.getStations(bbox);
+    for (auto stat : ret) {
+      json << sep;
+      sep = ',';
+      printStation(stat, did, &json);
+    }
   }
 
   json << "], \"groups\":[";
-  auto gret = _idx->getGroups(bbox);
   sep = ' ';
-  for (auto group : gret) {
-    if (group->polyStations.size() == 1 && group->osmid < 2) continue;
-    json << sep;
-    sep = ',';
-    printGroup(group, &json);
+  for (const auto& idx : _idxs) {
+    auto gret = idx.getGroups(bbox);
+    for (auto group : gret) {
+      if (group->polyStations.size() == 1 && group->osmid < 2) continue;
+      json << sep;
+      sep = ',';
+      printGroup(group, &json);
+    }
   }
 
   json << "], \"su\":[";
-  auto suggs = _idx->getSuggestions(bbox);
   sep = ' ';
-  for (auto sugg : suggs) {
-    json << sep;
-    sep = ',';
-    printSugg(sugg, &json);
+  for (const auto& idx : _idxs) {
+    auto suggs = idx.getSuggestions(bbox);
+    for (auto sugg : suggs) {
+      json << sep;
+      sep = ',';
+      printSugg(sugg, &json);
+    }
   }
 
   json << "]}";
@@ -198,13 +212,13 @@ util::http::Answer StatServer::handleMapReq(const Params& pars) const {
 }
 
 // _____________________________________________________________________________
-void StatServer::printStation(const Station* stat, std::ostream* out) const {
+void StatServer::printStation(const Station* stat, size_t did, std::ostream* out) const {
   auto latLng =
       util::geo::webMercToLatLng<double>(stat->pos.getX(), stat->pos.getY());
   (*out) << "{\"id\":" << stat->id << ",\"lat\":" << latLng.getY()
          << ",\"lon\":" << latLng.getX();
 
-  if (stat->origGroup != stat->group || _idx->getGroup(stat->group)->osmid == 1)
+  if (stat->origGroup != stat->group || _idxs[did].getGroup(stat->group)->osmid == 1)
     (*out) << ",\"su\":1";
 
   if (stat->attrErrs.size())
@@ -283,7 +297,11 @@ util::http::Answer StatServer::handleGroupReq(const Params& pars) const {
   if (pars.count("cb")) cb = pars.find("cb")->second.c_str();
 
   size_t gid = atol(pars.find("id")->second.c_str());
-  auto group = _idx->getGroup(gid);
+
+  // TODO!
+  size_t did=0;
+
+  auto group = _idxs[did].getGroup(gid);
 
   if (!group) return util::http::Answer("404 Not Found", "Group not found.");
 
@@ -318,7 +336,7 @@ util::http::Answer StatServer::handleGroupReq(const Params& pars) const {
   for (const auto& sid : group->stations) {
     json << sep;
     sep = ',';
-    const auto stat = _idx->getStation(sid);
+    const auto stat = _idxs[did].getStation(sid);
     json << "{\"id\":" << sid << ","
          << "\"osmid\":" << stat->osmid << ","
          << "\"group\":" << stat->group << ","
@@ -363,7 +381,10 @@ 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());
-  auto stat = _idx->getStation(sid);
+  // TODO!
+  size_t did=0;
+
+  auto stat = _idxs[did].getStation(sid);
 
   if (!stat) return util::http::Answer("404 Not Found", "Station not found.");
 
@@ -400,7 +421,7 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
   for (const auto& err : stat->attrErrs) {
     json << sep;
     sep = ',';
-    const auto otherStat = _idx->getStation(err.otherId);
+    const auto otherStat = _idxs[did].getStation(err.otherId);
     json << "{";
     json << "\"attr\":[\"" << err.attr << "\",\"" << stat->attrs.at(err.attr)[0]
          << "\"]";
@@ -420,39 +441,39 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
 
   // suggestions
   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) {
+      _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 << "}";
         seper = ',';
-      } else if (_idx->getGroup(stat->group)->osmid > 1) {
+      } else if (_idxs[did].getGroup(stat->group)->osmid > 1) {
         json << "{\"type\": 2, \"target_gid\":" << stat->group
-             << ",\"target_osm_rel_id\":" << _idx->getGroup(stat->group)->osmid
+             << ",\"target_osm_rel_id\":" << _idxs[did].getGroup(stat->group)->osmid
              << "}";
         seper = ',';
       }
     } else {
-      if (_idx->getGroup(stat->group)->osmid == 1 &&
-          _idx->getGroup(stat->group)->stations.size() > 1) {
+      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\":"
-             << _idx->getGroup(stat->origGroup)->osmid
+             << _idxs[did].getGroup(stat->origGroup)->osmid
              << ",\"target_gid\":" << stat->group << "}";
         seper = ',';
-      } else if (_idx->getGroup(stat->group)->osmid > 1) {
+      } else if (_idxs[did].getGroup(stat->group)->osmid > 1) {
         json << "{\"type\": 4,\"orig_gid\":" << stat->origGroup
              << ",\"orig_osm_rel_id\":"
-             << _idx->getGroup(stat->origGroup)->osmid
+             << _idxs[did].getGroup(stat->origGroup)->osmid
              << ",\"target_gid\":" << stat->group
-             << ",\"target_osm_rel_id\":" << _idx->getGroup(stat->group)->osmid
+             << ",\"target_osm_rel_id\":" << _idxs[did].getGroup(stat->group)->osmid
              << "}";
         seper = ',';
       } else {
         json << "{\"type\": 5,\"orig_gid\":" << stat->origGroup
              << ",\"orig_osm_rel_id\":"
-             << _idx->getGroup(stat->origGroup)->osmid
+             << _idxs[did].getGroup(stat->origGroup)->osmid
              << ",\"target_gid\":" << stat->group
-             << ",\"target_osm_rel_id\":" << _idx->getGroup(stat->group)->osmid
+             << ",\"target_osm_rel_id\":" << _idxs[did].getGroup(stat->group)->osmid
              << "}";
         seper = ',';
       }
@@ -460,7 +481,7 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
   }
 
   for (auto attrErr : stat->attrErrs) {
-    const auto otherStat = _idx->getStation(attrErr.otherId);
+    const auto otherStat = _idxs[did].getStation(attrErr.otherId);
     if (otherStat->osmid == stat->osmid) {
       // fix attributes
       json << seper << "{\"type\": 6,\"attr\":\"" << attrErr.attr << "\""

src/osmfixer/server/StatServer.h

@@ -16,7 +16,8 @@ typedef std::map<std::string, std::string> Params;
 
 class StatServer : public util::http::Handler {
  public:
-  explicit StatServer(const osmfixer::StatIdx* idx) : _idx(idx) {}
+  explicit StatServer(const std::vector<osmfixer::StatIdx>& idxs)
+      : _idxs(idxs) {}
 
   virtual util::http::Answer handle(const util::http::Req& request,
                                     int connection) const;
@@ -29,11 +30,11 @@ class StatServer : public util::http::Handler {
   util::http::Answer handleStatReq(const Params& pars) const;
   util::http::Answer handleGroupReq(const Params& pars) const;
 
-  void printStation(const Station* stat, std::ostream* out) 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);
 
-  const osmfixer::StatIdx* _idx;
+  const std::vector<osmfixer::StatIdx>& _idxs;
 };
 }  // namespace osmfixer