changes

src/osmfixer/index/StatIdx.cpp

@@ -26,16 +26,27 @@ void StatIdx::readFromFile(const std::string& path) {
     if (line.size() == 0) break;
 
     std::stringstream rec(line);
-    size_t osmid, group;
+    size_t osmid, origGroup, group;
     double lat, lng;
     OsmAttrs attrs;
 
     rec >> osmid;
     rec >> lat;
     rec >> lng;
+    rec >> origGroup;
     rec >> group;
 
-    addStation(osmid, lat, lng, group, attrs);
+    std::string temp;
+    std::getline(rec, temp, '\t');
+    while (std::getline(rec, temp, '\t')) {
+      std::string key, val;
+      key = temp;
+      std::getline(rec, temp, '\t');
+      val = temp;
+      attrs[key].push_back(val);
+    }
+
+    addStation(osmid, lat, lng, origGroup, group, attrs);
   }
 
   // second, parse groups
@@ -52,17 +63,44 @@ void StatIdx::readFromFile(const std::string& path) {
     addGroup(osmid, attrs);
   }
 
+  // third, parse attr errs
+  while (std::getline(f, line)) {
+    // empty line is separator between blocks
+    if (line.size() == 0) break;
+
+    std::stringstream rec(line);
+    size_t id;
+    std::string attr, otherAttr;
+    double conf;
+    size_t otherId;
+
+    rec >> id;
+
+    std::getline(rec, attr, '\t');
+    std::getline(rec, attr, '\t');
+    std::getline(rec, otherAttr, '\t');
+
+    rec >> conf;
+    rec >> otherId;
+
+    std::cout << id << " " << attr << " " << otherAttr << " " << conf << " "
+              << otherId << std::endl;
+
+    _stations[id].attrErrs.push_back({attr, otherAttr, conf, otherId});
+  }
+
   initGroups();
   initIndex();
 }
 
 // _____________________________________________________________________________
