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

[view/map,bugfix,refactor][s]: correct bug due to misinterpretation (?) of Backbone reset and refactor so we redraw on initialize.

Browse Source 
* Bug: dataset.currentDocuments.reset was being interpreted as empty rather than a re-fill of new documents and was therefore not re-adding currentDocuments items to the list of features. Fixed this.
* Discovered bug during a refactor. Refactor removed listener for query:done as this will be covered by currentDocuments.reset or similar. This also means we can initialize the view with a dataset already containing data and it will render w/o need to call query() again.
This commit is contained in:
Rufus Pollock 2012-05-20 13:43:33 +01:00
parent ffe07e4ad5
commit 62a790ceb9
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/view-map.js
View File

@ -88,7 +88,7 @@ my.Map = Backbone.View.extend({
</div> \
',
// These are the default field names that will be used if found.
// These are the default (case-insensitive) names of field that are used if found.
// If not found, the user will need to define the fields via the editor.
latitudeFieldNames: ['lat','latitude'],
longitudeFieldNames: ['lon','longitude'],
@ -154,7 +154,7 @@ my.Map = Backbone.View.extend({
this.render();
},
// Public: Adds the necessary elements to the page.
// ### Public: Adds the necessary elements to the page.
//
// Also sets up the editor fields and the map if necessary.
render: function() {
@ -176,22 +176,11 @@ my.Map = Backbone.View.extend({
$('#editor-field-type-latlon').attr('checked','checked').change();
}
}
this.model.bind('query:done', function() {
if (!self.geomReady){
self._setupGeometryField();
}
if (!self.mapReady){
self._setupMap();
}
self.redraw();
});
this.redraw();
return this;
},
// Public: Redraws the features on the map according to the action provided
// ### Public: Redraws the features on the map according to the action provided
//
// Actions can be:
//
@ -199,23 +188,27 @@ my.Map = Backbone.View.extend({
// * add: Add one or n features (documents)
// * remove: Remove one or n features (documents)
// * refresh: Clear existing features and add all current documents
//
redraw: function(action,doc){
redraw: function(action, doc){
var self = this;
action = action || 'refresh';
// try to set things up if not already
if (!self.geomReady){
self._setupGeometryField();
}
if (!self.mapReady){
self._setupMap();
}
if (this.geomReady && this.mapReady){
if (action == 'reset'){
if (action == 'reset' || action == 'refresh'){
this.features.clearLayers();
this._add(this.model.currentDocuments.models);
} else if (action == 'add' && doc){
this._add(doc);
} else if (action == 'remove' && doc){
this._remove(doc);
} else if (action == 'refresh'){
this.features.clearLayers();
this._add(this.model.currentDocuments.models);
}
if (action != 'reset' && this.autoZoom){
if (this.autoZoom){
if (this.visible){
this._zoomToFeatures();
} else {

2
test/view-map.test.js
View File

@ -49,7 +49,7 @@ test('Lat/Lon geom fields', function () {
});
$('.fixtures').append(view.el);
//Fire query, otherwise the map won't be initialized
// Not really needed but fire query to test that resetting works!
dataset.query();
// Check that all markers were created