From c25deecf0b95952845e121b24004bc13edd9381f Mon Sep 17 00:00:00 2001
From: agp8x <git@agp8x.org>
Date: Wed, 16 Aug 2017 16:06:54 +0200
Subject: [PATCH] fix leaking location data

---
 analyzers/__init__.py         | 2 +-
 analyzers/analyzer/default.py | 2 +-
 log_analyzer.py               | 6 ++++--
 static/heatmap.html           | 9 ++++-----
 static/trackmap.html          | 8 +++++---
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/analyzers/__init__.py b/analyzers/__init__.py
index 63014aa..0730b39 100644
--- a/analyzers/__init__.py
+++ b/analyzers/__init__.py
@@ -33,7 +33,7 @@ __MAPPING__ = {
 	],
 	LocationAnalyzer: [
 		TrackRender,
-		#HeatMapRender,
+		HeatMapRender,
 	],
 }
 
diff --git a/analyzers/analyzer/default.py b/analyzers/analyzer/default.py
index 87a3a68..81203f5 100644
--- a/analyzers/analyzer/default.py
+++ b/analyzers/analyzer/default.py
@@ -8,12 +8,12 @@ class LocationAnalyzer(Analyzer):
 	"""
 	store spatial log entries
 	"""
-	entries = []
 	__name__ = "Location"
 	log = logging.getLogger(__name__)
 
 	def __init__(self, settings: LogSettings):
 		super().__init__(settings)
+		self.entries = []
 
 	def result(self) -> Result:
 		self.log.debug(len(self.entries))
diff --git a/log_analyzer.py b/log_analyzer.py
index 4bc95e3..b33f5e8 100644
--- a/log_analyzer.py
+++ b/log_analyzer.py
@@ -7,7 +7,7 @@ import analyzers
 
 
 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]:
@@ -18,8 +18,10 @@ def process_log(log_id: str, settings: LogSettings) -> List[Analyzer]:
 	except BaseException as e:
 		raise RuntimeError(e)
 	analyzers = []
+	log.debug("build analyzers")
 	for analyzer in settings.analyzers:
 		analyzers.append(analyzer(settings))
+	log.debug("process entries")
 	for entry in loader.get_entry():
 		for analyzer in analyzers:
 			if analyzer.process(entry):
@@ -50,7 +52,7 @@ if __name__ == '__main__':
 	#TODO: capture session ID, dict
 	for log_id in log_ids:
 		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.render())
 			results.append(analysis.result())
diff --git a/static/heatmap.html b/static/heatmap.html
index 6d49b9a..ed3d02c 100644
--- a/static/heatmap.html
+++ b/static/heatmap.html
@@ -20,18 +20,17 @@
 
 <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>
 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', {
     attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',
 }).addTo(map);
 
 function addHeat(coords){
-    var transformed = coords.map(function (p) { return [p[1], p[0], 0.25]; });
-    var heat = L.heatLayer(transformed).addTo(map);
+    var heat = L.heatLayer(coords).addTo(map);
 }
 //coords = coords.map(function (p) { return [p[1], p[0], 0.05]; });
 
diff --git a/static/trackmap.html b/static/trackmap.html
index 2323a9a..d06bb38 100644
--- a/static/trackmap.html
+++ b/static/trackmap.html
@@ -29,7 +29,7 @@
 var options = {maxZoom:22};
 //var map = L.map('map', options).setView([49.90299388, 10.87004638], 17);
 var map = L.map('map', options);
-
+L.control.scale().addTo(map);
 var tiles = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
     attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',
 }).addTo(map);
@@ -40,8 +40,10 @@ function addHeat(coords){
 }
 var layers=[];
 function addTrack(tracks, i){
-    layers[i] = L.polyline(tracks[i], {color:"green"});
-    map.fitBounds(layers[i].getBounds());
+    var elem = L.polyline(tracks[i], {color:"green"});
+    // layers[i] =L.LayerGroup([elem]);
+    layers[i] = elem;
+    map.fitBounds(elem.getBounds());
     layers[i].on('mouseover', function (e) {
         e.target.setStyle({'color':'red'});
     });