-void StatIdx::addStation(size_t osmid, double lat, double lng, size_t group,
-                         const OsmAttrs& attrs) {
+void StatIdx::addStation(size_t osmid, double lat, double lng, size_t origGroup,
+                         size_t group, const OsmAttrs& attrs) {
   std::cout << "Record: " << osmid << " " << lat << " " << lng << std::endl;
   auto point = util::geo::latLngToWebMerc<double>(lat, lng);
 
-  _stations.emplace_back(Station{_stations.size(), osmid, group, point, attrs});
+  _stations.emplace_back(
+      Station{_stations.size(), osmid, origGroup, group, point, attrs});
 
   // extend bounding box
   _bbox = util::geo::extendBox(point, _bbox);
@@ -72,7 +110,7 @@ void StatIdx::addStation(size_t osmid, double lat, double lng, size_t group,
 void StatIdx::addGroup(size_t osmid, const OsmAttrs& attrs) {
   std::cout << osmid << std::endl;
   Group g;
-	g.id = _groups.size();
+  g.id = _groups.size();
   g.osmid = osmid;
   g.attrs = attrs;
   _groups.emplace_back(g);
@@ -82,8 +120,16 @@ void StatIdx::addGroup(size_t osmid, const OsmAttrs& attrs) {
 void StatIdx::initGroups() {
   for (size_t i = 0; i < _stations.size(); i++) {
     // this should be ensured by the input file
+    assert(_stations[i].origGroup < _groups.size());
+    _groups[_stations[i].origGroup].stations.push_back(i);
+
     assert(_stations[i].group < _groups.size());
-    _groups[_stations[i].group].stations.push_back(i);
+    if (_stations[i].group != _stations[i].origGroup &&
+        _groups[_stations[i].group].osmid == 1) {
+			std::cout << "MURR" << std::endl;
+      // only add non-orig groups to polygons of new (non-osm) groups
+      _groups[_stations[i].group].stations.push_back(i);
+    }
   }
 
   for (size_t i = 0; i < _groups.size(); i++) {
@@ -158,13 +204,12 @@ std::vector<const Station*> StatIdx::getStations(
 
 // _____________________________________________________________________________
 const Station* StatIdx::getStation(size_t id) const {
-	if (id >= _stations.size()) return 0;
-	return &_stations[id];
+  if (id >= _stations.size()) return 0;
+  return &_stations[id];
 }
 
-
 // _____________________________________________________________________________
 const Group* StatIdx::getGroup(size_t id) const {
-	if (id >= _groups.size()) return 0;
-	return &_groups[id];
+  if (id >= _groups.size()) return 0;
+  return &_groups[id];
 }

src/osmfixer/index/StatIdx.h

@@ -15,12 +15,20 @@ namespace osmfixer {
 
 typedef std::map<std::string, std::vector<std::string>> OsmAttrs;
 
+struct AttrErr {
+  std::string attr;
+  std::string otherAttr;
+  double conf;
+  size_t otherId;
+};
+
 struct Station {
   size_t id;
   size_t osmid;
-  size_t group;
+  size_t origGroup, group;
   util::geo::DPoint pos;
   OsmAttrs attrs;
+  std::vector<AttrErr> attrErrs;
 };
 
 struct Group {
@@ -44,8 +52,8 @@ class StatIdx {
   const Group* getGroup(size_t id) const;
 
  private:
-  void addStation(size_t id, double lat, double lng, size_t group,
-                  const OsmAttrs& attrs);
+  void addStation(size_t id, double lat, double lng, size_t origGroup,
+                  size_t group, const OsmAttrs& attrs);
   void addGroup(size_t id, const OsmAttrs& attrs);
 
   void initIndex();

src/osmfixer/server/StatServer.cpp

@@ -86,6 +86,7 @@ util::http::Answer StatServer::handleMapReq(const Params& pars) const {
   auto gret = _idx->getGroups(bbox);
   sep = ' ';
   for (auto group : gret) {
+    if (group->stations.size() < 2) continue;
     json << sep;
     sep = ',';
     printGroup(group, &json);
@@ -102,11 +103,18 @@ util::http::Answer StatServer::handleMapReq(const Params& pars) const {
 }
 
 // _____________________________________________________________________________
-void StatServer::printStation(const Station* stat, std::ostream* out) {
+void StatServer::printStation(const Station* stat, 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() << "}";
+  (*out) << "{\"id\":" << stat->id << ",\"lat\":" << latLng.getY()
+         << ",\"lon\":" << latLng.getX();
+
+  if (stat->origGroup != stat->group || _idx->getGroup(stat->group)->osmid == 1)
+    (*out) << ",\"suggestion\":1";
+
+  if (stat->attrErrs.size())
+    (*out) << ",\"attrerrs\":" << stat->attrErrs.size();
+  (*out) << "}";
 }
 
 // _____________________________________________________________________________
@@ -122,7 +130,9 @@ void StatServer::printGroup(const Group* group, std::ostream* out) {
     (*out) << sep << "[" << p.getY() << "," << p.getX() << "]";
     sep = ',';
   }
-  (*out) << "]}";
+  (*out) << "]";
+  if (group->osmid == 1) (*out) << ",\"new\":1";
+  (*out) << "}";
 }
 
 // _____________________________________________________________________________
@@ -168,8 +178,8 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
 
   if (cb.size()) json << cb << "(";
   json << "{\"id\":" << sid << ","
-    << "\"osmid\":" << stat->osmid << ","
-    << "\"attrs\":{";
+       << "\"osmid\":" << stat->osmid << ","
+       << "\"attrs\":{";
 
   char sep = ' ';
 
@@ -182,12 +192,70 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
     for (const auto& val : par.second) {
       json << sep2;
       sep2 = ',';
-      json << util::jsonStringEscape(val);
+      json << "\"" << util::jsonStringEscape(val) << "\"";
     }
     json << "]";
   }
 
-  json << "}}";
+  json << "},\"attrerrs\":[";
+
+  sep = ' ';
+  for (const auto& err : stat->attrErrs) {
+    json << sep;
+    sep = ',';
+    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_osmid\":" << otherStat->osmid;
+    json << "}";
+  }
+
+  json << "]";
+
+  json << ",\"suggestions\":[";
+
+  // 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) {
+        json << "{\"type\": 1, \"target_gid\":" << stat->group << "}";
+      } else if (_idx->getGroup(stat->group)->osmid > 1) {
+        json << "{\"type\": 2, \"target_gid\":" << stat->group
+             << ",\"target_osm_rel_id\":" << _idx->getGroup(stat->group)->osmid
+             << "}";
+      }
+    } else {
+      if (_idx->getGroup(stat->group)->osmid == 1) {
+        json << "{\"type\": 3,\"orig_gid\":" << stat->origGroup
+             << ",\"orig_osm_rel_id\":"
+             << _idx->getGroup(stat->origGroup)->osmid
+             << ",\"target_gid\":" << stat->group << "}";
+      } else if (_idx->getGroup(stat->group)->osmid > 1) {
+        json << "{\"type\": 4,\"orig_gid\":" << stat->origGroup
+             << ",\"orig_osm_rel_id\":"
+             << _idx->getGroup(stat->origGroup)->osmid
+             << ",\"target_gid\":" << stat->group
+             << ",\"target_osm_rel_id\":" << _idx->getGroup(stat->group)->osmid
+             << "}";
+      } else {
+        json << "{\"type\": 5,\"orig_gid\":" << stat->origGroup
+             << ",\"orig_osm_rel_id\":"
+             << _idx->getGroup(stat->origGroup)->osmid
+             << ",\"target_gid\":" << stat->group
+             << ",\"target_osm_rel_id\":" << _idx->getGroup(stat->group)->osmid
+             << "}";
+      }
+    }
+  }
+
+  json << "]";
+
+  json << "}";
 
   if (cb.size()) json << ")";
 

src/osmfixer/server/StatServer.h

@@ -27,7 +27,7 @@ class StatServer : public util::http::Handler {
   util::http::Answer handleMapReq(const Params& pars) const;
   util::http::Answer handleStatReq(const Params& pars) const;
 
-  static void printStation(const Station* stat, std::ostream* out);
+  void printStation(const Station* stat, std::ostream* out) const;
   static void printGroup(const Group* stat, std::ostream* out);
 
   const osmfixer::StatIdx* _idx;