From ed01a3cf07d981432192d814b548c037f0ed1c23 Mon Sep 17 00:00:00 2001 From: Thomas Lake Date: Mon, 9 Apr 2012 00:23:15 +0100 Subject: [PATCH] Minor tweaks for JSObserver --- overviewer_core/data/js_src/views.js | 1 + overviewer_core/observer.py | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/overviewer_core/data/js_src/views.js b/overviewer_core/data/js_src/views.js index cbc6453..e66267e 100644 --- a/overviewer_core/data/js_src/views.js +++ b/overviewer_core/data/js_src/views.js @@ -114,6 +114,7 @@ overviewer.views.ProgressView = Backbone.View.extend({ this.el.innerHTML = 'Current Render Progress'; overviewer.map.controls[google.maps.ControlPosition.BOTTOM_RIGHT].push(this.el); this.hidden = true; + $.ajaxSetup({cache: false}); }, updateProgress: function() { e = this; diff --git a/overviewer_core/observer.py b/overviewer_core/observer.py index e6fa14f..32053cd 100644 --- a/overviewer_core/observer.py +++ b/overviewer_core/observer.py @@ -181,10 +181,6 @@ class JSObserver(Observer): self.minrefresh = 1000*minrefresh self.logfile = os.path.join(outputdir, "progress.js") - f = open(self.logfile, "w", 0) - f.write('{"message": "Render in progress", "update": %d}' % self.minrefresh) - f.close() - def start(self, max_value): f = open(self.logfile, "w", 0) f.write('{"message": "Rendering %d tiles", "update": %s}' % (max_value, self.minrefresh)) @@ -251,8 +247,6 @@ class JSObserver(Observer): def _need_update(self): cur_val = self.get_current_value() - if (time.time() - self.last_update_time) <= self.minrefresh//1000: - return False if cur_val < 100: return cur_val - self.last_update > 10 elif cur_val < 500: