před 4 roky · c8ced79249
--- a/.gitignore
+++ b/.gitignore
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/cmake/GetGitRevisionDescription.cmake
+++ b/cmake/GetGitRevisionDescription.cmake
--- a/cmake/GetGitRevisionDescription.cmake.in
+++ b/cmake/GetGitRevisionDescription.cmake.in
--- a/cmake/MacPlistMacros.cmake
+++ b/cmake/MacPlistMacros.cmake
--- a/cmake/cpplint.cmake
+++ b/cmake/cpplint.cmake
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
--- a/src/osmfixer/CMakeLists.txt
+++ b/src/osmfixer/CMakeLists.txt
--- a/src/osmfixer/FixerMain.cpp
+++ b/src/osmfixer/FixerMain.cpp
--- a/src/osmfixer/_config.h.in
+++ b/src/osmfixer/_config.h.in
--- a/src/osmfixer/index/StatIdx.cpp
+++ b/src/osmfixer/index/StatIdx.cpp
--- a/src/osmfixer/index/StatIdx.h
+++ b/src/osmfixer/index/StatIdx.h
--- a/src/osmfixer/server/StatServer.cpp
+++ b/src/osmfixer/server/StatServer.cpp
--- a/src/osmfixer/server/StatServer.h
+++ b/src/osmfixer/server/StatServer.h
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
--- a/src/util/Misc.h
+++ b/src/util/Misc.h
--- a/src/util/Nullable.h
+++ b/src/util/Nullable.h
--- a/src/util/String.h
+++ b/src/util/String.h
--- a/src/util/geo/BezierCurve.h
+++ b/src/util/geo/BezierCurve.h
--- a/src/util/geo/BezierCurve.tpp
+++ b/src/util/geo/BezierCurve.tpp
--- a/src/util/geo/Box.h
+++ b/src/util/geo/Box.h
--- a/src/util/geo/Geo.h
+++ b/src/util/geo/Geo.h
--- a/src/util/geo/GeoGraph.h
+++ b/src/util/geo/GeoGraph.h
--- a/src/util/geo/Grid.h
+++ b/src/util/geo/Grid.h
--- a/src/util/geo/Grid.tpp
+++ b/src/util/geo/Grid.tpp
--- a/src/util/geo/Line.h
+++ b/src/util/geo/Line.h
--- a/src/util/geo/Point.h
+++ b/src/util/geo/Point.h
--- a/src/util/geo/PolyLine.h
+++ b/src/util/geo/PolyLine.h
--- a/src/util/geo/PolyLine.tpp
+++ b/src/util/geo/PolyLine.tpp
--- a/src/util/geo/Polygon.h
+++ b/src/util/geo/Polygon.h
--- a/src/util/geo/output/GeoGraphJsonOutput.h
+++ b/src/util/geo/output/GeoGraphJsonOutput.h
--- a/src/util/geo/output/GeoGraphJsonOutput.tpp
+++ b/src/util/geo/output/GeoGraphJsonOutput.tpp
--- a/src/util/geo/output/GeoJsonOutput.cpp
+++ b/src/util/geo/output/GeoJsonOutput.cpp
--- a/src/util/geo/output/GeoJsonOutput.h
+++ b/src/util/geo/output/GeoJsonOutput.h
--- a/src/util/geo/output/GeoJsonOutput.tpp
+++ b/src/util/geo/output/GeoJsonOutput.tpp
--- a/src/util/graph/Algorithm.h
+++ b/src/util/graph/Algorithm.h
--- a/src/util/graph/Algorithm.tpp
+++ b/src/util/graph/Algorithm.tpp
--- a/src/util/graph/Dijkstra.cpp
+++ b/src/util/graph/Dijkstra.cpp
--- a/src/util/graph/Dijkstra.h
+++ b/src/util/graph/Dijkstra.h
--- a/src/util/graph/Dijkstra.tpp
+++ b/src/util/graph/Dijkstra.tpp
--- a/src/util/graph/DirGraph.h
+++ b/src/util/graph/DirGraph.h
--- a/src/util/graph/DirGraph.tpp
+++ b/src/util/graph/DirGraph.tpp
--- a/src/util/graph/DirNode.h
+++ b/src/util/graph/DirNode.h
--- a/src/util/graph/DirNode.tpp
+++ b/src/util/graph/DirNode.tpp
--- a/src/util/graph/EDijkstra.cpp
+++ b/src/util/graph/EDijkstra.cpp
--- a/src/util/graph/EDijkstra.h
+++ b/src/util/graph/EDijkstra.h
--- a/src/util/graph/EDijkstra.tpp
+++ b/src/util/graph/EDijkstra.tpp
--- a/src/util/graph/Edge.h
+++ b/src/util/graph/Edge.h
--- a/src/util/graph/Edge.tpp
+++ b/src/util/graph/Edge.tpp
--- a/src/util/graph/Graph.h
+++ b/src/util/graph/Graph.h
--- a/src/util/graph/Graph.tpp
+++ b/src/util/graph/Graph.tpp
--- a/src/util/graph/Node.h
+++ b/src/util/graph/Node.h
--- a/src/util/graph/ShortestPath.h
+++ b/src/util/graph/ShortestPath.h
--- a/src/util/graph/ShortestPath.tpp
+++ b/src/util/graph/ShortestPath.tpp
--- a/src/util/graph/UndirGraph.h
+++ b/src/util/graph/UndirGraph.h
--- a/src/util/graph/UndirGraph.tpp
+++ b/src/util/graph/UndirGraph.tpp
--- a/src/util/graph/UndirNode.h
+++ b/src/util/graph/UndirNode.h
--- a/src/util/graph/UndirNode.tpp
+++ b/src/util/graph/UndirNode.tpp
--- a/src/util/http/Server.cpp
+++ b/src/util/http/Server.cpp
--- a/src/util/http/Server.h
+++ b/src/util/http/Server.h
--- a/src/util/json/Writer.cpp
+++ b/src/util/json/Writer.cpp
--- a/src/util/json/Writer.h
+++ b/src/util/json/Writer.h
--- a/src/util/log/Log.h
+++ b/src/util/log/Log.h
--- a/src/util/tests/CMakeLists.txt
+++ b/src/util/tests/CMakeLists.txt
--- a/src/util/tests/TestMain.cpp
+++ b/src/util/tests/TestMain.cpp
--- a/src/util/tests/lest.h
+++ b/src/util/tests/lest.h
--- a/src/util/xml/XmlWriter.cpp
+++ b/src/util/xml/XmlWriter.cpp
--- a/src/util/xml/XmlWriter.h
+++ b/src/util/xml/XmlWriter.h
--- a/web/index.html
+++ b/web/index.html
@@ -0,0 +1,102 @@
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+<head>
			
 
				+	<title>perronkanten | OSM Station Relationships</title>
			
 
				+
			
 
				+	<meta charset="utf-8" />
			
 
				+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				+	<link rel="shortcut icon" type="image/x-icon" href="docs/images/favicon.ico" />
			
 
				+
			
 
				+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css" integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin=""/>
			
 
				+    <script src="https://unpkg.com/leaflet@1.5.1/dist/leaflet.js" integrity="sha512-GffPMF3RvMeYyc1LWMHtK8EbPv0iNZ8/oTtHPx9/cc2ILxQ+u905qIwdpULaqDkyBKgOaB57QTMg7ztg8Jm2Og==" crossorigin=""></script>
			
 
				+    <script src="leaflet-heat.js"></script>
			
 
				+
			
 
				+    <style>
			
 
				+        body {
			
 
				+            padding: 0;
			
 
				+            margin: 0;
			
 
				+            font-family: sans-serif;
			
 
				+        }
			
 
				+        html, body {
			
 
				+            height: 100%;
			
 
				+            width: 100%;
			
 
				+        }
			
 
				+
			
 
				+        #attr-tbl tr {
			
 
				+            background-color: #c0f7c0;
			
 
				+        }
			
 
				+
			
 
				+        .stat-label {
			
 
				+            white-space: nowrap;
			
 
				+            background: transparent;
			
 
				+        }
			
 
				+
			
 
				+        #attr-tbl .err-10 {
			
 
				+            background-color: #ff0000;
			
 
				+        }
			
 
				+
			
 
				+        #attr-tbl .err-9 {
			
 
				+            background-color: #ff1010;
			
 
				+        }
			
 
				+
			
 
				+        #attr-tbl .err-8 {
			
 
				+            background-color: #f92424;
			
 
				+        }
			
 
				+
			
 
				+
			
 
				+        #attr-tbl .err-7 {
			
 
				+            background-color: #f93838;
			
 
				+        }
			
 
				+
			
 
				+        #attr-tbl .err-6 {
			
 
				+            background-color: #f56262;
			
 
				+        }
			
 
				+
			
 
				+        #attr-tbl .err-5 {
			
 
				+            background-color: #f38484;
			
 
				+        }
			
 
				+
			
 
				+        .attr-err-info {
			
 
				+            margin-top:5px;
			
 
				+            font-size: 13px;
			
 
				+            font-style: italic;
			
 
				+        }
			
 
				+
			
 
				+        .leaflet-popup-content-wrapper {
			
 
				+            border-radius: 5px;
			
 
				+        }
			
 
				+
			
 
				+.leaflet-popup {left: -20px !important;}
			
 
				+
			
 
				+.leaflet-popup-tip-container {
			
 
				+   left: 20px;
			
 
				+}
			
 
				+.leaflet-popup-tip {
			
 
				+   box-shadow: none !important;
			
 
				+}
			
 
				+.leaflet-popup:before 
			
 
				+    {
			
 
				+    content: "";
			
 
				+    position: absolute;
			
 
				+    border: 13px solid transparent;
			
 
				+    border-bottom-color: white;
			
 
				+    bottom: 0px;
			
 
				+    margin-left: -13px;
			
 
				+}
			
 
				+
			
 
				+.attrval {
			
 
				+    font-weight: bold;
			
 
				+}
			
 
				+
			
 
				+    </style>
			
 
				+</head>
			
 
				+<body>
			
 
				+
			
 
				+<div id="map" style="width: 100%;height: 100%;"></div>
			
 
				+<script src="script.js">
			
 
				+</script>
			
 
				+
			
 
				+
			
 
				+
			
 
				+</body>
			
 
				+</html>
			
