From bf3e419b054083747ee711ffec7aaff54c4e5343 Mon Sep 17 00:00:00 2001 From: Javier Abadia Date: Tue, 18 Feb 2014 10:30:05 +0100 Subject: [PATCH] changed name of private methods --- lib/edit/offlineFeaturesManager.js | 44 +++++++++++++++------------- lib/tiles/offlineTilesEnabler.js | 10 +++---- test/spec/offlineTilesEnablerSpec.js | 4 +-- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/lib/edit/offlineFeaturesManager.js b/lib/edit/offlineFeaturesManager.js index d5abaea..b6d63a9 100644 --- a/lib/edit/offlineFeaturesManager.js +++ b/lib/edit/offlineFeaturesManager.js @@ -76,7 +76,7 @@ define([ { var phantomAdd = new Graphic( addEdit.geometry, - self.getPhantomSymbol(addEdit.geometry, editsStore.ADD), + self._getPhantomSymbol(addEdit.geometry, editsStore.ADD), { objectId: objectId }); @@ -95,7 +95,7 @@ define([ { var phantomUpdate = new Graphic( updateEdit.geometry, - self.getPhantomSymbol(updateEdit.geometry, editsStore.UPDATE), + self._getPhantomSymbol(updateEdit.geometry, editsStore.UPDATE), { objectId: objectId }); @@ -113,7 +113,7 @@ define([ { var phantomDelete = new Graphic( deleteEdit.geometry, - self.getPhantomSymbol(deleteEdit.geometry, editsStore.DELETE), + self._getPhantomSymbol(deleteEdit.geometry, editsStore.DELETE), { objectId: objectId }); @@ -139,20 +139,20 @@ define([ return this._nextTempId--; }; - function initPhantomLayer() + function _initPhantomLayer() { layer._phantomLayer = new GraphicsLayer({opacity:0.8}); layer._phantomLayer.disableMouseEvents(); var index = layer.getMap().graphicsLayerIds.indexOf(layer.id); layer._map.addLayer(layer._phantomLayer,index-1); } - initPhantomLayer(); + _initPhantomLayer(); }, // extend _phantomSymbols: [], - getPhantomSymbol: function(geometry, operation) + _getPhantomSymbol: function(geometry, operation) { if( this._phantomSymbols.length == 0) { @@ -228,7 +228,7 @@ define([ { console.log('going online'); this._onlineStatus = this.RECONNECTING; - this.replayStoredEdits(function() + this._replayStoredEdits(function() { this._onlineStatus = this.ONLINE; callback && callback.apply(this,arguments); @@ -241,7 +241,20 @@ define([ return this._onlineStatus; }, - optimizeEditsQueue: function() + getReadableEdit: function(edit) + { + var layer = this._featureLayers[ edit.layer ]; + var graphic = editsStore._deserialize(edit.graphic); + var readableGraphic = graphic.geometry.type; + var layerId = edit.layer.substring(edit.layer.lastIndexOf('/')+1); + if(layer) + readableGraphic += " [id=" + graphic.attributes[layer.objectIdField] + "]"; + return "o:" + edit.operation + ", l:" + layerId + ", g:" + readableGraphic; + }, + + /* internal methods */ + + _optimizeEditsQueue: function() { // console.log("edits:", editsStore._retrieveEditsQueue().map(function(e){return this.getReadableEdit(e)},this)); var optimizedEdits = {}; @@ -299,14 +312,14 @@ define([ return optimizedEdits; }, - replayStoredEdits: function(callback) + _replayStoredEdits: function(callback) { if( editsStore.hasPendingEdits() ) { // // flatten the queue into unique edits for each feature, grouped by FeatureLayer // - var optimizedEdits = this.optimizeEditsQueue(); + var optimizedEdits = this._optimizeEditsQueue(); var promises = {}; if( Object.keys(optimizedEdits).length == 0 ) @@ -417,16 +430,5 @@ define([ } }, - getReadableEdit: function(edit) - { - var layer = this._featureLayers[ edit.layer ]; - var graphic = editsStore._deserialize(edit.graphic); - var readableGraphic = graphic.geometry.type; - var layerId = edit.layer.substring(edit.layer.lastIndexOf('/')+1); - if(layer) - readableGraphic += " [id=" + graphic.attributes[layer.objectIdField] + "]"; - return "o:" + edit.operation + ", l:" + layerId + ", g:" + readableGraphic; - }, - }); // declare }); // define diff --git a/lib/tiles/offlineTilesEnabler.js b/lib/tiles/offlineTilesEnabler.js index 02263ca..fa2e6c2 100644 --- a/lib/tiles/offlineTilesEnabler.js +++ b/lib/tiles/offlineTilesEnabler.js @@ -132,7 +132,7 @@ define([ } /* launch tile download */ - this.doNextTile(0, cells, reportProgress); + this._doNextTile(0, cells, reportProgress); }; layer.goOffline = function() @@ -306,12 +306,12 @@ define([ } }; - layer.doNextTile = function(i, cells, reportProgress) + layer._doNextTile = function(i, cells, reportProgress) { var cell = cells[i]; var error; - this.storeTile(cell.level,cell.row,cell.col, function(success, error) + this._storeTile(cell.level,cell.row,cell.col, function(success, error) { if(!success) { @@ -324,12 +324,12 @@ define([ if( cancelRequested || i==cells.length-1 ) reportProgress({ finishedDownloading: true, cancelRequested: cancelRequested}) else - this.doNextTile(i+1, cells, reportProgress); + this._doNextTile(i+1, cells, reportProgress); }.bind(this)) } - layer.storeTile = function(level,row,col,callback) // callback(success, msg) + layer._storeTile = function(level,row,col,callback) // callback(success, msg) { var store = this.offline.store; var url = this._getTileUrl(level,row,col); diff --git a/test/spec/offlineTilesEnablerSpec.js b/test/spec/offlineTilesEnablerSpec.js index db6e9d8..fc08274 100644 --- a/test/spec/offlineTilesEnablerSpec.js +++ b/test/spec/offlineTilesEnablerSpec.js @@ -29,7 +29,7 @@ describe("offline enabler library", function() expect(g_basemapLayer.getTileUrl).toEqual(jasmine.any(Function)); expect(g_basemapLayer._getTileUrl).toEqual(jasmine.any(Function)); expect(g_basemapLayer.prepareForOffline).toEqual(jasmine.any(Function)); - expect(g_basemapLayer.storeTile).toEqual(jasmine.any(Function)); + expect(g_basemapLayer._storeTile).toEqual(jasmine.any(Function)); expect(g_basemapLayer.deleteAllTiles).toEqual(jasmine.any(Function)); expect(g_basemapLayer.offline).toEqual(jasmine.any(Object)); expect(g_basemapLayer.offline.store).toEqual(jasmine.any(Object)); @@ -78,7 +78,7 @@ describe("offline enabler library", function() g_basemapLayer.getOfflineUsage(function(usage) { expect(usage.tileCount).toEqual(0); - g_basemapLayer.storeTile(14,6177,8023, function(success) + g_basemapLayer._storeTile(14,6177,8023, function(success) { expect(success).toEqual(true); g_basemapLayer.getOfflineUsage(function(usage)