Skip to content

D
df-aggregator
Commit 8d7e4abb by Corey Koval
Options

Nightly Cleanup

parent 36a4f915
Showing with 44 additions and 43 deletions
df-aggregator.py
...@@ -19,9 +19,6 @@ from bottle import route, run, request, get, post, redirect, template, static_fi ...@@ -19,9 +19,6 @@ from bottle import route, run, request, get, post, redirect, template, static_fi
d = 40000 #meters d = 40000 #meters
all_pt_style = {"name": "Various Points", "marker-color": "#FF0000"}
best_pt_style = {"name": "Most Likely TX Location", "marker-color": "#00FF00"}
class math_settings: class math_settings:
def __init__(self, eps, min_samp, conf, power): def __init__(self, eps, min_samp, conf, power):
self.eps = eps self.eps = eps
...@@ -221,6 +218,8 @@ def process_data(database_name, outfile): ...@@ -221,6 +218,8 @@ def process_data(database_name, outfile):
return None return None
def write_geojson(best_point, all_the_points): def write_geojson(best_point, all_the_points):
all_pt_style = {"name": "Various Points", "marker-color": "#FF0000"}
best_pt_style = {"name": "Most Likely TX Location", "marker-color": "#00FF00"}
if all_the_points != None: if all_the_points != None:
all_the_points = Feature(properties = all_pt_style, geometry = MultiPoint(tuple(all_the_points))) all_the_points = Feature(properties = all_pt_style, geometry = MultiPoint(tuple(all_the_points)))
with open(geofile, "w") as file1: with open(geofile, "w") as file1:
...@@ -270,7 +269,6 @@ def write_czml(best_point, all_the_points, ellipsedata): ...@@ -270,7 +269,6 @@ def write_czml(best_point, all_the_points, ellipsedata):
} }
ellipse_properties = { ellipse_properties = {
"heightReference": "RELATIVE_TO_GROUND",
"granularity": 0.008722222, "granularity": 0.008722222,
"material": { "material": {
"solidColor": { "solidColor": {
......
views/cesium.tpl
...@@ -9,13 +9,17 @@ ...@@ -9,13 +9,17 @@
</head> </head>
<body> <body>
<h2>DF Aggregator</h2> <h2>DF Aggregator</h2>
<div id="cesiumContainer" style="height: 800px"></div> <div id="cesiumContainer" style="height: 800px">
</div>
<script> <script>
// Your access token can be found at: https://cesium.com/ion/tokens. // Your access token can be found at: https://cesium.com/ion/tokens.
Cesium.Ion.defaultAccessToken = '{{access_token}}'; Cesium.Ion.defaultAccessToken = '{{access_token}}';
var viewer = new Cesium.Viewer('cesiumContainer', { var viewer = new Cesium.Viewer('cesiumContainer', {
terrainProvider: Cesium.createWorldTerrain() terrainProvider: Cesium.createWorldTerrain()
}); });
viewer.clock.shouldAnimate = true;
var dataSourcePromise = Cesium.CzmlDataSource.load('/static/output.czml'); var dataSourcePromise = Cesium.CzmlDataSource.load('/static/output.czml');
viewer.dataSources.add(dataSourcePromise); viewer.dataSources.add(dataSourcePromise);
...@@ -25,9 +29,8 @@ ...@@ -25,9 +29,8 @@
// const buildingTileset = viewer.scene.primitives.add(Cesium.createOsmBuildings()); // const buildingTileset = viewer.scene.primitives.add(Cesium.createOsmBuildings());
</script> </script>
</div> <div class="slidecontainer">
<div class="slidecontainer"> <form action="/" method="post">
<form action="/" method="post">
<div><span class="slidetitle"><h4>Min Power*:</h4></span> <div><span class="slidetitle"><h4>Min Power*:</h4></span>
<span class="slidespan"><input name="powerValue" type="range" min="0" max="100" value="{{minpower}}" class="slider" id="powerRange"></span> <span class="slidespan"><input name="powerValue" type="range" min="0" max="100" value="{{minpower}}" class="slider" id="powerRange"></span>
<span class="slidevalue" id="power"></span></div> <span class="slidevalue" id="power"></span></div>
...@@ -44,52 +47,52 @@ ...@@ -44,52 +47,52 @@
<span class="slidespan" style="text-align:left; width: 80px;"> <span class="slidespan" style="text-align:left; width: 80px;">
<!-- Rounded switch --> <!-- Rounded switch -->
<label class="switch"> <label class="switch">
<input name="rx_en" {{rx_state}} type="checkbox"> <input name="rx_en" {{rx_state}} type="checkbox">
<span class="switchslider round"></span> <span class="switchslider round"></span>
</label></span> </label></span>
<span class="slidetitle"><h4>Plot All intersect Points**:</h4></span> <span class="slidetitle"><h4>Plot All intersect Points**:</h4></span>
<span class="slidespan" style="text-align:left; width: 80px;"> <span class="slidespan" style="text-align:left; width: 80px;">
<!-- Rounded switch --> <!-- Rounded switch -->
<label class="switch"> <label class="switch">
<input name="intersect_en" {{intersect_state}} type="checkbox"> <input name="intersect_en" {{intersect_state}} type="checkbox">
<span class="switchslider round"></span> <span class="switchslider round"></span>
</label></span><span>Enabling this can cause longer load times.</span></div> </label></span><span>Enabling this can cause longer load times.</span></div>
<div style="width:15%; text-align:right;"><input value="Update" type="submit" style="height:40px;"/></div> <div style="width:15%; text-align:right;"><input value="Update" type="submit" style="height:40px;"/></div>
</form> </form>
<p>* Does not affect historical data.</p> <p>* Does not affect historical data.</p>
<p>** This setting does not apply if clustering is turned off (epsilon = 0).</p> <p>** This setting does not apply if clustering is turned off (epsilon = 0).</p>
</div> </div>
<script> <script>
var powerslider = document.getElementById("powerRange"); var powerslider = document.getElementById("powerRange");
var poweroutput = document.getElementById("power"); var poweroutput = document.getElementById("power");
poweroutput.innerHTML = powerslider.value; poweroutput.innerHTML = powerslider.value;
var confslider = document.getElementById("confRange"); var confslider = document.getElementById("confRange");
var confoutput = document.getElementById("confidence"); var confoutput = document.getElementById("confidence");
confoutput.innerHTML = confslider.value; confoutput.innerHTML = confslider.value;
var epsslider = document.getElementById("epsilonRange"); var epsslider = document.getElementById("epsilonRange");
var epsoutput = document.getElementById("epsilon"); var epsoutput = document.getElementById("epsilon");
epsoutput.innerHTML = epsslider.value/100; epsoutput.innerHTML = epsslider.value/100;
var minpointslider = document.getElementById("minpointRange"); var minpointslider = document.getElementById("minpointRange");
var minpointoutput = document.getElementById("minpoints"); var minpointoutput = document.getElementById("minpoints");
minpointoutput.innerHTML = minpointslider.value; minpointoutput.innerHTML = minpointslider.value;
// Update the current slider value (each time you drag the slider handle) // Update the current slider value (each time you drag the slider handle)
epsslider.oninput = function() { epsslider.oninput = function() {
epsoutput.innerHTML = this.value/100; epsoutput.innerHTML = this.value/100;
} }
powerslider.oninput = function() { powerslider.oninput = function() {
poweroutput.innerHTML = this.value; poweroutput.innerHTML = this.value;
} }
confslider.oninput = function() { confslider.oninput = function() {
confoutput.innerHTML = this.value; confoutput.innerHTML = this.value;
} }
minpointslider.oninput = function() { minpointslider.oninput = function() {
minpointoutput.innerHTML = this.value; minpointoutput.innerHTML = this.value;
} }
</script> </script>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment