Rename ol.source.VectorFile to ol.source.StaticVector

This commit is contained in:
Tom Payne
2014-02-20 22:43:04 +01:00
parent e44e59311b
commit 77933d0ab3
10 changed files with 26 additions and 26 deletions

View File

@@ -952,7 +952,7 @@
*/ */
/** /**
* @typedef {Object} olx.source.VectorFileOptions * @typedef {Object} olx.source.StaticVectorOptions
* @property {ArrayBuffer|undefined} arrayBuffer Array buffer. * @property {ArrayBuffer|undefined} arrayBuffer Array buffer.
* @property {Array.<ol.Attribution>|undefined} attributions Attributions. * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
* @property {Document|undefined} doc Document. * @property {Document|undefined} doc Document.

View File

@@ -1,13 +1,13 @@
goog.provide('ol.source.GeoJSON'); goog.provide('ol.source.GeoJSON');
goog.require('ol.format.GeoJSON'); goog.require('ol.format.GeoJSON');
goog.require('ol.source.VectorFile'); goog.require('ol.source.StaticVector');
/** /**
* @constructor * @constructor
* @extends {ol.source.VectorFile} * @extends {ol.source.StaticVector}
* @fires {@link ol.source.VectorEvent} ol.source.VectorEvent * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
* @param {olx.source.GeoJSONOptions=} opt_options Options. * @param {olx.source.GeoJSONOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
@@ -31,4 +31,4 @@ ol.source.GeoJSON = function(opt_options) {
}); });
}; };
goog.inherits(ol.source.GeoJSON, ol.source.VectorFile); goog.inherits(ol.source.GeoJSON, ol.source.StaticVector);

View File

@@ -1,13 +1,13 @@
goog.provide('ol.source.GPX'); goog.provide('ol.source.GPX');
goog.require('ol.format.GPX'); goog.require('ol.format.GPX');
goog.require('ol.source.VectorFile'); goog.require('ol.source.StaticVector');
/** /**
* @constructor * @constructor
* @extends {ol.source.VectorFile} * @extends {ol.source.StaticVector}
* @fires {@link ol.source.VectorEvent} ol.source.VectorEvent * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
* @param {olx.source.GPXOptions=} opt_options Options. * @param {olx.source.GPXOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
@@ -30,4 +30,4 @@ ol.source.GPX = function(opt_options) {
}); });
}; };
goog.inherits(ol.source.GPX, ol.source.VectorFile); goog.inherits(ol.source.GPX, ol.source.StaticVector);

View File

@@ -1,13 +1,13 @@
goog.provide('ol.source.IGC'); goog.provide('ol.source.IGC');
goog.require('ol.format.IGC'); goog.require('ol.format.IGC');
goog.require('ol.source.VectorFile'); goog.require('ol.source.StaticVector');
/** /**
* @constructor * @constructor
* @extends {ol.source.VectorFile} * @extends {ol.source.StaticVector}
* @fires {@link ol.source.VectorEvent} ol.source.VectorEvent * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
* @param {olx.source.IGCOptions=} opt_options Options. * @param {olx.source.IGCOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
@@ -27,4 +27,4 @@ ol.source.IGC = function(opt_options) {
}); });
}; };
goog.inherits(ol.source.IGC, ol.source.VectorFile); goog.inherits(ol.source.IGC, ol.source.StaticVector);

View File

@@ -1,13 +1,13 @@
goog.provide('ol.source.KML'); goog.provide('ol.source.KML');
goog.require('ol.format.KML'); goog.require('ol.format.KML');
goog.require('ol.source.VectorFile'); goog.require('ol.source.StaticVector');
/** /**
* @constructor * @constructor
* @extends {ol.source.VectorFile} * @extends {ol.source.StaticVector}
* @fires {@link ol.source.VectorEvent} ol.source.VectorEvent * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
* @param {olx.source.KMLOptions=} opt_options Options. * @param {olx.source.KMLOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
@@ -32,4 +32,4 @@ ol.source.KML = function(opt_options) {
}); });
}; };
goog.inherits(ol.source.KML, ol.source.VectorFile); goog.inherits(ol.source.KML, ol.source.StaticVector);

View File

@@ -1,13 +1,13 @@
goog.provide('ol.source.OSMXML'); goog.provide('ol.source.OSMXML');
goog.require('ol.format.OSMXML'); goog.require('ol.format.OSMXML');
goog.require('ol.source.VectorFile'); goog.require('ol.source.StaticVector');
/** /**
* @constructor * @constructor
* @extends {ol.source.VectorFile} * @extends {ol.source.StaticVector}
* @fires {@link ol.source.VectorEvent} ol.source.VectorEvent * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
* @param {olx.source.OSMXMLOptions=} opt_options Options. * @param {olx.source.OSMXMLOptions=} opt_options Options.
*/ */
@@ -29,4 +29,4 @@ ol.source.OSMXML = function(opt_options) {
}); });
}; };
goog.inherits(ol.source.OSMXML, ol.source.VectorFile); goog.inherits(ol.source.OSMXML, ol.source.StaticVector);

