changes

src/osmfixer/index/StatIdx.cpp

@@ -99,6 +99,7 @@ void StatIdx::readFromFile(const std::string& path) {
   LOG(INFO) << "Building indices...";
   initGroups();
   initSuggestions();
+
   initIndex();
   LOG(INFO) << "Done.";
 }
@@ -436,7 +437,8 @@ void StatIdx::initSuggestions() {
           sug.target_gid = stat.group;
           sug.target_osm_rel_id = getGroup(stat.group)->osmid;
 
-          sug.arrow = getGroupArrow(i, stat.group);
+          auto b = util::geo::centroid(getGroup(stat.group)->poly);
+          sug.arrow = getGroupArrow(i, b);
 
           _suggestions.push_back(sug);
           stat.suggestions.push_back(_suggestions.size() - 1);
@@ -450,7 +452,8 @@ void StatIdx::initSuggestions() {
           sug.orig_osm_rel_id = getGroup(stat.origGroup)->osmid;
           sug.target_gid = stat.group;
 
-          sug.arrow = getGroupArrow(i, stat.group);
+          auto b = util::geo::centroid(getGroup(stat.group)->poly);
+          sug.arrow = getGroupArrow(i, b);
 
           _suggestions.push_back(sug);
           stat.suggestions.push_back(_suggestions.size() - 1);
@@ -471,6 +474,14 @@ void StatIdx::initSuggestions() {
           sug.target_gid = stat.group;
           sug.target_osm_rel_id = getGroup(stat.group)->osmid;
 
+          auto b = stat.pos;
+          b.setX(b.getX() + 50);
+          b.setY(b.getY() + 50);
+
+          std::cout << util::geo::getWKT(b) << std::endl;
+
+          sug.arrow = getGroupArrow(i, b);
+
           _suggestions.push_back(sug);
           stat.suggestions.push_back(_suggestions.size() - 1);
         }
@@ -480,32 +491,37 @@ void StatIdx::initSuggestions() {
 }
 
 // _____________________________________________________________________________
-util::geo::DLine StatIdx::getGroupArrow(size_t stat, size_t group) const {
+util::geo::DLine StatIdx::getGroupArrow(size_t stat, const util::geo::DPoint& b) const {
   auto a = getStation(stat)->pos;
-  auto b = util::geo::centroid(getGroup(group)->poly);
 
   auto pl = util::geo::PolyLine<double>(a, b);
-  auto bb = pl.getPointAtDist(fmax(pl.getLength() / 2, pl.getLength() - 20)).p;
+  auto bb = pl.getPointAtDist(fmax(pl.getLength() / 2, pl.getLength() - 5)).p;
 
-  if (util::geo::dist(a, bb) < 0.0001) {
+  if (util::geo::dist(a, bb) < 1) {
     bb = a;
-    bb.setX(bb.getX() + 10);
+    bb.setX(bb.getX() + 3);
   }
 
-  int side = rand() % 2;
-  if (!side) side = -1;
+  util::geo::Line<double> line;
+
+  if (util::geo::dist(a, bb) < 20) {
+    line = {a, bb};
+  } else {
 
-  auto rot1 = util::geo::rotate(util::geo::DLine{a, bb}, 45 * side, a);
-  auto rot2 = util::geo::rotate(util::geo::DLine{a, bb}, -20 * side, bb);
+    int side = rand() % 2;
+    if (!side) side = -1;
 
-  auto rot3 = util::geo::rotate(util::geo::DLine{a, bb}, -120 * side, bb);
+    auto rot1 = util::geo::rotate(util::geo::DLine{a, bb}, 45 * side, a);
+    auto rot2 = util::geo::rotate(util::geo::DLine{a, bb}, -20 * side, bb);
+    auto rot3 = util::geo::rotate(util::geo::DLine{a, bb}, -120 * side, bb);
 
-  auto i =
-      util::geo::intersection(util::geo::LineSegment<double>{rot1[0], rot1[1]},
-                              util::geo::LineSegment<double>{rot2[0], rot2[1]});
+    auto i =
+        util::geo::intersection(util::geo::LineSegment<double>{rot1[0], rot1[1]},
+                                util::geo::LineSegment<double>{rot2[0], rot2[1]});
 
-  auto line =
-      util::geo::BezierCurve<double>(a, i, rot3[0], bb).render(1).getLine();
+    line =
+        util::geo::BezierCurve<double>(a, i, rot3[0], bb).render(5).getLine();
+  }
 
   // arrowhead
   auto pl2 = util::geo::PolyLine<double>(line);

src/osmfixer/index/StatIdx.h

@@ -89,7 +89,7 @@ class StatIdx {
   void initGroups();
   void initSuggestions();
 
-  util::geo::DLine getGroupArrow(size_t stat, size_t group) const;
+  util::geo::DLine getGroupArrow(size_t stat, const util::geo::DPoint& p) const;
 
   std::vector<Station> _stations;
   std::vector<Group> _groups;

src/osmfixer/server/StatServer.cpp

@@ -73,9 +73,10 @@ util::http::Answer StatServer::handleHeatMapReq(const Params& pars) const {
   std::stringstream json;
 
   size_t p = 5;
-  if (z < 10) p = 4;
-  if (z < 8) p = 3;
-  if (z < 6) p = 2;
+  if (z < 11) p = 4;
+  if (z < 10) p = 3;
+  if (z < 9) p = 2;
+  if (z < 7) p = 1;
 
   json << std::fixed << std::setprecision(p);
 
@@ -125,8 +126,6 @@ util::http::Answer StatServer::handleHeatMapReq(const Params& pars) const {
   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;
 }
 
@@ -369,6 +368,8 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
   if (cb.size()) json << cb << "(";
   json << "{\"id\":" << sid << ","
        << "\"osmid\":" << stat->osmid << ","
+       << "\"lat\":" << stat->latLng.getY() << ","
+       << "\"lon\":" << stat->latLng.getX() << ","
        << "\"attrs\":{";
 
   char sep = ' ';

web/script.js

@@ -1,4 +1,4 @@
-widths = [12, 13, 14, 15, 16, 16, 16, 16];
+widths = [12, 13, 13, 13, 13, 13, 13, 13];
 opas = [0.8, 0.6, 0.5, 0.5, 0.4];
 mwidths = [1, 1, 1, 1.5, 2, 3, 5, 6, 6, 4, 3, 2];
 
@@ -31,7 +31,7 @@ function marker(stat, z) {
 }
 
 function poly(group, z) {
-    var style = {color: "#85f385", smoothFactor : 0.4, 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";
     }
@@ -44,15 +44,12 @@ function poly(group, z) {
 }
 
 function sugArr(sug, z) {
-    return [
-            L.polyline(sug.arrow, {id : sug.id, color: 'black', smoothFactor : 1, weight: 2, opacity:0.5}),
-            L.polyline(sug.arrow, {id : sug.id, color: 'blue', smoothFactor : 1, weight: 1, opacity:0.5})
-        ]
-    ;
+    return L.polyline(sug.arrow, {id : sug.id, color: 'blue', smoothFactor : 0.1, weight: 4, opacity:0.5});
 }
 
-function renderStat(stat, ll) {
+function renderStat(stat) {
     var attrrows = {};
+    var ll = {lat: stat.lat, lon: stat.lon};
 
     var content = document.createElement('div');
     content.setAttribute("id", "nav")
@@ -135,13 +132,12 @@ function renderStat(stat, ll) {
         .openOn(map);
 }
 
-
-function openStat(id, ll) {
+function openStat(id) {
     var xmlhttp = new XMLHttpRequest();
     xmlhttp.onreadystatechange = function() {
         if (this.readyState == 4 && this.status == 200) {
             var content = JSON.parse(this.responseText);
-            renderStat(content, ll);
+            renderStat(content);
         }
     };
 
@@ -251,7 +247,6 @@ L.tileLayer('https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x
     id: 'mapbox.streets'
 }).addTo(map);
 
-
 var layer = L.featureGroup().addTo(map);
 var labelLayer = L.featureGroup().addTo(map);
 
@@ -274,9 +269,9 @@ function render() {
                 var rad = 25 - map.getZoom();
 
                 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.sugg, {max: 500, gradient: {0: '#7f7fbd', 0.5: '#4444b3', 1: '#0606c1'}, minOpacity: 0.65, blur: blur-3, radius: Math.min(12, rad-3)}));
                 
-                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}));
+                layer.addLayer(L.heatLayer(content.err, {max: 500, gradient: {0: '#f39191', 0.5: '#ff5656', 1: '#ff0000'}, minOpacity: 0.75, blur: blur-3, radius: Math.min(10, rad-3), maxZoom: 15}));
             }
         };
 
@@ -313,13 +308,12 @@ function render() {
                 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]);
+                    suggs.push(a);
                 }
 
                 if (map.getZoom() > 15) {
                    labelLayer.addLayer(L.featureGroup(labels));
-                   layer.addLayer(L.featureGroup(suggs).on('click', function(a) { openStat(a.layer.options.id, a.layer.getBounds().getCenter());}));
+                   layer.addLayer(L.featureGroup(suggs).on('click', function(a) { openStat(a.layer.options.id); }));
                 }
 
                 if (map.getZoom() > 13) {
@@ -328,7 +322,7 @@ function render() {
 
 
                 layer.addLayer(L.featureGroup(stations).on('click', function(a) {
-                    openStat(a.layer.options.id, a.layer.getBounds().getCenter());}));
+                   openStat(a.layer.options.id);}));
             }
         };