changes

src/osmfixer/server/StatServer.cpp

@@ -29,6 +29,8 @@ util::http::Answer StatServer::handle(const util::http::Req& req,
       a = handleHeatMapReq(params);
     } else if (cmd == "/stat") {
       a = handleStatReq(params);
+    } else if (cmd == "/group") {
+      a = handleGroupReq(params);
     } else {
       a = util::http::Answer("404 Not Found", "dunno");
     }
@@ -268,6 +270,84 @@ std::string StatServer::parseUrl(std::string u, std::string pl,
 }
 
 // _____________________________________________________________________________
+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.");
+  std::string cb;
+  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);
+
+  if (!group) return util::http::Answer("404 Not Found", "Group not found.");
+
+  std::stringstream json;
+
+  json << std::setprecision(10);
+
+  if (cb.size()) json << cb << "(";
+  json << "{\"id\":" << gid << ","
+       << "\"osmid\":" << group->osmid << ","
+       << "\"attrs\":{";
+
+  char sep = ' ';
+
+  for (const auto& par : group->attrs) {
+    json << sep;
+    sep = ',';
+    json << "\"" << util::jsonStringEscape(par.first) << "\":[";
+
+    char sep2 = ' ';
+    for (const auto& val : par.second) {
+      json << sep2;
+      sep2 = ',';
+      json << "\"" << util::jsonStringEscape(val) << "\"";
+    }
+    json << "]";
+  }
+
+  json << "},\"stations\":[";
+
+  sep = ' ';
+  for (const auto& sid : group->stations) {
+    json << sep;
+    sep = ',';
+    const auto stat = _idx->getStation(sid);
+    json << "{\"id\":" << sid << ","
+         << "\"osmid\":" << stat->osmid << ","
+         << "\"attrs\":{";
+
+    char sep = ' ';
+
+    for (const auto& par : stat->attrs) {
+      json << sep;
+      sep = ',';
+      json << "\"" << util::jsonStringEscape(par.first) << "\":[";
+
+      char sep2 = ' ';
+      for (const auto& val : par.second) {
+        json << sep2;
+        sep2 = ',';
+        json << "\"" << util::jsonStringEscape(val) << "\"";
+      }
+      json << "]";
+    }
+    json << "}}";
+  }
+
+  json << "]";
+
+  json << "}";
+
+  if (cb.size()) json << ")";
+
+  auto answ = util::http::Answer("200 OK", json.str(), true);
+  answ.params["Content-Type"] = "application/javascript; charset=utf-8";
+
+  return answ;
+}
+
+// _____________________________________________________________________________
 util::http::Answer StatServer::handleStatReq(const Params& pars) const {
   if (pars.count("id") == 0 || pars.find("id")->second.empty())
     throw std::invalid_argument("No ID specified.");

src/osmfixer/server/StatServer.h

@@ -27,6 +27,7 @@ class StatServer : public util::http::Handler {
   util::http::Answer handleMapReq(const Params& pars) const;
   util::http::Answer handleHeatMapReq(const Params& pars) const;
   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;
   static void printGroup(const Group* stat, std::ostream* out);

web/script.js

@@ -31,8 +31,8 @@ function marker(stat, z) {
 }
 
 function poly(group, z) {
-    if (group.new) return L.polygon(group.poly, {color: "blue", smoothFactor : 0.4, fillOpacity:0.2})
-    return L.polygon(group.poly, {color: '#85f385', smoothFactor : 1, fillOpacity:0.2})
+    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})
 }
 
 function sugArr(sug, z) {
@@ -141,6 +141,60 @@ function openStat(id, ll) {
     xmlhttp.send();
 }
 
+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.innerHTML = "Relation <a onmouseover='groupHl( " + grp.id + ")' onmouseout='groupUnHl( " + grp.id + ")' target='_blank' href='https://www.openstreetmap.org/relation/" + grp.osmid + "'>" + grp.osmid + "</a>";
+
+    content.appendChild(attrTbl);
+    content.appendChild(suggD);
+
+    var tbody = document.createElement('tbody');
+    attrTbl.appendChild(tbody);
+
+    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;
+    }
+
+    if (map.getZoom() < 18) {
+        map.setView(ll, 18, {animate: true});
+    }
+
+    L.popup({opacity: 0.8})
+        .setLatLng(ll)
+        .setContent(content)
+        .openOn(map);
+}
+
+function openGroup(id, ll) {
+    var xmlhttp = new XMLHttpRequest();
+    xmlhttp.onreadystatechange = function() {
+        if (this.readyState == 4 && this.status == 200) {
+            var content = JSON.parse(this.responseText);
+            renderGroup(content, ll);
+        }
+    };
+
+    xmlhttp.open("GET", "http://localhost:9090/group?id=" + id, true);
+    xmlhttp.send();
+}
+
 function groupHl(id) {
     if (!document.groupIdx[id]) return;
     document.groupIdx[id].setStyle({
@@ -254,7 +308,7 @@ function render() {
 
                 if (map.getZoom() > 15) {
                    labelLayer.addLayer(L.featureGroup(labels));
-                   layer.addLayer(L.featureGroup(groups).on('click', function(a) { console.log(a.layer.options);}));
+                   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());}));
                 }