ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s/store/source/

Browse Source
This commit is contained in:
Tom Payne
2012-09-26 18:48:19 +02:00
parent 228e5a8dbf
commit 290d03e76f
15 changed files with 128 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/layer/bingmaps.js
+12 -12
View File
@@ -1,5 +1,5 @@
goog.provide('ol.layer.BingMaps');
goog.provide('ol.tilestore.BingMaps');
goog.provide('ol.tilesource.BingMaps');
goog.require('goog.Uri');
goog.require('goog.events');
@@ -7,7 +7,7 @@ goog.require('goog.events.EventType');
goog.require('goog.net.Jsonp');
goog.require('ol.TileCoverageArea');
goog.require('ol.TileLayer');
goog.require('ol.TileStore');
goog.require('ol.TileSource');
goog.require('ol.tilegrid.XYZ');
@@ -33,11 +33,11 @@ ol.BingMapsStyle = {
* @param {Object.<string, *>=} opt_values Values.
*/
ol.layer.BingMaps = function(style, key, opt_culture, opt_values) {
var tileStore = new ol.tilestore.BingMaps(style, key, opt_culture,
function(tileStore) {
var tileSource = new ol.tilesource.BingMaps(style, key, opt_culture,
function(tileSource) {
this.dispatchEvent(goog.events.EventType.LOAD);
}, this);
goog.base(this, tileStore, opt_values);
goog.base(this, tileSource, opt_values);
};
goog.inherits(ol.layer.BingMaps, ol.TileLayer);
@@ -45,14 +45,14 @@ goog.inherits(ol.layer.BingMaps, ol.TileLayer);
/**
* @constructor
* @extends {ol.TileStore}
* @extends {ol.TileSource}
* @param {ol.BingMapsStyle} style Bing Maps style.
* @param {string} key Key.
* @param {string=} opt_culture Culture.
* @param {?function(ol.tilestore.BingMaps)=} opt_callback Callback.
* @param {?function(ol.tilesource.BingMaps)=} opt_callback Callback.
* @param {*=} opt_obj Object.
*/
ol.tilestore.BingMaps =
ol.tilesource.BingMaps =
function(style, key, opt_culture, opt_callback, opt_obj) {
/**
@@ -69,7 +69,7 @@ ol.tilestore.BingMaps =
/**
* @private
* @type {?function(ol.tilestore.BingMaps)}
* @type {?function(ol.tilesource.BingMaps)}
*/
this.callback_ = opt_callback || null;
@@ -94,13 +94,13 @@ ol.tilestore.BingMaps =
this, projection, null, ol.TileUrlFunction.nullTileUrlFunction, extent);
};
goog.inherits(ol.tilestore.BingMaps, ol.TileStore);
goog.inherits(ol.tilesource.BingMaps, ol.TileSource);
/**
* @param {BingMapsImageryMetadataResponse} response Response.
*/
ol.tilestore.BingMaps.prototype.handleImageryMetadataResponse =
ol.tilesource.BingMaps.prototype.handleImageryMetadataResponse =
function(response) {
goog.asserts.assert(
@@ -184,6 +184,6 @@ ol.tilestore.BingMaps.prototype.handleImageryMetadataResponse =
/**
* @inheritDoc
*/
ol.tilestore.BingMaps.prototype.isReady = function() {
ol.tilesource.BingMaps.prototype.isReady = function() {
return this.ready_;
};
src/ol/layer/layer.js
+9 -9
View File
@@ -3,7 +3,7 @@ goog.provide('ol.layer.LayerProperty');
goog.require('goog.math');
goog.require('ol.Object');
goog.require('ol.Store');
goog.require('ol.Source');
/**
@@ -23,18 +23,18 @@ ol.layer.LayerProperty = {
/**
* @constructor
* @extends {ol.Object}
* @param {ol.Store} store Store.
* @param {ol.Source} source Source.
* @param {Object.<string, *>=} opt_values Values.
*/
ol.layer.Layer = function(store, opt_values) {
ol.layer.Layer = function(source, opt_values) {
goog.base(this);
/**
* @private
* @type {ol.Store}
* @type {ol.Source}
*/
this.store_ = store;
this.source_ = source;
this.setBrightness(0);
this.setContrast(0);
@@ -112,10 +112,10 @@ goog.exportProperty(
/**
* @return {ol.Store} Store.
* @return {ol.Source} Source.
*/
ol.layer.Layer.prototype.getStore = function() {
return this.store_;
ol.layer.Layer.prototype.getSource = function() {
return this.source_;
};
@@ -135,7 +135,7 @@ goog.exportProperty(
* @return {boolean} Is ready.
*/
ol.layer.Layer.prototype.isReady = function() {
return this.getStore().isReady();
return this.getSource().isReady();
};
src/ol/layer/openstreetmap.js
+7 -7
View File
@@ -1,9 +1,9 @@
goog.provide('ol.layer.OpenStreetMap');
goog.provide('ol.store.OpenStreetMap');
goog.provide('ol.source.OpenStreetMap');
goog.require('ol.TileLayer');
goog.require('ol.TileUrlFunction');
goog.require('ol.tilestore.XYZ');
goog.require('ol.tilesource.XYZ');
@@ -13,8 +13,8 @@ goog.require('ol.tilestore.XYZ');
* @param {Object.<string, *>=} opt_values Values.
*/
ol.layer.OpenStreetMap = function(opt_values) {
var tileStore = new ol.store.OpenStreetMap();
goog.base(this, tileStore, opt_values);
var tileSource = new ol.source.OpenStreetMap();
goog.base(this, tileSource, opt_values);
};
goog.inherits(ol.layer.OpenStreetMap, ol.TileLayer);
@@ -22,9 +22,9 @@ goog.inherits(ol.layer.OpenStreetMap, ol.TileLayer);
/**
* @constructor
* @extends {ol.tilestore.XYZ}
* @extends {ol.tilesource.XYZ}
*/
ol.store.OpenStreetMap = function() {
ol.source.OpenStreetMap = function() {
var tileUrlFunction = ol.TileUrlFunction.createFromTemplate(
'http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png');
@@ -37,4 +37,4 @@ ol.store.OpenStreetMap = function() {
goog.base(this, 18, tileUrlFunction, [attribution]);
};
goog.inherits(ol.store.OpenStreetMap, ol.tilestore.XYZ);
goog.inherits(ol.source.OpenStreetMap, ol.tilesource.XYZ);
src/ol/layer/stamen.js
+1 -1
View File
@@ -1,7 +1,7 @@
// FIXME Configure minZoom when supported by TileGrid
goog.provide('ol.layer.Stamen');
goog.provide('ol.store.Stamen');
goog.provide('ol.source.Stamen');
goog.require('ol.TileUrlFunction');
goog.require('ol.layer.XYZ');
src/ol/layer/tilejson.js
+11 -11
View File
@@ -8,7 +8,7 @@
goog.provide('ol.layer.TileJSON');
goog.provide('ol.tilejson');
goog.provide('ol.tilestore.TileJSON');
goog.provide('ol.tilesource.TileJSON');
goog.require('goog.asserts');
goog.require('goog.events.EventType');
@@ -16,7 +16,7 @@ goog.require('goog.net.jsloader');
goog.require('goog.string');
goog.require('ol.TileCoverageArea');
goog.require('ol.TileLayer');
goog.require('ol.TileStore');
goog.require('ol.TileSource');
goog.require('ol.TileUrlFunction');
@@ -45,10 +45,10 @@ goog.exportSymbol('grid', grid);
*/
ol.layer.TileJSON = function(url, opt_values) {
goog.asserts.assert(goog.string.endsWith(url, '.jsonp'));
var tileStore = new ol.tilestore.TileJSON(url, function(tileStore) {
var tileSource = new ol.tilesource.TileJSON(url, function(tileSource) {
this.dispatchEvent(goog.events.EventType.LOAD);
}, this);
goog.base(this, tileStore, opt_values);
goog.base(this, tileSource, opt_values);
};
goog.inherits(ol.layer.TileJSON, ol.TileLayer);
@@ -56,12 +56,12 @@ goog.inherits(ol.layer.TileJSON, ol.TileLayer);
/**
* @constructor
* @extends {ol.TileStore}
* @extends {ol.TileSource}
* @param {string} uri URI.
* @param {?function(ol.tilestore.TileJSON)=} opt_callback Callback.
* @param {?function(ol.tilesource.TileJSON)=} opt_callback Callback.
* @param {*=} opt_obj Object.
*/
ol.tilestore.TileJSON = function(uri, opt_callback, opt_obj) {
ol.tilesource.TileJSON = function(uri, opt_callback, opt_obj) {
var projection = ol.Projection.getFromCode('EPSG:3857');
@@ -70,7 +70,7 @@ ol.tilestore.TileJSON = function(uri, opt_callback, opt_obj) {
/**
* @private
* @type {?function(ol.tilestore.TileJSON)}
* @type {?function(ol.tilesource.TileJSON)}
*/
this.callback_ = opt_callback || null;
@@ -94,13 +94,13 @@ ol.tilestore.TileJSON = function(uri, opt_callback, opt_obj) {
this.deferred_.addCallback(this.handleTileJSONResponse, this);
};
goog.inherits(ol.tilestore.TileJSON, ol.TileStore);
goog.inherits(ol.tilesource.TileJSON, ol.TileSource);
/**
* @protected
*/
ol.tilestore.TileJSON.prototype.handleTileJSONResponse = function() {
ol.tilesource.TileJSON.prototype.handleTileJSONResponse = function() {
var tileJSON = ol.tilejson.grids_.pop();
@@ -176,6 +176,6 @@ ol.tilestore.TileJSON.prototype.handleTileJSONResponse = function() {
/**
* @inheritDoc
*/
ol.tilestore.TileJSON.prototype.isReady = function() {
ol.tilesource.TileJSON.prototype.isReady = function() {
return this.ready_;
};
src/ol/layer/xyz.js
+7 -7
View File
@@ -1,6 +1,6 @@
goog.provide('ol.layer.XYZ');
goog.provide('ol.tilegrid.XYZ');
goog.provide('ol.tilestore.XYZ');
goog.provide('ol.tilesource.XYZ');
goog.require('goog.math');
goog.require('ol.Attribution');
@@ -10,7 +10,7 @@ goog.require('ol.Size');
goog.require('ol.TileCoord');
goog.require('ol.TileGrid');
goog.require('ol.TileLayer');
goog.require('ol.TileStore');
goog.require('ol.TileSource');
goog.require('ol.TileUrlFunction');
goog.require('ol.layer.Layer');
@@ -76,9 +76,9 @@ ol.tilegrid.XYZ.prototype.forEachTileCoordParentTileRange =
*/
ol.layer.XYZ = function(
maxZoom, tileUrlFunction, opt_attributions, opt_crossOrigin, opt_values) {
var tileStore = new ol.tilestore.XYZ(
var tileSource = new ol.tilesource.XYZ(
maxZoom, tileUrlFunction, opt_attributions, opt_crossOrigin);
goog.base(this, tileStore, opt_values);
goog.base(this, tileSource, opt_values);
};
goog.inherits(ol.layer.XYZ, ol.TileLayer);
@@ -86,13 +86,13 @@ goog.inherits(ol.layer.XYZ, ol.TileLayer);
/**
* @constructor
* @extends {ol.TileStore}
* @extends {ol.TileSource}
* @param {number} maxZoom Maximum zoom.
* @param {ol.TileUrlFunctionType} tileUrlFunction Tile URL function.
* @param {Array.<ol.Attribution>=} opt_attributions Attributions.
* @param {string=} opt_crossOrigin Cross origin.
*/
ol.tilestore.XYZ =
ol.tilesource.XYZ =
function(maxZoom, tileUrlFunction, opt_attributions, opt_crossOrigin) {
var projection = ol.Projection.getFromCode('EPSG:3857');
@@ -115,4 +115,4 @@ ol.tilestore.XYZ =
opt_attributions, opt_crossOrigin);
};
goog.inherits(ol.tilestore.XYZ, ol.TileStore);
goog.inherits(ol.tilesource.XYZ, ol.TileSource);