diff --git a/Gruntfile.js b/Gruntfile.js index 0adc7b6..3966962 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -13,12 +13,7 @@ module.exports = function(grunt) { dist: { files: { 'dist/<%= pkg.name %>.debug.js': ['src/viewer.js', 'src/**/*.js'], - 'dist/<%= pkg.name %>-deps.debug.js': [ - 'deps/*.js', - 'vendor/underscore/underscore.js', - 'vendor/backbone/backbone.js', - 'vendor/backbone.wreqr/lib/backbone.wreqr.js' - ] + 'dist/<%= pkg.name %>-deps.debug.js': ['deps/*.js'] } } }, diff --git a/bower.json b/bower.json index 2afecfd..bdb4c85 100644 --- a/bower.json +++ b/bower.json @@ -11,12 +11,9 @@ "ignore": [ "**/.*", "node_modules", - "bower_components", + "vendor", "test", "tests" ], - "dependencies": { - "backbone": "~1.1.1", - "backbone.wreqr": "~1.0.0" - } + "dependencies": {} } diff --git a/src/lib/Model_DemWithOverlays.js b/src/lib/Model_DemWithOverlays.js index eea5d9f..86a3077 100644 --- a/src/lib/Model_DemWithOverlays.js +++ b/src/lib/Model_DemWithOverlays.js @@ -33,6 +33,10 @@ RBV.Models.DemWithOverlays.prototype.setDemProvider = function(provider) { */ RBV.Models.DemWithOverlays.prototype.addImageryProvider = function(provider) { this.imageryProviders.push(provider); + + // this.listenTo(provider, 'opacity:change', function(model, value) { + // console.log('Provider "' + model.id + '" changed opacity to "' + value + '"'); + // }); }; /** @@ -71,9 +75,17 @@ RBV.Models.DemWithOverlays.prototype.createModel = function(root, cubeSizeX, cub this.root = root; this.createPlaceHolder(); + // Convert the original Backbone.Model layers to 'plain-old-data' javascript objects: + var podImageryProviders = []; + _.each(this.imageryProviders, function(layer, idx) { + podImageryProviders.push(layer.toJSON()); + }); + + var podDemProvider = this.demRequest.toJSON(); + EarthServerGenericClient.getDEMWithOverlays(this, { - dem: this.demRequest, - imagery: this.imageryProviders, + dem: podDemProvider, + imagery: podImageryProviders, bbox: bbox, timespan: this.timespan, resX: this.XResolution, diff --git a/src/provider.js b/src/provider.js deleted file mode 100644 index 1111245..0000000 --- a/src/provider.js +++ /dev/null @@ -1,69 +0,0 @@ -RBV.Provider = RBV.Provider || {}; - -/** - * @class OGCProvider: An abstract object managing a request to a OGC service provider. - */ -RBV.Provider.OGCProvider = function(opts) {} - -RBV.Provider.OGCProvider.prototype.init = function(opts) { - // FIXXME: error handling! - this.protocol = opts.protocol; - this.id = opts.id; - this.urls = opts.urls; - this.style = opts.style || 'default'; - this.crs = opts.crs; - this.format = opts.format; - this.version = opts.version; - - this.mimeTypeHandlers = {}; -} - -RBV.Provider.OGCProvider.prototype.toString = function() { - return '[' + this.protocol + '] id: ' + this.id; -}; - -/** - * Registers a handler for a specific format for preprocessing data received - * by a data request. An eventual registered handler with the same mimetype - * will be overwritten. - * - * @param mimetype - MIME type name (i.e. 'image/x-aaigrid') - * @returns {boolean} - TRUE if a handler for the given format was already registered, - * FALSE if not - */ -RBV.Provider.OGCProvider.prototype.registerMimeTypeHandler = function(mimetype, handler) { - var wasRegistered = false; - if (this.mimeTypeHandlers[mimetype]) { - wasRegistered = true; - } - this.mimeTypeHandlers[mimetype] = handler; - - return wasRegistered; -}; - -RBV.Provider.OGCProvider.prototype.getMimeTypeHandlers = function() { - return this.mimeTypeHandlers; -}; - -/** - * @class WMS: A WMS provider. - */ -RBV.Provider.WMS = function(opts) { - opts.protocol = 'WMS'; - opts.version = opts.version || '1.0.0'; - RBV.Provider.OGCProvider.prototype.init.call(this, opts); -} -RBV.Provider.WMS.inheritsFrom(RBV.Provider.OGCProvider) - -/** - * @class WCS: A WCS provider. - */ -RBV.Provider.WCS = function(opts) { - opts.protocol = 'WCS'; - opts.version = opts.version || '2.0.0'; - RBV.Provider.OGCProvider.prototype.init.call(this, opts); - - this.outputCRS = opts.outputCRS; - this.datatype = opts.datatype; -} -RBV.Provider.WCS.inheritsFrom(RBV.Provider.OGCProvider) \ No newline at end of file