ma
/
project
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

fix leaking location data

simu_flags
agp8x 2017-08-16 16:06:54 +02:00
parent 36ff8fd0be
commit c25deecf0b
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
analyzers/__init__.py
View File

@ -33,7 +33,7 @@ __MAPPING__ = {
], ],
LocationAnalyzer: [ LocationAnalyzer: [
TrackRender, TrackRender,
#HeatMapRender, HeatMapRender,
], ],
} }

2
analyzers/analyzer/default.py
View File

@ -8,12 +8,12 @@ class LocationAnalyzer(Analyzer):
""" """
store spatial log entries store spatial log entries
""" """
entries = []
__name__ = "Location" __name__ = "Location"
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def __init__(self, settings: LogSettings): def __init__(self, settings: LogSettings):
super().__init__(settings) super().__init__(settings)
self.entries = []
def result(self) -> Result: def result(self) -> Result:
self.log.debug(len(self.entries)) self.log.debug(len(self.entries))

6
log_analyzer.py
View File

@ -7,7 +7,7 @@ import analyzers
logging.basicConfig(format='%(levelname)s %(name)s:%(message)s', level=logging.DEBUG) logging.basicConfig(format='%(levelname)s %(name)s:%(message)s', level=logging.DEBUG)
logger = logging.getLogger(__name__) log = logging.getLogger(__name__)
def process_log(log_id: str, settings: LogSettings) -> List[Analyzer]: def process_log(log_id: str, settings: LogSettings) -> List[Analyzer]:
@ -18,8 +18,10 @@ def process_log(log_id: str, settings: LogSettings) -> List[Analyzer]:
except BaseException as e: except BaseException as e:
raise RuntimeError(e) raise RuntimeError(e)
analyzers = [] analyzers = []
log.debug("build analyzers")
for analyzer in settings.analyzers: for analyzer in settings.analyzers:
analyzers.append(analyzer(settings)) analyzers.append(analyzer(settings))
log.debug("process entries")
for entry in loader.get_entry(): for entry in loader.get_entry():
for analyzer in analyzers: for analyzer in analyzers:
if analyzer.process(entry): if analyzer.process(entry):
@ -50,7 +52,7 @@ if __name__ == '__main__':
#TODO: capture session ID, dict #TODO: capture session ID, dict
for log_id in log_ids: for log_id in log_ids:
for analysis in process_log(log_id, settings): for analysis in process_log(log_id, settings):
logger.info("* Result for " + analysis.name()) log.info("* Result for " + analysis.name())
# print(analysis.result()) # print(analysis.result())
# print(analysis.render()) # print(analysis.render())
results.append(analysis.result()) results.append(analysis.result())

9
static/heatmap.html
View File

@ -20,18 +20,17 @@
<script src="https://rawgit.com/Leaflet/Leaflet.heat/gh-pages/dist/leaflet-heat.js"></script> <script src="https://rawgit.com/Leaflet/Leaflet.heat/gh-pages/dist/leaflet-heat.js"></script>
<!--script src="./test.js"></script--> <script src="./heat_data.js"></script>
<script> <script>
var options = {maxZoom:22}; var options = {maxZoom:22};
var map = L.map('map', options).setView([49.90299388, 10.87004638], 17); var map = L.map('map', options).setView(coords[0], 17);
L.control.scale().addTo(map);
var tiles = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { var tiles = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors', attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',
}).addTo(map); }).addTo(map);
function addHeat(coords){ function addHeat(coords){
var transformed = coords.map(function (p) { return [p[1], p[0], 0.25]; }); var heat = L.heatLayer(coords).addTo(map);
var heat = L.heatLayer(transformed).addTo(map);
} }
//coords = coords.map(function (p) { return [p[1], p[0], 0.05]; }); //coords = coords.map(function (p) { return [p[1], p[0], 0.05]; });

8
static/trackmap.html
View File

@ -29,7 +29,7 @@
var options = {maxZoom:22}; var options = {maxZoom:22};
//var map = L.map('map', options).setView([49.90299388, 10.87004638], 17); //var map = L.map('map', options).setView([49.90299388, 10.87004638], 17);
var map = L.map('map', options); var map = L.map('map', options);
L.control.scale().addTo(map);
var tiles = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { var tiles = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors', attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',
}).addTo(map); }).addTo(map);
@ -40,8 +40,10 @@ function addHeat(coords){
} }
var layers=[]; var layers=[];
function addTrack(tracks, i){ function addTrack(tracks, i){
layers[i] = L.polyline(tracks[i], {color:"green"}); var elem = L.polyline(tracks[i], {color:"green"});
map.fitBounds(layers[i].getBounds()); // layers[i] =L.LayerGroup([elem]);
layers[i] = elem;
map.fitBounds(elem.getBounds());
layers[i].on('mouseover', function (e) { layers[i].on('mouseover', function (e) {
e.target.setStyle({'color':'red'}); e.target.setStyle({'color':'red'});
}); });