0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

merging changes

Browse source
This commit is contained in:
rolux 2011-05-30 08:29:44 +02:00
commit b96c85fc9b
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/Ox.UI/js/Map/Ox.ListMap.js
View file

@ -61,21 +61,6 @@ Ox.ListMap = function(options, self) {
marginLeft: '-3px', marginLeft: '-3px',
marginTop: 0 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', id: 'countryCode',
resizable: false, // fixme: implement resizable: false, // fixme: implement

18
source/Ox.UI/js/Map/Ox.Map.js
View file

@ -761,6 +761,22 @@ Ox.Map = function(options, self) {
} }
}); });
} else { } 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({ self.options.places({
keys: [ keys: [
'id', 'name', 'geoname', 'countryCode', 'id', 'name', 'geoname', 'countryCode',
@ -780,6 +796,7 @@ Ox.Map = function(options, self) {
range: [0, self.options.maxMarkers], range: [0, self.options.maxMarkers],
sort: [{key: 'area', operator: '-'}] sort: [{key: 'area', operator: '-'}]
}, function(result) { }, function(result) {
Ox.print('RESULT', result)
var ids = []; var ids = [];
result.data.items.forEach(function(item, i) { result.data.items.forEach(function(item, i) {
var place = getPlaceById(item.id); var place = getPlaceById(item.id);
@ -955,7 +972,6 @@ Ox.Map = function(options, self) {
{key: 'id', value: id, operator: '='} {key: 'id', value: id, operator: '='}
], ],
operator: '' operator: ''
} }
}, function(results) { }, function(results) {
place = new Ox.MapPlace(Ox.extend({ place = new Ox.MapPlace(Ox.extend({