View File

@@ -0,0 +1 @@
@exportSymbol ol.source.StaticVector

View File

@@ -1,7 +1,7 @@
// FIXME consider delaying feature reading so projection can be provided by // FIXME consider delaying feature reading so projection can be provided by
// consumer (e.g. the view) // consumer (e.g. the view)
goog.provide('ol.source.VectorFile'); goog.provide('ol.source.StaticVector');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.dispose'); goog.require('goog.dispose');
@@ -23,10 +23,10 @@ goog.require('ol.xml');
* @constructor * @constructor
* @extends {ol.source.Vector} * @extends {ol.source.Vector}
* @fires {@link ol.source.VectorEvent} ol.source.VectorEvent * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
* @param {olx.source.VectorFileOptions=} opt_options Options. * @param {olx.source.StaticVectorOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.VectorFile = function(opt_options) { ol.source.StaticVector = function(opt_options) {
var options = goog.isDef(opt_options) ? opt_options : {}; var options = goog.isDef(opt_options) ? opt_options : {};
@@ -96,14 +96,14 @@ ol.source.VectorFile = function(opt_options) {
} }
}; };
goog.inherits(ol.source.VectorFile, ol.source.Vector); goog.inherits(ol.source.StaticVector, ol.source.Vector);
/** /**
* @param {Event} event Event. * @param {Event} event Event.
* @private * @private
*/ */
ol.source.VectorFile.prototype.handleXhrIo_ = function(event) { ol.source.StaticVector.prototype.handleXhrIo_ = function(event) {
var xhrIo = event.target; var xhrIo = event.target;
goog.asserts.assertInstanceof(xhrIo, goog.net.XhrIo); goog.asserts.assertInstanceof(xhrIo, goog.net.XhrIo);
if (xhrIo.isSuccess()) { if (xhrIo.isSuccess()) {
@@ -145,7 +145,7 @@ ol.source.VectorFile.prototype.handleXhrIo_ = function(event) {
* @param {ArrayBuffer|Document|Node|Object|string} source Source. * @param {ArrayBuffer|Document|Node|Object|string} source Source.
* @private * @private
*/ */
ol.source.VectorFile.prototype.readFeatures_ = function(source) { ol.source.StaticVector.prototype.readFeatures_ = function(source) {
var format = this.format; var format = this.format;
var features = format.readFeatures(source); var features = format.readFeatures(source);
var featureProjection = format.readProjection(source); var featureProjection = format.readProjection(source);

View File

@@ -1,13 +1,13 @@
goog.provide('ol.source.TopoJSON'); goog.provide('ol.source.TopoJSON');
goog.require('ol.format.TopoJSON'); goog.require('ol.format.TopoJSON');
goog.require('ol.source.VectorFile'); goog.require('ol.source.StaticVector');
/** /**
* @constructor * @constructor
* @extends {ol.source.VectorFile} * @extends {ol.source.StaticVector}
* @fires {@link ol.source.VectorEvent} ol.source.VectorEvent * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
* @param {olx.source.TopoJSONOptions=} opt_options Options. * @param {olx.source.TopoJSONOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
@@ -30,4 +30,4 @@ ol.source.TopoJSON = function(opt_options) {
}); });
}; };
goog.inherits(ol.source.TopoJSON, ol.source.VectorFile); goog.inherits(ol.source.TopoJSON, ol.source.StaticVector);

View File

@@ -1 +0,0 @@
@exportSymbol ol.source.VectorFile