Skip to content

Commit

Permalink
Refactored 'Providers' into library 'vmanip-core', where they are ren…
Browse files Browse the repository at this point in the history
…amed to 'Layers'. Layers are based on Backbone.Models, so the code had to be adjusted to convert from Backbone.Models to plain-old Javascript objects where necessary.
  • Loading branch information
Martin Hecher committed Feb 19, 2014
1 parent c2bec99 commit 895281f
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 82 deletions.
7 changes: 1 addition & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']
}
}
},
Expand Down
7 changes: 2 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"vendor",
"test",
"tests"
],
"dependencies": {
"backbone": "~1.1.1",
"backbone.wreqr": "~1.0.0"
}
"dependencies": {}
}
16 changes: 14 additions & 2 deletions src/lib/Model_DemWithOverlays.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 + '"');
// });
};

/**
Expand Down Expand Up @@ -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,
Expand Down
69 changes: 0 additions & 69 deletions src/provider.js

This file was deleted.

0 comments on commit 895281f

Please sign in to comment.