changes

src/osmfixer/index/StatIdx.cpp

@@ -142,6 +142,10 @@ void StatIdx::initGroups() {
 
     _groups[_stations[i].group].stations.push_back(i);
 
+    if (_stations[i].group != _stations[i].origGroup) {
+      _groups[_stations[i].origGroup].stations.push_back(i);
+    }
+
     assert(_stations[i].group < _groups.size());
     if (_stations[i].group != _stations[i].origGroup &&
         _groups[_stations[i].group].osmid == 1) {
@@ -478,14 +482,28 @@ void StatIdx::initSuggestions() {
           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);
         }
       }
+
+      for (auto attrErr : stat.attrErrs) {
+        const auto otherStat = getStation(attrErr.otherId);
+        if (otherStat->osmid == stat.osmid) {
+          // fix attributes
+          sug.type = 6;
+          sug.orig_gid = 0;
+          sug.orig_osm_rel_id = 0;
+          sug.target_gid = 0;
+          sug.target_osm_rel_id = 0;
+          sug.attrErrName = attrErr.attr;
+
+          _suggestions.push_back(sug);
+          stat.suggestions.push_back(_suggestions.size() - 1);
+        }
+      }
     }
   }
 }

src/osmfixer/index/StatIdx.h

@@ -26,6 +26,7 @@ struct Suggestion {
   uint16_t type;
   size_t station;
   size_t target_gid, orig_gid, target_osm_rel_id, orig_osm_rel_id;
+  std::string attrErrName;
   util::geo::DLine arrow;
 };
 

src/osmfixer/server/StatServer.cpp

@@ -410,16 +410,20 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
 
   json << ",\"su\":[";
 
+  char seper = ' ';
+
   // suggestions
   if (stat->group != stat->origGroup ||
       _idx->getGroup(stat->group)->osmid == 1) {
     if (_idx->getGroup(stat->origGroup)->osmid < 2) {
       if (_idx->getGroup(stat->group)->osmid == 1) {
         json << "{\"type\": 1, \"target_gid\":" << stat->group << "}";
+        seper = ',';
       } else if (_idx->getGroup(stat->group)->osmid > 1) {
         json << "{\"type\": 2, \"target_gid\":" << stat->group
              << ",\"target_osm_rel_id\":" << _idx->getGroup(stat->group)->osmid
              << "}";
+        seper = ',';
       }
     } else {
       if (_idx->getGroup(stat->group)->osmid == 1 &&
@@ -428,6 +432,7 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
              << ",\"orig_osm_rel_id\":"
              << _idx->getGroup(stat->origGroup)->osmid
              << ",\"target_gid\":" << stat->group << "}";
+        seper = ',';
       } else if (_idx->getGroup(stat->group)->osmid > 1) {
         json << "{\"type\": 4,\"orig_gid\":" << stat->origGroup
              << ",\"orig_osm_rel_id\":"
@@ -435,6 +440,7 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
              << ",\"target_gid\":" << stat->group
              << ",\"target_osm_rel_id\":" << _idx->getGroup(stat->group)->osmid
              << "}";
+        seper = ',';
       } else {
         json << "{\"type\": 5,\"orig_gid\":" << stat->origGroup
              << ",\"orig_osm_rel_id\":"
@@ -442,10 +448,21 @@ util::http::Answer StatServer::handleStatReq(const Params& pars) const {
              << ",\"target_gid\":" << stat->group
              << ",\"target_osm_rel_id\":" << _idx->getGroup(stat->group)->osmid
              << "}";
+        seper = ',';
       }
     }
   }
 
+  for (auto attrErr : stat->attrErrs) {
+    const auto otherStat = _idx->getStation(attrErr.otherId);
+    if (otherStat->osmid == stat->osmid) {
+      // fix attributes
+      json << seper << "{\"type\": 6,\"attr\":\"" << attrErr.attr << "\""
+           << "}";
+      seper = ',';
+    }
+  }
+
   json << "]";
 
   json << "}";

web/index.html

@@ -12,18 +12,24 @@
     <script src="leaflet-heat.js"></script>
 
     <link href="https://fonts.googleapis.com/css?family=Nunito:600&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Roboto&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Inconsolata&display=swap" rel="stylesheet">
 
     <style>
         body {
             padding: 0;
             margin: 0;
-            font-family: sans-serif;
+            font-family: 'Roboto', sans-serif;
         }
         html, body {
             height: 100%;
             width: 100%;
         }
 
+        tt {
+            font-family: Inconsolata, monospace;
+        }
+
         #attr-tbl tr {
             background-color: #c0f7c0;
         }