--- a/web/leaflet-heat.js
+++ b/web/leaflet-heat.js
--- a/web/script.js
+++ b/web/script.js
@@ -0,0 +1,221 @@
 
				+widths = [12, 13, 14, 15, 16, 16, 16, 16];
			
 
				+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];
			
 
				+
			
 
				+function $(id) { return document.getElementById(id); }
			
 
				+
			
 
				+function marker(stat, z) {
			
 
				+    if (z > 15) {
			
 
				+        return L.circle(
			
 
				+            [stat.lat, stat.lon],
			
 
				+            {
			
 
				+                color: 'black',
			
 
				+                fillColor: stat.suggestion ? 'blue' : stat.attrerrs ? 'red' : '#78f378', 
			
 
				+                radius: mwidths[23 - z],
			
 
				+                fillOpacity : 1,
			
 
				+                weight : 1,
			
 
				+                id : stat.id
			
 
				+            }
			
 
				+        );
			
 
				+    } else {
			
 
				+        return L.polyline(
			
 
				+            [[stat.lat, stat.lon], [stat.lat, stat.lon]],
			
 
				+            {
			
 
				+                color: stat.suggestion ? 'blue' : stat.attrerrs ? 'red' : '#78f378',
			
 
				+                weight: widths[15 - z],
			
 
				+                opacity: opas[15 - z],
			
 
				+                id : stat.id
			
 
				+            }
			
 
				+        );
			
 
				+    }
			
 
				+}
			
 
				+
			
 
				+function poly(group, z) {
			
 
				+    if (group.new) return L.polygon(group.poly, {color: "blue", smoothFactor : 0.4})
			
 
				+    return L.polygon(group.poly, {color: '#85f385', smoothFactor : 1})
			
 
				+}
			
 
				+
			
 
				+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})
			
 
				+        ]
			
 
				+    ;
			
 
				+}
			
 
				+
			
 
				+function renderStat(stat, 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 = "OSM node <a target='_blank' href='https://www.openstreetmap.org/node/" + stat.osmid + "'>" + stat.osmid + "</a>";
			
 
				+
			
 
				+    content.appendChild(attrTbl);
			
 
				+    content.appendChild(suggD);
			
 
				+
			
 
				+    var tbody = document.createElement('tbody');
			
 
				+    attrTbl.appendChild(tbody);
			
 
				+
			
 
				+    for (var key in stat.attrs) {
			
 
				+        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;
			
 
				+    }
			
 
				+
			
 
				+    for (var i = 0; i < stat.attrerrs.length; i++) {
			
 
				+        var err = stat.attrerrs[i];
			
 
				+        var row = attrrows[err.attr[0]];
			
 
				+        row.className = "err-" + Math.round(err.conf * 10);
			
 
				+
			
 
				+        var info = document.createElement('div');
			
 
				+
			
 
				+        if (err.other_osmid != stat.osmid) {
			
 
				+            info.innerHTML = "Does not match node <a target=\"_blank\" href=\"https://www.openstreetmap.org/node/" + err.other_osmid + "\">" + err.other_osmid + "</a>";
			
 
				+        } else {
			
 
				+            info.innerHTML = "Does not match '" + err.other_attr[0] + "' = '" + err.other_attr[1];
			
 
				+        }
			
 
				+        info.className = 'attr-err-info';
			
 
				+        row.childNodes[1].appendChild(info);
			
 
				+    }
			
 
				+
			
 
				+    for (var i = 0; i < stat.suggestions.length; i++) {
			
 
				+        var sugg = stat.suggestions[i];
			
 
				+
			
 
				+        var suggDiv = document.createElement('div');
			
 
				+        
			
 
				+        if (sugg.type == 1) {
			
 
				+            suggDiv.innerHTML = "Move node into a new relation (internal id=" + sugg.target_gid + ")";
			
 
				+        } else if (sugg.type == 2) {
			
 
				+            suggDiv.innerHTML = "Move node into existing relation <a href=\"https://www.openstreetmap.org/relation/" + sugg.target_osm_rel_id + "\" target=\"_blank\">" + sugg.target_osm_rel_id + "</a>.";
			
 
				+        } else if (sugg.type == 3) {
			
 
				+            suggDiv.innerHTML = "Move node from existing relation <a href=\"https://www.openstreetmap.org/relation/" + sugg.orig_osm_rel_id + "\" target=\"_blank\">" + sugg.orig_osm_rel_id + "</a> into new relation (internal id=" + sugg.target_gid + ")";
			
 
				+        } else if (sugg.type == 4) {
			
 
				+            suggDiv.innerHTML = "Move node from existing relation <a href=\"https://www.openstreetmap.org/relation/" + sugg.orig_osm_rel_id + "\" target=\"_blank\">" + sugg.orig_osm_rel_id + "</a> into existing relation <a href=\"https://www.openstreetmap.org/relation/" + sugg.target_osm_rel_id + "\" target=\"_blank\">" + sugg.target_osm_rel_id + "</a>.";
			
 
				+        } else if (sugg.type == 5) {
			
 
				+            suggDiv.innerHTML = "Move node out of existing relation <a href=\"https://www.openstreetmap.org/relation/" + sugg.orig_osm_rel_id + "\" target=\"_blank\">" + sugg.orig_osm_rel_id + "</a>!";
			
 
				+        }
			
 
				+
			
 
				+        suggD.appendChild(suggDiv);
			
 
				+    }
			
 
				+
			
 
				+    if (map.getZoom() < 18) map.setView(ll, 18);
			
 
				+
			
 
				+    L.popup({opacity: 0.8})
			
 
				+    .setLatLng(ll)
			
 
				+    .setContent(content.innerHTML)
			
 
				+    .openOn(map);
			
 
				+}
			
 
				+
			
 
				+function openStat(id, ll) {
			
 
				+    var xmlhttp = new XMLHttpRequest();
			
 
				+    xmlhttp.onreadystatechange = function() {
			
 
				+        if (this.readyState == 4 && this.status == 200) {
			
 
				+            var content = JSON.parse(this.responseText);
			
 
				+            renderStat(content, ll);
			
 
				+        }
			
 
				+    };
			
 
				+
			
 
				+    xmlhttp.open("GET", "http://localhost:9090/stat?id=" + id, true);
			
 
				+    xmlhttp.send();
			
 
				+}
			
 
				+
			
 
				+var map = L.map('map', {
			
 
				+  renderer: L.canvas()
			
 
				+}).setView([47.9965, 7.8469], 13);
			
 
				+
			
 
				+L.tileLayer('https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png', {
			
 
				+    maxZoom: 23,
			
 
				+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, &copy; <a href="https://carto.com/attribution">CARTO</a>',
			
 
				+    id: 'mapbox.streets'
			
 
				+}).addTo(map);
			
 
				+
			
 
				+
			
 
				+var layer = L.featureGroup().addTo(map);
			
 
				+var labelLayer = L.featureGroup().addTo(map);
			
 
				+
			
 
				+map.on("moveend", function () {
			
 
				+    render();
			
 
				+});
			
 
				+
			
 
				+function render() {
			
 
				+    var xmlhttp = new XMLHttpRequest();
			
 
				+
			
 
				+    if (map.getZoom() < 11) {
			
 
				+        xmlhttp.onreadystatechange = function() {
			
 
				+            if (this.readyState == 4 && this.status == 200) {
			
 
				+                var content = JSON.parse(this.responseText);
			
 
				+
			
 
				+                layer.clearLayers();
			
 
				+                labelLayer.clearLayers();
			
 
				+
			
 
				+                var blur = 21 - map.getZoom();
			
 
				+                var rad = 21 - map.getZoom();
			
 
				+
			
 
				+                blur = Math.max(5, Math.min(9, blur));
			
 
				+                rad = Math.min(10, rad);
			
 
				+
			
 
				+                layer.addLayer(L.heatLayer(content.ok, {gradient: {0: '#cbf7cb', 0.5: '#78f378', 1: '#29c329'}, minOpacity: 1, blur: blur, radius: rad, maxZoom: 15}));
			
 
				+                layer.addLayer(L.heatLayer(content.sugg, {gradient: {0: '#7f7fbd', 0.5: '#4444b3', 1: '#0606c1'}, minOpacity: 1, blur: blur-3, radius: rad-3, maxZoom: 15}));
			
 
				+                layer.addLayer(L.heatLayer(content.err, {gradient: {0: '#f39191', 0.5: '#ff5656', 1: '#ff0000'}, minOpacity: 1, blur: blur-3, radius: rad-3, maxZoom: 15}));
			
 
				+            }
			
 
				+        };
			
 
				+
			
 
				+        xmlhttp.open("GET", "http://localhost:9090/heatmap?bbox=" + [map.getBounds().getSouthWest().lat, map.getBounds().getSouthWest().lng, map.getBounds().getNorthEast().lat, map.getBounds().getNorthEast().lng].join(","), true);
			
 
				+        xmlhttp.send();
			
 
				+    } else {
			
 
				+        xmlhttp.onreadystatechange = function() {
			
 
				+            if (this.readyState == 4 && this.status == 200) {
			
 
				+                var content = JSON.parse(this.responseText);
			
 
				+
			
 
				+                layer.clearLayers();
			
 
				+                labelLayer.clearLayers();
			
 
				+
			
 
				+                var stations = [];
			
 
				+                var labels = [];
			
 
				+                for (var i = 0; i < content.stats.length; i++) {
			
 
				+                    stat = content.stats[i];
			
 
				+                    stations.push(marker(stat, map.getZoom()));
			
 
				+                }
			
 
				+
			
 
				+                var groups = [];
			
 
				+                for (var i = 0; i < content.groups.length; i++) {
			
 
				+                    group = content.groups[i];
			
 
				+                    groups.push(poly(group, map.getZoom()));
			
 
				+                }
			
 
				+
			
 
				+                var suggs = [];
			
 
				+                for (var i = 0; i < content.suggestions.length; i++) {
			
 
				+                    sugg = content.suggestions[i];
			
 
				+                    var a = sugArr(sugg, map.getZoom());
			
 
				+                    suggs.push(a[0]);                    
			
 
				+                    suggs.push(a[1]);
			
 
				+                }
			
 
				+
			
 
				+                if (map.getZoom() > 15) {
			
 
				+                   labelLayer.addLayer(L.featureGroup(labels));
			
 
				+                   layer.addLayer(L.featureGroup(groups));
			
 
				+                   layer.addLayer(L.featureGroup(suggs).on('click', function(a) { openStat(a.layer.options.id, a.latlng);}));
			
 
				+                }
			
 
				+
			
 
				+
			
 
				+                layer.addLayer(L.featureGroup(stations).on('click', function(a) { 
			
 
				+                    openStat(a.layer.options.id, a.latlng);}));
			
 
				+            }
			
 
				+        };
			
 
				+
			
 
				+        xmlhttp.open("GET", "http://localhost:9090/map?bbox=" + [map.getBounds().getSouthWest().lat, map.getBounds().getSouthWest().lng, map.getBounds().getNorthEast().lat, map.getBounds().getNorthEast().lng].join(","), true);
			
 
				+        xmlhttp.send();
			
 
				+    }
			
 
				+}
			
 
				+
			
 
				+render();