From ebcf070bdd8f8b49ff69afbb4688668007895cd9 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 9 Dec 2013 16:42:59 +0100 Subject: [PATCH] googlemap and querytable now use 2 keys * init_key, expected to be provided by caller, specifies a key that can be used at init-time (shoud be present in both queries) * canonical_key is rderived from metadata --- plugins/googlemap/static/js/googlemap.js | 105 +++++++---------- plugins/querygrid/static/js/querygrid.js | 11 ++ plugins/querytable/__init__.py | 16 +-- plugins/querytable/static/js/querytable.js | 130 ++++++++++----------- portal/sliceview.py | 19 +-- trash/simplegridview.py | 7 +- trash/simpletableview.py | 6 +- 7 files changed, 138 insertions(+), 156 deletions(-) diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js index 082a0c5b..7346f733 100644 --- a/plugins/googlemap/static/js/googlemap.js +++ b/plugins/googlemap/static/js/googlemap.js @@ -30,10 +30,13 @@ this.in_set_backlog = []; // we keep a couple of global hashes - // lat_lon --> { marker,