From acc8843aa5666de19e8a4542a1b46a0c59283209 Mon Sep 17 00:00:00 2001
From: 2trc <tassingremi@gmail.com>
Date: Tue, 2 Jan 2018 14:39:17 +0100
Subject: [PATCH] filters are groupped in an array instead of a dict

---
 anycluster/MapClusterer.py                 |  6 ++++--
 anycluster/static/anycluster/anycluster.js |  2 +-
 docs/filters.rst                           | 14 +++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/anycluster/MapClusterer.py b/anycluster/MapClusterer.py
index 419114d..7114c73 100644
--- a/anycluster/MapClusterer.py
+++ b/anycluster/MapClusterer.py
@@ -427,9 +427,11 @@ def constructFilterstring(self, filters):
 
         filterstring = ''
 
-        for column in filters:
+        for filter in filters:
 
-            filterparams = filters[column]
+            column = list(filter.keys())[0]
+
+            filterparams = filter[column]
 
             filterstring += ' AND ('
             
diff --git a/anycluster/static/anycluster/anycluster.js b/anycluster/static/anycluster/anycluster.js
index 22093df..ffbce87 100644
--- a/anycluster/static/anycluster/anycluster.js
+++ b/anycluster/static/anycluster/anycluster.js
@@ -220,7 +220,7 @@ Anycluster.prototype = {
 
 		this.baseURL = settings_.baseURL || "/anycluster/"
 		this.autostart = typeof(settings_.autostart) == "boolean" ? settings_.autostart : true;
-		this.filters = settings_.filters || {};
+		this.filters = settings_.filters || [];
 		this.center = settings_.center || [0,0];
 		this.clusterMethod = settings_.clusterMethod || "grid";
 		this.iconType = settings_.iconType || "exact";
diff --git a/docs/filters.rst b/docs/filters.rst
index a6bb5cd..9b842e2 100644
--- a/docs/filters.rst
+++ b/docs/filters.rst
@@ -8,9 +8,9 @@ A filterObject looks like this:
 
 .. code-block:: javascript
 
-   var filterObj = { 
-      "db_column_name" : { "values": value, "operator": operator_string } 
-   }
+   var filterObj = [
+      {"db_column_name" : { "values": value, "operator": operator_string }}
+   ]
 
 
 **value**
@@ -23,10 +23,10 @@ Example:
 
 .. code-block:: javascript
 
-   var filters = { 
-      "color": {"values" : "red", "operator":"!=" }
-	  "number": {"values": [2,3], "operator": "either_="}
-   }
+   var filters = [
+      {"color": {"values" : "red", "operator":"!=" }},
+      {"number": {"values": [2,3], "operator": "either_="}}
+   ]
    
    anyclusterInstance.filter(filters);