From ef6bb1753a6fd1e9a29e9d05ee96278995182fad Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sun, 29 May 2011 23:00:26 +0000
Subject: [PATCH] map

---
 source/Ox.UI/js/Map/Ox.ListMap.js | 15 ---------------
 source/Ox.UI/js/Map/Ox.Map.js     | 25 ++++++++++++++++++++-----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js
index dabf4473..366482ea 100644
--- a/source/Ox.UI/js/Map/Ox.ListMap.js
+++ b/source/Ox.UI/js/Map/Ox.ListMap.js
@@ -61,21 +61,6 @@ Ox.ListMap = function(options, self) {
                         marginLeft: '-3px',
                         marginTop: 0
                     });
-                    /*
-                    .css({
-                        width: '21px',
-                        height: '14px'
-                    })
-                    .load(function() {
-                        var $this = $(this);
-                        Ox.print($this.width() / $this.height())
-                        $this.css({
-                            width: Math.round(14 * $this.width() / $this.height()) + 'px',
-                            height: '14px',
-                            padding: '1px 0 0 1px'
-                        });
-                    });
-                    */
             },
             id: 'countryCode',
             resizable: false, // fixme: implement
diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js
index ffa9c966..81d6ddfe 100644
--- a/source/Ox.UI/js/Map/Ox.Map.js
+++ b/source/Ox.UI/js/Map/Ox.Map.js
@@ -761,6 +761,22 @@ Ox.Map = function(options, self) {
                     }
                 });
             } else {
+                Ox.print('QUERY', {
+                    conditions: Ox.merge([
+                        {key: 'lat', value: [south, north], operator: '-'}
+                    ], !crossesDateline ? [
+                        {key: 'lng', value: [west, east], operator: '-'}
+                    ] : [
+                        {
+                            conditions: [
+                                {key: 'lng', value: west, operator: '<'},
+                                {key: 'lng', value: east, operator: '>'}
+                            ],
+                            operator: '|'
+                        }
+                    ]),
+                    operator: '&'
+                });
                 self.options.places({
                     keys: [
                         'id', 'name', 'geoname', 'countryCode',
@@ -786,6 +802,7 @@ Ox.Map = function(options, self) {
                     range: [0, self.options.maxMarkers],
                     sort: [{key: 'area', operator: '+'}]
                 }, function(result) {
+                    Ox.print('RESULT', result)
                     var ids = [];
                     result.data.items.forEach(function(item, i) {
                         var place = getPlaceById(item.id);
@@ -957,11 +974,9 @@ Ox.Map = function(options, self) {
                     // async && place doesn't exist yet
                     self.options.places({
                         query: {
-                            conditions: [
-                                {key: 'id', value: id, operator: '^$'}
-                            ],
-                            operator: ''
-
+                            key: 'id',
+                            value: id,
+                            operator: '^$'
                         }
                     }, function(results) {
                         place = new Ox.MapPlace(Ox.extend({