fix a bug

src/osmfixer/index/StatIdx.cpp

@@ -297,14 +297,22 @@ void StatIdx::initGroups() {
       _groups[_stations[i].origGroup].stations.push_back(i);
     }
 
-    if (_stations[i].group != _stations[i].origGroup &&
-        _groups[_stations[i].group].osmid > 2 &&
+    // if all stations of a relation are moved into another same relation,
+    // suggest to merge the relation instead of suggesting each invidivual
+    // move
+    if (_groups[_stations[i].group].osmid > 2 &&
         _groups[_stations[i].origGroup].osmid > 2) {
       auto& orGr = _groups[_stations[i].origGroup];
-      if (orGr.mergeId == 0)
+      if (orGr.mergeId == 0) {
+        // if no merge group has been yet written, set it to the target group
+        // of the currently check station
         orGr.mergeId = _stations[i].group;
-      else if (orGr.mergeId != _stations[i].group)
+      } else if (orGr.mergeId != _stations[i].group) {
+        // if a merge group was set, but the current station is not moved into
+        // this group, set the merge id to the group id. This is later inter-
+        // preted as DO NOT MERGE
         orGr.mergeId = orGr.id;
+      }
     }
 
     assert(_stations[i].group < _groups.size());

src/util/http/Server.cpp

@@ -11,6 +11,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <algorithm>
+#include <csignal>
 #include <memory>
 #include <sstream>
 #include <stdexcept>
@@ -24,12 +25,12 @@
 #include "util/String.h"
 #include "util/log/Log.h"
 
-using util::http::Socket;
-using util::http::Queue;
-using util::http::Req;
+using util::http::HeaderState;
 using util::http::HttpErr;
 using util::http::HttpServer;
-using util::http::HeaderState;
+using util::http::Queue;
+using util::http::Req;
+using util::http::Socket;
 
 // _____________________________________________________________________________
 Socket::Socket(int port) {
@@ -71,6 +72,9 @@ int Socket::wait() {
 
 // _____________________________________________________________________________
 void HttpServer::send(int sock, Answer* aw) {
+  // ignore SIGPIPE
+  signal(SIGPIPE, SIG_IGN);
+
   std::string enc = "identity";
   if (aw->gzip) aw->pl = compress(aw->pl, &enc);