From 5059172d47b22a6de3f58046cfa1c91dccbeb8ac Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sun, 29 May 2011 22:59:30 +0000
Subject: [PATCH 1/2] add svg symbold

---
 source/Ox.UI/themes/modern/svg/symbolEmbed.svg      | 6 ++++++
 source/Ox.UI/themes/modern/svg/symbolGoToPoster.svg | 6 ++++++
 source/Ox.UI/themes/modern/svg/symbolSetPoster.svg  | 3 +++
 3 files changed, 15 insertions(+)
 create mode 100644 source/Ox.UI/themes/modern/svg/symbolEmbed.svg
 create mode 100644 source/Ox.UI/themes/modern/svg/symbolGoToPoster.svg
 create mode 100644 source/Ox.UI/themes/modern/svg/symbolSetPoster.svg

diff --git a/source/Ox.UI/themes/modern/svg/symbolEmbed.svg b/source/Ox.UI/themes/modern/svg/symbolEmbed.svg
new file mode 100644
index 00000000..30f0121c
--- /dev/null
+++ b/source/Ox.UI/themes/modern/svg/symbolEmbed.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256">
+    <line x1="88" y1="56" x2="24" y2="128" stroke="#FFFFFF" stroke-linecap="round" stroke-width="48"/>
+    <line x1="24" y1="128" x2="88" y2="200" stroke="#FFFFFF" stroke-linecap="round" stroke-width="48"/>
+    <line x1="168" y1="56" x2="232" y2="128" stroke="#FFFFFF" stroke-linecap="round" stroke-width="48"/>
+    <line x1="232" y1="128" x2="168" y2="200" stroke="#FFFFFF" stroke-linecap="round" stroke-width="48"/>
+</svg>
\ No newline at end of file
diff --git a/source/Ox.UI/themes/modern/svg/symbolGoToPoster.svg b/source/Ox.UI/themes/modern/svg/symbolGoToPoster.svg
new file mode 100644
index 00000000..e198b056
--- /dev/null
+++ b/source/Ox.UI/themes/modern/svg/symbolGoToPoster.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256">
+    <polygon points="40,32 136,128 40,224" fill="#FFFFFF"/>
+    <line x1="128" y1="48" x2="208" y2="48" stroke="#FFFFFF" stroke-width="32"/>
+    <line x1="192" y1="32" x2="192" y2="224" stroke="#FFFFFF" stroke-width="32"/>
+    <line x1="208" y1="208" x2="128" y2="208" stroke="#FFFFFF" stroke-width="32"/>
+</svg>
\ No newline at end of file
diff --git a/source/Ox.UI/themes/modern/svg/symbolSetPoster.svg b/source/Ox.UI/themes/modern/svg/symbolSetPoster.svg
new file mode 100644
index 00000000..32e4e1d8
--- /dev/null
+++ b/source/Ox.UI/themes/modern/svg/symbolSetPoster.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256">
+    <rect x="80" y="48" width="96" height="160" fill="none" stroke="#FFFFFF" stroke-width="32"/>
+</svg>
\ No newline at end of file

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 2/2] 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({