changes

src/osmfixer/FixerMain.cpp

@@ -19,6 +19,8 @@ int main(int argc, char** argv) {
   // initialize randomness
   srand(time(NULL) + rand());  // NOLINT
 
+  int port = 9090;
+
   if (argc < 2) {
     LOG(ERROR) << "Missing path to stations file.";
     exit(1);
@@ -27,8 +29,9 @@ int main(int argc, char** argv) {
   StatIdx idx;
   idx.readFromFile(argv[1]);
 
-  // start server
-
+  LOG(INFO) << "Starting server...";
   StatServer serv(&idx);
-  util::http::HttpServer(9090, &serv).run();
+
+  LOG(INFO) << "Listening on port " << port;
+  util::http::HttpServer(port, &serv).run();
 }

src/osmfixer/index/StatIdx.cpp

@@ -9,11 +9,12 @@
 #include <string>
 #include "osmfixer/index/StatIdx.h"
 #include "util/geo/BezierCurve.h"
+#include "util/log/Log.h"
 
-using osmfixer::StatIdx;
+using osmfixer::Group;
 using osmfixer::OsmAttrs;
+using osmfixer::StatIdx;
 using osmfixer::Station;
-using osmfixer::Group;
 using osmfixer::Suggestion;
 
 // _____________________________________________________________________________
@@ -23,6 +24,7 @@ void StatIdx::readFromFile(const std::string& path) {
   std::string line;
 
   // first, parse nodes
+  LOG(INFO) << "Parsing nodes...";
   while (std::getline(f, line)) {
     // empty line is separator between blocks
     if (line.size() == 0) break;
@@ -50,8 +52,10 @@ void StatIdx::readFromFile(const std::string& path) {
 
     addStation(osmid, lat, lng, origGroup, group, attrs);
   }
+  LOG(INFO) << "Done.";
 
   // second, parse groups
+  LOG(INFO) << "Parsing groups... ";
   while (std::getline(f, line)) {
     // empty line is separator between blocks
     if (line.size() == 0) break;
@@ -65,7 +69,10 @@ void StatIdx::readFromFile(const std::string& path) {
     addGroup(osmid, attrs);
   }
 
+  LOG(INFO) << "Done.";
+
   // third, parse attr errs
+  LOG(INFO) << "Parsing errors... ";
   while (std::getline(f, line)) {
     // empty line is separator between blocks
     if (line.size() == 0) break;
@@ -87,10 +94,13 @@ void StatIdx::readFromFile(const std::string& path) {
 
     _stations[id].attrErrs.push_back({attr, otherAttr, conf, otherId});
   }
+  LOG(INFO) << "Done.";
 
+  LOG(INFO) << "Building indices...";
   initGroups();
   initSuggestions();
   initIndex();
+  LOG(INFO) << "Done.";
 }
 
 // _____________________________________________________________________________
@@ -99,7 +109,15 @@ void StatIdx::addStation(size_t osmid, double lat, double lng, size_t origGroup,
   auto point = util::geo::latLngToWebMerc<double>(lat, lng);
 
   _stations.emplace_back(
-      Station{_stations.size(), osmid, origGroup, group, point, attrs});
+      Station{_stations.size(),
+              osmid,
+              origGroup,
+              group,
+              point,
+              util::geo::webMercToLatLng<double>(point.getX(), point.getY()),
+              attrs,
+              {},
+              {}});
 
   // extend bounding box
   _bbox = util::geo::extendBox(point, _bbox);
@@ -119,19 +137,22 @@ 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);
+    _groups[_stations[i].origGroup].polyStations.push_back(i);
+
+    _groups[_stations[i].group].stations.push_back(i);
 
     assert(_stations[i].group < _groups.size());
     if (_stations[i].group != _stations[i].origGroup &&
         _groups[_stations[i].group].osmid == 1) {
-      // only add non-orig groups to polygons of new (non-osm) groups
-      _groups[_stations[i].group].stations.push_back(i);
+      // only add non-orig stations to polygons of new (non-osm) groups
+      _groups[_stations[i].group].polyStations.push_back(i);
     }
   }
 
+  // build hull polygon
   for (size_t i = 0; i < _groups.size(); i++) {
     util::geo::MultiPoint<double> mp;
-    for (size_t stid : _groups[i].stations) {
+    for (size_t stid : _groups[i].polyStations) {
       double rad = 11.0;
       int n = 20;
       for (int i = 0; i < n; i++) {
@@ -150,16 +171,99 @@ void StatIdx::initGroups() {
 
 // _____________________________________________________________________________
 void StatIdx::initIndex() {
-  _sgrid = util::geo::Grid<size_t, util::geo::Point, double>(5000, 5000, _bbox,
-                                                             false);
-  _ggrid = util::geo::Grid<size_t, util::geo::Polygon, double>(5000, 5000,
+  double gSize = 10000;
+  _sgrid = util::geo::Grid<size_t, util::geo::Point, double>(gSize, gSize,
+                                                             _bbox, false);
+  _ggrid = util::geo::Grid<size_t, util::geo::Polygon, double>(gSize, gSize,
                                                                _bbox, false);
-  _suggrid = util::geo::Grid<size_t, util::geo::Line, double>(5000, 5000, _bbox,
-                                                              false);
+  _suggrid = util::geo::Grid<size_t, util::geo::Line, double>(gSize, gSize,
+                                                              _bbox, false);
+
   for (size_t i = 0; i < _stations.size(); i++) _sgrid.add(_stations[i].pos, i);
   for (size_t i = 0; i < _groups.size(); i++) _ggrid.add(_groups[i].poly, i);
   for (size_t i = 0; i < _suggestions.size(); i++)
     _suggrid.add(_suggestions[i].arrow, i);
+
+  _heatGridsOk.resize(10);
+  _heatGridsSugg.resize(10);
+  _heatGridsErr.resize(10);
+
+  for (size_t i = 0; i < 10; i++) {
+    _heatGridsOk[i] = (util::geo::Grid<osmfixer::Cluster, util::geo::Point, double>(
+        5000, 5000, _bbox, false));
+    _heatGridsSugg[i] = (util::geo::Grid<osmfixer::Cluster, util::geo::Point, double>(
+        5000, 5000, _bbox, false));
+    _heatGridsErr[i] = (util::geo::Grid<osmfixer::Cluster, util::geo::Point, double>(
+        5000, 5000, _bbox, false));
+    int step = 2000 * (i + 1);
+
+    for (size_t x = 1; x * step < (_sgrid.getXWidth() * gSize); x++) {
+      for (size_t y = 1; y * step < (_sgrid.getYHeight() * gSize); y++) {
+        std::set<size_t> tmp;
+        auto reqBox = util::geo::DBox({_bbox.getLowerLeft().getX() + (x - 1) * step, _bbox.getLowerLeft().getY() + (y - 1) * step}, {_bbox.getLowerLeft().getX() + x * step, _bbox.getLowerLeft().getY() + y * step});
+        _sgrid.get(reqBox, &tmp);
+
+        size_t countOk = 0;
+        double avgXOk = 0;
+        double avgYOk = 0;
+
+        size_t countSugg = 0;
+        double avgXSugg = 0;
+        double avgYSugg = 0;
+
+        size_t countErr = 0;
+        double avgXErr = 0;
+        double avgYErr = 0;
+
+        for (auto j : tmp) {
+          const auto& stat = _stations[j];
+          if (stat.suggestions.size() == 0 && stat.attrErrs.size() == 0) {
+            if (util::geo::contains(stat.pos, reqBox)) {
+              countOk++;
+              avgXOk += stat.pos.getX();
+              avgYOk += stat.pos.getY();
+            }
+          } else if (stat.suggestions.size() > 0 && stat.attrErrs.size() == 0) {
+            if (util::geo::contains(stat.pos, reqBox)) {
+              countSugg++;
+              avgXSugg += stat.pos.getX();
+              avgYSugg += stat.pos.getY();
+            }
+          } else if (stat.attrErrs.size() > 0) {
+            if (util::geo::contains(stat.pos, reqBox)) {
+              countErr++;
+              avgXErr += stat.pos.getX();
+              avgYErr += stat.pos.getY();
+            }
+          }
+        }
+
+        if (countOk != 0) {
+          avgXOk /= countOk;
+          avgYOk /= countOk;
+          auto ll = util::geo::webMercToLatLng<double>(avgXOk, avgYOk);
+
+          _heatGridsOk[i].add({avgXOk, avgYOk}, Cluster{{avgXOk, avgYOk}, ll, countOk});
+        }
+
+        if (countSugg != 0) {
+          avgXSugg /= countSugg;
+          avgYSugg /= countSugg;
+          auto ll = util::geo::webMercToLatLng<double>(avgXSugg, avgYSugg);
+
+          _heatGridsSugg[i].add({avgXSugg, avgYSugg}, Cluster{{avgXSugg, avgYSugg}, ll, countSugg});
+        }
+
+        if (countErr != 0) {
+          avgXErr /= countErr;
+          avgYErr /= countErr;
+          auto ll = util::geo::webMercToLatLng<double>(avgXErr, avgYErr);
+
+          _heatGridsErr[i].add({avgXErr, avgYErr}, Cluster{{avgXErr, avgYErr}, ll, countErr});
+        }
+      }
+    }
+  }
 }
 
 // _____________________________________________________________________________
@@ -196,7 +300,7 @@ std::vector<const Group*> StatIdx::getGroups(const util::geo::DBox bbox) const {
   _ggrid.get(reqBox, &tmp);
 
   for (auto i : tmp) {
-    if (util::geo::intersects(_groups[i].poly, reqBox))
+    // if (util::geo::intersects(_groups[i].poly, reqBox))
       ret.push_back(&_groups[i]);
   }
 
@@ -231,6 +335,83 @@ const Station* StatIdx::getStation(size_t id) const {
 }
 
 // _____________________________________________________________________________
+std::vector<osmfixer::Cluster> StatIdx::getHeatGridErr(const util::geo::DBox bbox,
+                                                    size_t z) const {
+  auto ll = util::geo::latLngToWebMerc<double>(bbox.getLowerLeft().getX(),
+                                               bbox.getLowerLeft().getY());
+  auto ur = util::geo::latLngToWebMerc<double>(bbox.getUpperRight().getX(),
+                                               bbox.getUpperRight().getY());
+
+  auto reqBox = util::geo::DBox(ll, ur);
+
+  z = fmin(9, z);
+  z = fmax(0, z);
+
+  const auto& grid = _heatGridsErr[9 - z];
+  std::vector<osmfixer::Cluster> ret;
+
+  std::set<osmfixer::Cluster> tmp;
+  grid.get(reqBox, &tmp);
+
+  for (const auto& i : tmp) {
+    if (util::geo::contains(i.pos, reqBox)) ret.push_back(i);
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+std::vector<osmfixer::Cluster> StatIdx::getHeatGridOk(const util::geo::DBox bbox,
+                                                    size_t z) const {
+  auto ll = util::geo::latLngToWebMerc<double>(bbox.getLowerLeft().getX(),
+                                               bbox.getLowerLeft().getY());
+  auto ur = util::geo::latLngToWebMerc<double>(bbox.getUpperRight().getX(),
+                                               bbox.getUpperRight().getY());
+
+  auto reqBox = util::geo::DBox(ll, ur);
+
+  z = fmin(9, z);
+  z = fmax(0, z);
+
+  const auto& grid = _heatGridsOk[9 - z];
+  std::vector<osmfixer::Cluster> ret;
+
+  std::set<osmfixer::Cluster> tmp;
+  grid.get(reqBox, &tmp);
+
+  for (const auto& i : tmp) {
+    if (util::geo::contains(i.pos, reqBox)) ret.push_back(i);
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+std::vector<osmfixer::Cluster> StatIdx::getHeatGridSugg(const util::geo::DBox bbox,
+                                                    size_t z) const {
+  auto ll = util::geo::latLngToWebMerc<double>(bbox.getLowerLeft().getX(),
+                                               bbox.getLowerLeft().getY());
+  auto ur = util::geo::latLngToWebMerc<double>(bbox.getUpperRight().getX(),
+                                               bbox.getUpperRight().getY());
+
+  auto reqBox = util::geo::DBox(ll, ur);
+
+  z = fmin(9, z);
+  z = fmax(0, z);
+
+  const auto& grid = _heatGridsSugg[9 - z];
+  std::vector<osmfixer::Cluster> ret;
+
+  std::set<osmfixer::Cluster> tmp;
+  grid.get(reqBox, &tmp);
+
+  for (const auto& i : tmp) {
+    if (util::geo::contains(i.pos, reqBox)) ret.push_back(i);
+  }
+
+  return ret;
+}
+// _____________________________________________________________________________
 void StatIdx::initSuggestions() {
   for (size_t i = 0; i < _stations.size(); i++) {
     auto& stat = _stations[i];
@@ -261,7 +442,8 @@ void StatIdx::initSuggestions() {
           stat.suggestions.push_back(_suggestions.size() - 1);
         }
       } else {
-        if (getGroup(stat.group)->osmid == 1) {
+        if (getGroup(stat.group)->osmid == 1 &&
+            getGroup(stat.group)->stations.size() > 1) {
           // move station from relation into new group
           sug.type = 3;
           sug.orig_gid = stat.origGroup;

src/osmfixer/index/StatIdx.h

@@ -34,6 +34,7 @@ struct Station {
   size_t osmid;
   size_t origGroup, group;
   util::geo::DPoint pos;
+  util::geo::DPoint latLng;
   OsmAttrs attrs;
   std::vector<AttrErr> attrErrs;
   std::vector<size_t> suggestions;
@@ -45,6 +46,14 @@ struct Group {
   util::geo::DPolygon poly;
   OsmAttrs attrs;
   std::vector<size_t> stations;
+  std::vector<size_t> polyStations;
+};
+
+struct Cluster {
+  util::geo::DPoint pos;
+  util::geo::DPoint latLng;
+  size_t size;
+  bool operator<(const Cluster& other) const { return this < &other; }
 };
 
 class StatIdx {
@@ -55,12 +64,22 @@ class StatIdx {
 
   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(const util::geo::DBox bbox) const;
+  std::vector<const Suggestion*> getSuggestions(
+      const util::geo::DBox bbox) const;
 
   const Station* getStation(size_t id) const;
   const Group* getGroup(size_t id) const;
   const Suggestion* getSuggestion(size_t id) const;
 
+  std::vector<Cluster> getHeatGridOk(const util::geo::DBox bbox,
+      size_t z) const;
+
+  std::vector<Cluster> getHeatGridSugg(const util::geo::DBox bbox,
+      size_t z) const;
+
+  std::vector<Cluster> getHeatGridErr(const util::geo::DBox bbox,
+      size_t z) const;
+
  private:
   void addStation(size_t id, double lat, double lng, size_t origGroup,
                   size_t group, const OsmAttrs& attrs);
@@ -80,6 +99,10 @@ class StatIdx {
   util::geo::Grid<size_t, util::geo::Point, double> _sgrid;
   util::geo::Grid<size_t, util::geo::Polygon, double> _ggrid;
   util::geo::Grid<size_t, util::geo::Line, double> _suggrid;
+
+  std::vector<util::geo::Grid<Cluster, util::geo::Point, double>> _heatGridsOk;
+  std::vector<util::geo::Grid<Cluster, util::geo::Point, double>> _heatGridsSugg;
+  std::vector<util::geo::Grid<Cluster, util::geo::Point, double>> _heatGridsErr;
 };
 }  // namespace osmfixer
 

src/osmfixer/server/StatServer.cpp

@@ -9,8 +9,8 @@
 #include "util/geo/Geo.h"
 #include "util/log/Log.h"
 
-using osmfixer::StatServer;
 using osmfixer::Params;
+using osmfixer::StatServer;
 
 // _____________________________________________________________________________
 util::http::Answer StatServer::handle(const util::http::Req& req,
@@ -57,6 +57,9 @@ util::http::Answer StatServer::handleHeatMapReq(const Params& pars) const {
   if (pars.count("cb")) cb = pars.find("cb")->second.c_str();
   auto box = util::split(pars.find("bbox")->second, ',');
 
+  double z = 0;
+  if (pars.count("z")) z = atoi(pars.find("z")->second.c_str());
+
   if (box.size() != 4) throw std::invalid_argument("Invalid request.");
 
   double lat1 = atof(box[0].c_str());
@@ -64,64 +67,66 @@ util::http::Answer StatServer::handleHeatMapReq(const Params& pars) const {
   double lat2 = atof(box[2].c_str());
   double lng2 = atof(box[3].c_str());
 
-  std::cout << pars.find("bbox")->second << std::endl;
-
   util::geo::DBox bbox(util::geo::DPoint(lat1, lng1),
                        util::geo::DPoint(lat2, lng2));
 
   std::stringstream json;
 
-  json << std::setprecision(10);
+  size_t p = 5;
+  if (z < 10) p = 4;
+  if (z < 8) p = 3;
+  if (z < 6) p = 2;
+
+  json << std::fixed << std::setprecision(p);
 
   if (cb.size()) json << cb << "(";
   json << "{\"ok\":[";
 
-  auto ret = _idx->getStations(bbox);
+  auto hgOk = _idx->getHeatGridOk(bbox, z);
   char sep = ' ';
-  for (auto stat : ret) {
-    if (stat->suggestions.size() != 0 || stat->attrErrs.size() != 0) continue;
+  for (auto cluster : hgOk) {
     json << sep;
     sep = ',';
 
-    auto latLng =
-        util::geo::webMercToLatLng<double>(stat->pos.getX(), stat->pos.getY());
-    json << "[" << latLng.getY() << "," << latLng.getX() << "," << "0.5" << "]";
+    json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX() << ","
+         << cluster.size << "]";
   }
 
-
   json << "],\"sugg\":[";
 
+  auto hgSugg = _idx->getHeatGridSugg(bbox, z);
+
   sep = ' ';
-  for (auto stat : ret) {
-    if (stat->suggestions.size() == 0) continue;
+  for (auto cluster : hgSugg) {
     json << sep;
     sep = ',';
 
-    auto latLng =
-        util::geo::webMercToLatLng<double>(stat->pos.getX(), stat->pos.getY());
-    json << "[" << latLng.getY() << "," << latLng.getX() << "," << "0.5" << "]";
+    json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX() << ","
+         << cluster.size << "]";
   }
 
   json << "],\"err\":[";
 
+  auto hgErr = _idx->getHeatGridErr(bbox, z);
+
   sep = ' ';
-  for (auto stat : ret) {
-    if (stat->attrErrs.size() == 0) continue;
+  for (auto cluster : hgErr) {
     json << sep;
     sep = ',';
 
-    auto latLng =
-        util::geo::webMercToLatLng<double>(stat->pos.getX(), stat->pos.getY());
-    json << "[" << latLng.getY() << "," << latLng.getX() << "," << "0.5" << "]";
+    json << "[" << cluster.latLng.getY() << "," << cluster.latLng.getX() << ","
+         << cluster.size << "]";
   }
 
   json << "]}";
 
   if (cb.size()) json << ")";
 
-  auto answ = util::http::Answer("200 OK", json.str(), true);
+  util::http::Answer answ = util::http::Answer("200 OK", json.str(), true);
   answ.params["Content-Type"] = "application/javascript; charset=utf-8";
 
+  LOG(INFO) << "Done.";
+
   return answ;
 }
 
@@ -140,16 +145,12 @@ util::http::Answer StatServer::handleMapReq(const Params& pars) const {
   double lat2 = atof(box[2].c_str());
   double lng2 = atof(box[3].c_str());
 
-  std::cout << pars.find("bbox")->second << std::endl;
-
   util::geo::DBox bbox(util::geo::DPoint(lat1, lng1),
                        util::geo::DPoint(lat2, lng2));
 
-  LOG(INFO) << "Request for bounding box " << util::geo::getWKT(bbox);
-
   std::stringstream json;
 
-  json << std::setprecision(10);
+  json << std::fixed << std::setprecision(6);
 
   if (cb.size()) json << cb << "(";
   json << "{\"stats\":[";
@@ -166,13 +167,13 @@ 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;
+    if (group->polyStations.size() == 1) continue;
     json << sep;
     sep = ',';
     printGroup(group, &json);
   }
 
-  json << "], \"suggestions\":[";
+  json << "], \"su\":[";
   auto suggs = _idx->getSuggestions(bbox);
   sep = ' ';
   for (auto sugg : suggs) {
@@ -199,7 +200,7 @@ void StatServer::printStation(const Station* stat, std::ostream* out) const {
          << ",\"lon\":" << latLng.getX();
 
   if (stat->origGroup != stat->group || _idx->getGroup(stat->group)->osmid == 1)
-    (*out) << ",\"suggestion\":1";
+    (*out) << ",\"su\":1";
 
   if (stat->attrErrs.size())
     (*out) << ",\"attrerrs\":" << stat->attrErrs.size();
@@ -315,6 +316,8 @@ util::http::Answer StatServer::handleGroupReq(const Params& pars) const {
     const auto stat = _idx->getStation(sid);
     json << "{\"id\":" << sid << ","
          << "\"osmid\":" << stat->osmid << ","
+         << "\"group\":" << stat->group << ","
+         << "\"orig_group\":" << stat->origGroup << ","
          << "\"attrs\":{";
 
     char sep = ' ';
@@ -361,7 +364,7 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
 
   std::stringstream json;
 
-  json << std::setprecision(10);
+  json << std::fixed << std::setprecision(6);
 
   if (cb.size()) json << cb << "(";
   json << "{\"id\":" << sid << ","
@@ -404,7 +407,7 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
 
   json << "]";
 
-  json << ",\"suggestions\":[";
+  json << ",\"su\":[";
 
   // suggestions
   if (stat->group != stat->origGroup ||
@@ -418,7 +421,8 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
              << "}";
       }
     } else {
-      if (_idx->getGroup(stat->group)->osmid == 1) {
+      if (_idx->getGroup(stat->group)->osmid == 1 &&
+          _idx->getGroup(stat->group)->stations.size() > 1) {
         json << "{\"type\": 3,\"orig_gid\":" << stat->origGroup
              << ",\"orig_osm_rel_id\":"
              << _idx->getGroup(stat->origGroup)->osmid

web/index.html

@@ -72,11 +72,33 @@
             margin-top: 10px;
         }
 
-        #sugg .sugtit {
+        #sugg .sugtit, .oldmemberstit, .newmemberstit {
             font-style: normal;
             font-weight: bold;
         }
 
+        #group-stations-new, #group-stations-old {
+                        margin-top: 8px;
+            padding-top: 4px;
+            border-top: solid 1px #AAA;
+        }
+
+        #group-stations-new div {
+            background-color: #0000ff36;
+            border-left: solid 4px #0000ff;
+            padding: 2px;
+            margin: 2px;
+            padding-left: 5px;
+        }
+
+        #group-stations-old div {
+            background-color: #00ff0036;
+            border-left: solid 4px #00ff00;
+            padding: 2px;
+            margin: 2px;
+            padding-left: 5px;
+        }
+
         #sugg {
             margin-top: 8px;
             padding-top: 4px;

web/script.js

@@ -10,7 +10,7 @@ function marker(stat, z) {
             [stat.lat, stat.lon],
             {
                 color: 'black',
-                fillColor: stat.attrerrs ? 'red' : stat.suggestion ? 'blue' : '#78f378', 
+                fillColor: stat.attrerrs ? 'red' : stat.su ? 'blue' : '#78f378', 
                 radius: mwidths[23 - z],
                 fillOpacity : 1,
                 weight : 1,
@@ -21,7 +21,7 @@ function marker(stat, z) {
         return L.polyline(
             [[stat.lat, stat.lon], [stat.lat, stat.lon]],
             {
-                color: stat.attrerrs ? 'red' : stat.suggestion ? 'blue' : '#78f378',
+                color: stat.attrerrs ? 'red' : stat.su ? 'blue' : '#78f378',
                 weight: widths[15 - z],
                 opacity: opas[15 - z],
                 id : stat.id
@@ -31,8 +31,16 @@ function marker(stat, z) {
 }
 
 function poly(group, z) {
-    if (group.new) return L.polygon(group.poly, {color: "blue", smoothFactor : 0.4, fillOpacity:0.2, id : group.id})
-    return L.polygon(group.poly, {color: '#85f385', smoothFactor : 1, fillOpacity:0.2, id : group.id})
+    var style = {color: "#85f385", smoothFactor : 0.4, fillOpacity:0.2, id : group.id};
+    if (group.new) {
+        style.color = "blue";
+    }
+    if (z < 16) {
+        style.weight = 11;
+        style.opacity = 0.5;
+        style.fillOpacity = 0.5;
+    }
+    return L.polygon(group.poly, style)
 }
 
 function sugArr(sug, z) {
@@ -72,7 +80,7 @@ function renderStat(stat, ll) {
         tbody.appendChild(row);
         row.appendChild(col1);
         row.appendChild(col2);
-        col1.innerHTML = "<a href=\"https://wiki.openstreetmap.org/wiki/Key:" + key + "\" target=\"_blank\">" + key + "</a>";
+        col1.innerHTML = "<a href=\"https://wiki.openstreetmap.org/wiki/Key:" + key + "\" target=\"_blank\"><tt>" + key + "</tt></a>";
         for (var i = 0; i <  stat.attrs[key].length; i++) col2.innerHTML += "<span class='attrval'>" + stat.attrs[key][i] + "</span>"+ "<br>";
         attrrows[key] = row;
     }
@@ -93,25 +101,25 @@ function renderStat(stat, ll) {
         row.childNodes[1].appendChild(info);
     }
 
-    if (stat.suggestions.length) {        
+    if (stat.su.length) {        
         suggD.innerHTML = "<span class='sugtit'>Suggestions</span>";
     }
 
-    for (var i = 0; i < stat.suggestions.length; i++) {
-        var sugg = stat.suggestions[i];
+    for (var i = 0; i < stat.su.length; i++) {
+        var sugg = stat.su[i];
 
         var suggDiv = document.createElement('div');
         
         if (sugg.type == 1) {
-            suggDiv.innerHTML = "&bull; Move node into a <span class='grouplink' onmouseover='groupHl( " + sugg.target_gid + ")' onmouseout='groupUnHl( " + sugg.target_gid + ")'>new relation</span>";
+            suggDiv.innerHTML = "&bull; Move node into a <span class='grouplink' onmouseover='groupHl( " + sugg.target_gid + ")' onmouseout='groupUnHl( " + sugg.target_gid + ")'>new relation</span> <tt>public_transport=stop_area</tt>";
         } else if (sugg.type == 2) {
             suggDiv.innerHTML = "&bull; Move node into existing relation <a onmouseover='groupHl( " + sugg.target_gid + ")' onmouseout='groupUnHl( " + sugg.target_gid + ")' href=\"https://www.openstreetmap.org/relation/" + sugg.target_osm_rel_id + "\" target=\"_blank\">" + sugg.target_osm_rel_id + "</a>.";
         } else if (sugg.type == 3) {
-            suggDiv.innerHTML = "&bull; Move node from existing relation <a onmouseover='groupHl( " + sugg.target_gid + ")' onmouseout='groupUnHl( " + sugg.target_gid + ")' href=\"https://www.openstreetmap.org/relation/" + sugg.orig_osm_rel_id + "\" target=\"_blank\">" + sugg.orig_osm_rel_id + "</a> into new relation (internal id=" + sugg.target_gid + ")";
+            suggDiv.innerHTML = "&bull; Move node from existing relation <a onmouseover='groupHl( " + sugg.orig_gid + ")' onmouseout='groupUnHl( " + sugg.orig_gid + ")' href=\"https://www.openstreetmap.org/relation/" + sugg.orig_osm_rel_id + "\" target=\"_blank\">" + sugg.orig_osm_rel_id + "</a> into a <span class='grouplink' onmouseover='groupHl( " + sugg.target_gid + ")' onmouseout='groupUnHl( " + sugg.target_gid + ")'>new relation</span> <tt>public_transport=stop_area</tt>";
         } else if (sugg.type == 4) {
-            suggDiv.innerHTML = "&bull; Move node from existing relation <a onmouseover='groupHl( " + sugg.target_gid + ")' onmouseout='groupUnHl( " + sugg.target_gid + ")' href=\"https://www.openstreetmap.org/relation/" + sugg.orig_osm_rel_id + "\" target=\"_blank\">" + sugg.orig_osm_rel_id + "</a> into existing relation <a href=\"https://www.openstreetmap.org/relation/" + sugg.target_osm_rel_id + "\" target=\"_blank\">" + sugg.target_osm_rel_id + "</a>.";
+            suggDiv.innerHTML = "&bull; Move node from existing relation <a onmouseover='groupHl( " + sugg.orig_gid + ")' onmouseout='groupUnHl( " + sugg.orig_gid + ")' href=\"https://www.openstreetmap.org/relation/" + sugg.orig_osm_rel_id + "\" target=\"_blank\">" + sugg.orig_osm_rel_id + "</a> into existing relation <a href=\"https://www.openstreetmap.org/relation/" + sugg.target_osm_rel_id + "\" target=\"_blank\">" + sugg.target_osm_rel_id + "</a>.";
         } else if (sugg.type == 5) {
-            suggDiv.innerHTML = "&bull; Move node out of existing relation <a onmouseover='groupHl( " + sugg.target_gid + ")' onmouseout='groupUnHl( " + sugg.target_gid + ")' href=\"https://www.openstreetmap.org/relation/" + sugg.orig_osm_rel_id + "\" target=\"_blank\">" + sugg.orig_osm_rel_id + "</a>!";
+            suggDiv.innerHTML = "&bull; Move node out of existing relation <a onmouseover='groupHl( " + sugg.orig_gid + ")' onmouseout='groupUnHl( " + sugg.orig_gid + ")' href=\"https://www.openstreetmap.org/relation/" + sugg.orig_osm_rel_id + "\" target=\"_blank\">" + sugg.orig_osm_rel_id + "</a>!";
         }
 
         suggD.appendChild(suggDiv);
@@ -145,31 +153,37 @@ function renderGroup(grp, ll) {
     var attrrows = {};
 
     var content = document.createElement('div');
-    content.setAttribute("id", "nav")
-    var attrTbl = document.createElement('table');
-     attrTbl.setAttribute("id", "attr-tbl")
-    var suggD = document.createElement('table');
-    suggD.setAttribute("id", "sugg")
+    content.setAttribute("id", "nav");
 
+    var newMembers = document.createElement('div');
+    newMembers.setAttribute("id", "group-stations-new")
+    newMembers.innerHTML = "<span class='newmemberstit'>New Members</span>";
 
-    content.innerHTML = "Relation <a onmouseover='groupHl( " + grp.id + ")' onmouseout='groupUnHl( " + grp.id + ")' target='_blank' href='https://www.openstreetmap.org/relation/" + grp.osmid + "'>" + grp.osmid + "</a>";
+    var oldMembers = document.createElement('div');
+    oldMembers.setAttribute("id", "group-stations-old")
+    oldMembers.innerHTML = "<span class='oldmemberstit'>Existing Members</span>";
 
-    content.appendChild(attrTbl);
-    content.appendChild(suggD);
+    if (grp.osmid == 1) {
+        content.innerHTML = "<span class='grouplink' onmouseover='groupHl( " + grp.id + ")' onmouseout='groupUnHl( " + grp.id + ")'>New Relation <tt>public_transport=stop_area</tt></span>";
+    } else {
+        content.innerHTML = "OSM relation <a onmouseover='groupHl( " + grp.id + ")' onmouseout='groupUnHl( " + grp.id + ")' target='_blank' href='https://www.openstreetmap.org/relation/" + grp.osmid + "'>" + grp.osmid + "</a>";
+    }
 
-    var tbody = document.createElement('tbody');
-    attrTbl.appendChild(tbody);
+    content.appendChild(newMembers);
+    if (grp.osmid != 1) content.appendChild(oldMembers);
 
     for (var key in grp.stations) {
-        //var row = document.createElement('tr');
-        //var col1 = document.createElement('td');
-        //var col2 = document.createElement('td');
-        //tbody.appendChild(row);
-        //row.appendChild(col1);
-        //row.appendChild(col2);
-        //col1.innerHTML = "<a href=\"https://wiki.openstreetmap.org/wiki/Key:" + key + "\" target=\"_blank\">" + key + "</a>";
-        //for (var i = 0; i <  stat.attrs[key].length; i++) col2.innerHTML += "<span class='attrval'>" + stat.attrs[key][i] + "</span>"+ "<br>";
-        //attrrows[key] = row;
+        var stat = grp.stations[key];
+        var row = document.createElement('div');
+
+        if (stat.attrs.name) {        
+            row.innerHTML = "Node <a onmouseover='nodeHl( " + stat.id + ")' onmouseout='nodeUnHl( " + stat.id + ")' target='_blank' href='https://www.openstreetmap.org/node/" + stat.osmid + "'>" + stat.osmid + "</a> (<b>\"" + stat.attrs.name + "\"</b>)";
+        } else {
+            row.innerHTML = "Node <a onmouseover='nodeHl( " + stat.id + ")' onmouseout='nodeUnHl( " + stat.id + ")' target='_blank' href='https://www.openstreetmap.org/node/" + stat.osmid + "'>" + stat.osmid + "</a>";
+        }
+
+        if (grp.osmid == 1 || stat.orig_group != grp.id) newMembers.appendChild(row);
+        else oldMembers.appendChild(row);
     }
 
     if (map.getZoom() < 18) {
@@ -245,7 +259,6 @@ map.on("moveend", function () {
     render();
 });
 
-
 function render() {
     var xmlhttp = new XMLHttpRequest();
 
@@ -257,19 +270,17 @@ function render() {
                 layer.clearLayers();
                 labelLayer.clearLayers();
 
-                var blur = 21 - map.getZoom();
-                var rad = 21 - map.getZoom();
+                var blur = 22 - map.getZoom();
+                var rad = 25 - map.getZoom();
 
-                blur = Math.max(5, Math.min(9, blur));
-                rad = Math.min(10, rad);
-
-                layer.addLayer(L.heatLayer(content.ok, {gradient: {0: '#cbf7cb', 0.5: '#78f378', 1: '#29c329'}, minOpacity: 1, blur: blur, radius: rad, maxZoom: 15}));
-                layer.addLayer(L.heatLayer(content.sugg, {gradient: {0: '#7f7fbd', 0.5: '#4444b3', 1: '#0606c1'}, minOpacity: 1, blur: blur-3, radius: rad-3, maxZoom: 15}));
-                layer.addLayer(L.heatLayer(content.err, {gradient: {0: '#f39191', 0.5: '#ff5656', 1: '#ff0000'}, minOpacity: 1, blur: blur-3, radius: rad-3, maxZoom: 15}));
+                layer.addLayer(L.heatLayer(content.ok, {max: 500, gradient: {0: '#cbf7cb', 0.5: '#78f378', 1: '#29c329'}, minOpacity: 0.65, blur: blur, radius: rad}));
+                layer.addLayer(L.heatLayer(content.sugg, {max: 500, gradient: {0: '#7f7fbd', 0.5: '#4444b3', 1: '#0606c1'}, minOpacity: 0.65, blur: blur-3, radius: rad-4}));
+                
+                layer.addLayer(L.heatLayer(content.err, {max: 500, gradient: {0: '#f39191', 0.5: '#ff5656', 1: '#ff0000'}, minOpacity: 0.75, blur: blur-3, radius: rad-3, maxZoom: 15}));
             }
         };
 
-        xmlhttp.open("GET", "http://localhost:9090/heatmap?bbox=" + [map.getBounds().getSouthWest().lat, map.getBounds().getSouthWest().lng, map.getBounds().getNorthEast().lat, map.getBounds().getNorthEast().lng].join(","), true);
+        xmlhttp.open("GET", "http://localhost:9090/heatmap?z=" + map.getZoom() + "&bbox=" + [map.getBounds().getSouthWest().lat, map.getBounds().getSouthWest().lng, map.getBounds().getNorthEast().lat, map.getBounds().getNorthEast().lng].join(","), true);
         xmlhttp.send();
     } else {
         xmlhttp.onreadystatechange = function() {
@@ -299,8 +310,8 @@ function render() {
                 }
 
                 var suggs = [];
-                for (var i = 0; i < content.suggestions.length; i++) {
-                    sugg = content.suggestions[i];
+                for (var i = 0; i < content.su.length; i++) {
+                    sugg = content.su[i];
                     var a = sugArr(sugg, map.getZoom());
                     suggs.push(a[0]);                    
                     suggs.push(a[1]);
@@ -308,10 +319,13 @@ function render() {
 
                 if (map.getZoom() > 15) {
                    labelLayer.addLayer(L.featureGroup(labels));
-                   layer.addLayer(L.featureGroup(groups).on('click', function(a) { openGroup(a.layer.options.id, a.layer.getBounds().getCenter());}));
                    layer.addLayer(L.featureGroup(suggs).on('click', function(a) { openStat(a.layer.options.id, a.layer.getBounds().getCenter());}));
                 }
 
+                if (map.getZoom() > 13) {
+                   layer.addLayer(L.featureGroup(groups).on('click', function(a) { openGroup(a.layer.options.id, a.layer.getBounds().getCenter());}));
+                }
+
 
                 layer.addLayer(L.featureGroup(stations).on('click', function(a) {
                     openStat(a.layer.options.id, a.layer.getBounds().getCenter());}));