knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #90 from amercader/master

Browse Source 
[s,bugfix]: Ignore empty fields, replace forEach and breakLoop (from @amercader).
This commit is contained in:
Rufus Pollock 2012-04-11 11:19:40 -07:00
commit 8092b563b3
2 changed files with 444 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

592
recline.js
View File

File diff suppressed because it is too large Load Diff

22
src/view-map.js
View File

@ -239,15 +239,18 @@ my.Map = Backbone.View.extend({
//
// Each feature will have a popup associated with all the document fields.
//
_add: function(doc){
_add: function(docs){
var self = this;
if (!(doc instanceof Array)) doc = [doc];
if (!(docs instanceof Array)) docs = [docs];
doc.forEach(function(doc){
_.every(docs,function(doc){
var feature = self._getGeometryFromDocument(doc);
if (feature instanceof Object){
if (typeof feature === 'undefined'){
// Empty field
return true;
} else if (feature instanceof Object){
// Build popup contents
// TODO: mustache?
html = ''
@ -266,24 +269,25 @@ my.Map = Backbone.View.extend({
var msg = 'Wrong geometry value';
if (except.message) msg += ' (' + except.message + ')';
my.notify(msg,{category:'error'});
_.breakLoop();
return false;
}
} else {
my.notify('Wrong geometry value',{category:'error'});
_.breakLoop();
return false;
}
return true;
});
},
// Private: Remove one or n features to the map
//
_remove: function(doc){
_remove: function(docs){
var self = this;
if (!(doc instanceof Array)) doc = [doc];
if (!(docs instanceof Array)) docs = [docs];
doc.forEach(function(doc){
_.each(doc,function(doc){
for (key in self.features._layers){
if (self.features._layers[key].cid == doc.cid){
self.features.removeLayer(self.features._layers[key]);