diff --git a/static/js/pandora/pandora.js b/static/js/pandora/pandora.js index ba793c5..365aa4b 100644 --- a/static/js/pandora/pandora.js +++ b/static/js/pandora/pandora.js @@ -92,8 +92,8 @@ pandora.reloadGroups = function(i) { } }); } else if (view == 'map') { - pandora.$ui.list.options({ - items: function(data, callback) { + pandora.$ui.map.options({ + places: function(data, callback) { return pandora.api.findPlaces($.extend(data, { itemQuery: query }), callback); diff --git a/static/js/pandora/ui/list.js b/static/js/pandora/ui/list.js index 8e48f66..4f5eccd 100644 --- a/static/js/pandora/ui/list.js +++ b/static/js/pandora/ui/list.js @@ -138,9 +138,12 @@ pandora.ui.list = function(view) { // fixme: remove view argument element: pandora.$ui.map = Ox.Map({ height: window.innerHeight - pandora.user.ui.showGroups * pandora.user.ui.groupsSize - 61, places: function(data, callback) { - return pandora.api.findPlaces($.extend({ - query: {conditions: [], operator: ''} - }, data), callback); + var itemQuery = pandora.Query.toObject(), + query = {conditions:[]}; + return pandora.api.findPlaces($.extend(data, { + itemQuery: itemQuery, + query: query + }), callback); }, showTypes: true, toolbar: true,