@@ -70,15 +76,16 @@
 
         #attr-tbl {
             margin-top: 10px;
+            width: 100%;
         }
 
-        #sugg .sugtit, .oldmemberstit, .newmemberstit {
+        .sugtit, .oldmemberstit, .newmemberstit {
             font-style: normal;
             font-weight: bold;
         }
 
         #group-stations-new, #group-stations-old {
-                        margin-top: 8px;
+             margin-top: 8px;
             padding-top: 4px;
             border-top: solid 1px #AAA;
         }
@@ -103,14 +110,21 @@
             margin-top: 8px;
             padding-top: 4px;
             border-top: solid 1px #AAA;
-            color: blue;
-            font-style: italic;
+            color: #0000c3;
+        }
+
+        #sugg ul {
+            padding: 5px;
+            margin: 5px;
+            padding-top: 0;
         }
 
         #logo {
+            text-decoration: none;
+            font-weight:600;
             font-family: 'Nunito', sans-serif;
-            font-size: 50px;
-                position: absolute;
+            font-size: 60px;
+            position: absolute;
     z-index:1000;
     top: 0.3em;
     right: 1em;
@@ -119,15 +133,44 @@
     opacity: 0.7;
         }
 
-        .leaflet-control-zoom {
-            font-family: 'Nunito', sans-serif;
+        .leaflet-control-zoom a {
+            font-family: 'Nunito', sans-serif !important;
+            font-weight: bold !important;
+            font-size: 38px !important;
+        }
+
+        .leaflet-touch .leaflet-bar a {
+            width: 40px;
+            height: 40px;
+            line-height: 38px;
+            overflow:hidden;
+            display: block;
+        }
+
+        .leaflet-control-zoom-out {
+            margin-top: 10px;
+        }
+
+        .leaflet-container {
+
+font-family: 'Roboto', sans-serif !important;
+font-size: 14px;
+        }
+
+        .leaflet-control-attribution a {
+font-family: 'Roboto', sans-serif !important;
+            
+    color: #666 !important;
+    font-size: 12px;
         }
 
         .leaflet-control-zoom-in,
         .leaflet-control-zoom-out {
             border-radius: 25px !important;
-            border: 1px solid #333;
+            border: 1px solid #333 !important;
             opacity: 0.7;
+            text-shadow: -1px -1px 0 #333, 1px -1px 0 #333, -1px 1px 0 #333, 1px 1px 0 #333;
+    color: #fff !important;
         }
 
         .leaflet-touch .leaflet-control-layers, .leaflet-touch .leaflet-bar {
@@ -159,14 +202,40 @@
 
 .grouplink {
     cursor: pointer;
-    text-decoration: underline
+    text-decoration: underline;
+    z-index: 1000;
+}
+
+.noselect {
+  -webkit-touch-callout: none; /* iOS Safari */
+    -webkit-user-select: none; /* Safari */
+     -khtml-user-select: none; /* Konqueror HTML */
+       -moz-user-select: none; /* Old versions of Firefox */
+        -ms-user-select: none; /* Internet Explorer/Edge */
+            user-select: none; /* Non-prefixed version, currently
+                                  supported by Chrome, Opera and Firefox */
+}
+
+#group-stations-old div.del-stat:before {
+    content: "❌";
+    position: relative;
+    width: 0;
+    color: #880000;
+    margin-left: -1.15em;
+    left: -0.6em;
+    padding-right: 0.5em;
+}
+
+#group-stations-old div.del-stat {
+    background-color: #F44336;
+    border-left: solid 4px #880000;
 }
 
     </style>
 </head>
 <body>
 
-    <div id="logo">staty</div>
+    <a id="logo" class="noselect"href="/">staty</a>
 
 <div id="map" style="width: 100%;height: 100%;"></div>
 <script src="script.js">