changes

src/osmfixer/FixerMain.cpp

@@ -29,6 +29,6 @@ int main(int argc, char** argv) {
 
   // start server
 
-  StatServer serv;
+  StatServer serv(&idx);
   util::http::HttpServer(9090, &serv).run();
 }

src/osmfixer/index/StatIdx.cpp

@@ -4,6 +4,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <set>
 #include <sstream>
 #include <string>
 #include "osmfixer/index/StatIdx.h"
@@ -35,6 +36,8 @@ void StatIdx::readFromFile(const std::string& path) {
     addStation(osmid, lat, lng, attrs);
   }
 
+  initIndex();
+
   std::cout << util::geo::getWKT(_bbox) << std::endl;
 }
 
@@ -49,3 +52,33 @@ void StatIdx::addStation(size_t osmid, double lat, double lng,
   // extend bounding box
   _bbox = util::geo::extendBox(point, _bbox);
 }
+
+// _____________________________________________________________________________
+void StatIdx::initIndex() {
+  _grid = util::geo::Grid<size_t, util::geo::Point, double>(5000, 5000, _bbox,
+                                                            false);
+  for (size_t i = 0; i < _stations.size(); i++) {
+    _grid.add(_stations[i].pos, i);
+  }
+}
+
+// _____________________________________________________________________________
+std::vector<const Station*> StatIdx::getStations(
+    const util::geo::DBox bbox) const {
+  std::vector<const Station*> ret;
+  auto ll = util::geo::latLngToWebMerc<double>(bbox.getLowerLeft().getX(),
+                                               bbox.getLowerLeft().getY());
+  auto ur = util::geo::latLngToWebMerc<double>(bbox.getUpperRight().getX(),
+                                               bbox.getUpperRight().getY());
+
+  std::set<size_t> tmp;
+  auto reqBox = util::geo::DBox(ll, ur);
+  _grid.get(reqBox, &tmp);
+
+  for (auto i : tmp) {
+    if (util::geo::contains(_stations[i].pos, reqBox))
+      ret.push_back(&_stations[i]);
+  }
+
+  return ret;
+}

src/osmfixer/index/StatIdx.h

@@ -9,12 +9,13 @@
 #include <string>
 #include <vector>
 #include "util/geo/Geo.h"
+#include "util/geo/Grid.h"
 
 namespace osmfixer {
 
 typedef std::map<std::string, std::vector<std::string>> OsmAttrs;
 
-struct Station{
+struct Station {
   size_t osmid;
   util::geo::DPoint pos;
   OsmAttrs attrs;
@@ -26,6 +27,8 @@ class StatIdx {
 
   void readFromFile(const std::string& path);
 
+  std::vector<const Station*> getStations(const util::geo::DBox bbox) const;
+
  private:
   void addStation(size_t id, double lat, double lng, const OsmAttrs& attrs);
 
@@ -33,6 +36,8 @@ class StatIdx {
 
   std::vector<Station> _stations;
   util::geo::DBox _bbox;
+
+  util::geo::Grid<size_t, util::geo::Point, double> _grid;
 };
 }
 

src/osmfixer/server/StatServer.cpp

@@ -5,6 +5,9 @@
 #include "osmfixer/server/StatServer.h"
 #include "util/Misc.h"
 #include "util/String.h"
+#include "util/geo/Geo.h"
+#include "util/log/Log.h"
+#include "util/String.h"
 
 using osmfixer::StatServer;
 using osmfixer::Params;
@@ -20,6 +23,8 @@ util::http::Answer StatServer::handle(const util::http::Req& req,
 
     if (cmd == "/") {
       a = util::http::Answer("200 OK", "osmfixer");
+    } else if (cmd == "/map") {
+      a = handleMapReq(params);
     } else {
       a = util::http::Answer("404 Not Found", "dunno");
     }
@@ -39,6 +44,44 @@ util::http::Answer StatServer::handle(const util::http::Req& req,
 }
 
 // _____________________________________________________________________________
+util::http::Answer StatServer::handleMapReq(const Params& pars) const {
+  if (pars.count("bbox") == 0 || pars.find("bbox")->second.empty())
+    throw std::invalid_argument("No bbox specified.");
+  std::string cb;
+  if (pars.count("cb")) cb = pars.find("cb")->second.c_str();
+  auto box = util::split(pars.find("bbox")->second, ',');
+
+  if (box.size() != 4)
+    throw std::invalid_argument("Invalid request.");
+
+  double lat1 = atof(box[0].c_str());
+  double lng1 = atof(box[1].c_str());
+  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(lng1, lat1), util::geo::DPoint(lng2, lat2));
+
+  LOG(INFO) << "Request for bounding box " << util::geo::getWKT(bbox);
+
+  std::stringstream json;
+
+  if (cb.size()) json << cb << "(";
+  json << "[";
+
+  // TODO: query index
+
+  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;
+}
+
+// _____________________________________________________________________________
 std::string StatServer::parseUrl(std::string u, std::string pl,
                                  std::map<std::string, std::string>* params) {
   auto parts = util::split(u, '?');

src/osmfixer/server/StatServer.h

@@ -5,6 +5,7 @@
 #ifndef OSMFIXER_SERVER_STATSERVER_H_
 #define OSMFIXER_SERVER_STATSERVER_H_
 
+#include "osmfixer/index/StatIdx.h"
 #include "util/http/Server.h"
 
 namespace osmfixer {
@@ -13,13 +14,17 @@ typedef std::map<std::string, std::string> Params;
 
 class StatServer : public util::http::Handler {
  public:
-  StatServer() {}
+  StatServer(const osmfixer::StatIdx* idx) : _idx(idx) {}
 
   virtual util::http::Answer handle(const util::http::Req& request,
                                     int connection) const;
 
  private:
   static std::string parseUrl(std::string u, std::string pl, Params* params);
+
+  util::http::Answer handleMapReq(const Params& pars) const;
+
+  const osmfixer::StatIdx* _idx;
 };
 }