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

Use ol.inherits instead of goog.inherits

Browse Source
This commit is contained in:
Frederic Junod
2016-04-07 16:26:11 +02:00
parent 072728b083
commit e289bfbb7d
166 changed files with 448 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/format/esrijsonformat.js
View File

@@ -33,7 +33,7 @@ ol.format.EsriJSON = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this);
ol.format.JSONFeature.call(this);
/**
* Name of the geometry attribute for features.
@@ -43,7 +43,7 @@ ol.format.EsriJSON = function(opt_options) {
this.geometryName_ = options.geometryName;
};
goog.inherits(ol.format.EsriJSON, ol.format.JSONFeature);
ol.inherits(ol.format.EsriJSON, ol.format.JSONFeature);
/**

4
src/ol/format/geojsonformat.js
View File

@@ -31,7 +31,7 @@ ol.format.GeoJSON = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this);
ol.format.JSONFeature.call(this);
/**
* @inheritDoc
@@ -49,7 +49,7 @@ ol.format.GeoJSON = function(opt_options) {
this.geometryName_ = options.geometryName;
};
goog.inherits(ol.format.GeoJSON, ol.format.JSONFeature);
ol.inherits(ol.format.GeoJSON, ol.format.JSONFeature);
/**

4
src/ol/format/gml/gml2format.js
View File

@@ -23,7 +23,7 @@ ol.format.GML2 = function(opt_options) {
var options = /** @type {olx.format.GMLOptions} */
(opt_options ? opt_options : {});
goog.base(this, options);
ol.format.GMLBase.call(this, options);
this.FEATURE_COLLECTION_PARSERS[ol.format.GMLBase.GMLNS][
'featureMember'] =
@@ -36,7 +36,7 @@ ol.format.GML2 = function(opt_options) {
options.schemaLocation : ol.format.GML2.schemaLocation_;
};
goog.inherits(ol.format.GML2, ol.format.GMLBase);
ol.inherits(ol.format.GML2, ol.format.GMLBase);
/**

4
src/ol/format/gml/gml3format.js
View File

@@ -39,7 +39,7 @@ ol.format.GML3 = function(opt_options) {
var options = /** @type {olx.format.GMLOptions} */
(opt_options ? opt_options : {});
goog.base(this, options);
ol.format.GMLBase.call(this, options);
/**
* @private
@@ -74,7 +74,7 @@ ol.format.GML3 = function(opt_options) {
options.schemaLocation : ol.format.GML3.schemaLocation_;
};
goog.inherits(ol.format.GML3, ol.format.GMLBase);
ol.inherits(ol.format.GML3, ol.format.GMLBase);
/**

4
src/ol/format/gml/gmlbaseformat.js
View File

@@ -76,9 +76,9 @@ ol.format.GMLBase = function(opt_options) {
ol.format.GMLBase.prototype.readFeaturesInternal)
};
goog.base(this);
ol.format.XMLFeature.call(this);
};
goog.inherits(ol.format.GMLBase, ol.format.XMLFeature);
ol.inherits(ol.format.GMLBase, ol.format.XMLFeature);
/**

4
src/ol/format/gpxformat.js
View File

@@ -28,7 +28,7 @@ ol.format.GPX = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this);
ol.format.XMLFeature.call(this);
/**
* @inheritDoc
@@ -41,7 +41,7 @@ ol.format.GPX = function(opt_options) {
*/
this.readExtensions_ = options.readExtensions;
};
goog.inherits(ol.format.GPX, ol.format.XMLFeature);
ol.inherits(ol.format.GPX, ol.format.XMLFeature);
/**

4
src/ol/format/igcformat.js
View File

@@ -34,7 +34,7 @@ ol.format.IGC = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this);
ol.format.TextFeature.call(this);
/**
* @inheritDoc
@@ -49,7 +49,7 @@ ol.format.IGC = function(opt_options) {
options.altitudeMode : ol.format.IGCZ.NONE;
};
goog.inherits(ol.format.IGC, ol.format.TextFeature);
ol.inherits(ol.format.IGC, ol.format.TextFeature);
/**

4
src/ol/format/jsonfeatureformat.js
View File

@@ -15,9 +15,9 @@ goog.require('ol.format.FormatType');
* @extends {ol.format.Feature}
*/
ol.format.JSONFeature = function() {
goog.base(this);
ol.format.Feature.call(this);
};
goog.inherits(ol.format.JSONFeature, ol.format.Feature);
ol.inherits(ol.format.JSONFeature, ol.format.Feature);
/**

4
src/ol/format/kmlformat.js
View File

@@ -54,7 +54,7 @@ ol.format.KML = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this);
ol.format.XMLFeature.call(this);
/**
* @inheritDoc
@@ -96,7 +96,7 @@ ol.format.KML = function(opt_options) {
options.showPointNames : true;
};
goog.inherits(ol.format.KML, ol.format.XMLFeature);
ol.inherits(ol.format.KML, ol.format.XMLFeature);
/**

4
src/ol/format/mvtformat.js
View File

@@ -33,7 +33,7 @@ goog.require('ol.render.Feature');
*/
ol.format.MVT = function(opt_options) {
goog.base(this);
ol.format.Feature.call(this);
var options = opt_options ? opt_options : {};
@@ -74,7 +74,7 @@ ol.format.MVT = function(opt_options) {
this.layers_ = options.layers ? options.layers : null;
};
goog.inherits(ol.format.MVT, ol.format.Feature);
ol.inherits(ol.format.MVT, ol.format.Feature);
/**

68
src/ol/format/ogc/filter.js
View File

@@ -247,9 +247,9 @@ ol.format.ogc.filter.Filter.prototype.getTagName = function() {
* @extends {ol.format.ogc.filter.Filter}
*/
ol.format.ogc.filter.Logical = function(tagName) {
goog.base(this, tagName);
ol.format.ogc.filter.Filter.call(this, tagName);
};
goog.inherits(ol.format.ogc.filter.Logical, ol.format.ogc.filter.Filter);
ol.inherits(ol.format.ogc.filter.Logical, ol.format.ogc.filter.Filter);
/**
@@ -265,7 +265,7 @@ goog.inherits(ol.format.ogc.filter.Logical, ol.format.ogc.filter.Filter);
*/
ol.format.ogc.filter.LogicalBinary = function(tagName, conditionA, conditionB) {
goog.base(this, tagName);
ol.format.ogc.filter.Logical.call(this, tagName);
/**
* @public
@@ -280,7 +280,7 @@ ol.format.ogc.filter.LogicalBinary = function(tagName, conditionA, conditionB) {
this.conditionB = conditionB;
};
goog.inherits(ol.format.ogc.filter.LogicalBinary, ol.format.ogc.filter.Logical);
ol.inherits(ol.format.ogc.filter.LogicalBinary, ol.format.ogc.filter.Logical);
/**
@@ -294,9 +294,9 @@ goog.inherits(ol.format.ogc.filter.LogicalBinary, ol.format.ogc.filter.Logical);
* @api
*/
ol.format.ogc.filter.And = function(conditionA, conditionB) {
goog.base(this, 'And', conditionA, conditionB);
ol.format.ogc.filter.LogicalBinary.call(this, 'And', conditionA, conditionB);
};
goog.inherits(ol.format.ogc.filter.And, ol.format.ogc.filter.LogicalBinary);
ol.inherits(ol.format.ogc.filter.And, ol.format.ogc.filter.LogicalBinary);
/**
@@ -310,9 +310,9 @@ goog.inherits(ol.format.ogc.filter.And, ol.format.ogc.filter.LogicalBinary);
* @api
*/
ol.format.ogc.filter.Or = function(conditionA, conditionB) {
goog.base(this, 'Or', conditionA, conditionB);
ol.format.ogc.filter.LogicalBinary.call(this, 'Or', conditionA, conditionB);
};
goog.inherits(ol.format.ogc.filter.Or, ol.format.ogc.filter.LogicalBinary);
ol.inherits(ol.format.ogc.filter.Or, ol.format.ogc.filter.LogicalBinary);
/**
@@ -326,7 +326,7 @@ goog.inherits(ol.format.ogc.filter.Or, ol.format.ogc.filter.LogicalBinary);
*/
ol.format.ogc.filter.Not = function(condition) {
goog.base(this, 'Not');
ol.format.ogc.filter.Logical.call(this, 'Not');
/**
* @public
@@ -334,7 +334,7 @@ ol.format.ogc.filter.Not = function(condition) {
*/
this.condition = condition;
};
goog.inherits(ol.format.ogc.filter.Not, ol.format.ogc.filter.Logical);
ol.inherits(ol.format.ogc.filter.Not, ol.format.ogc.filter.Logical);
// Spatial filters
@@ -355,7 +355,7 @@ goog.inherits(ol.format.ogc.filter.Not, ol.format.ogc.filter.Logical);
*/
ol.format.ogc.filter.Bbox = function(geometryName, extent, opt_srsName) {
goog.base(this, 'BBOX');
ol.format.ogc.filter.Filter.call(this, 'BBOX');
/**
* @public
@@ -375,7 +375,7 @@ ol.format.ogc.filter.Bbox = function(geometryName, extent, opt_srsName) {
*/
this.srsName = opt_srsName;
};
goog.inherits(ol.format.ogc.filter.Bbox, ol.format.ogc.filter.Filter);
ol.inherits(ol.format.ogc.filter.Bbox, ol.format.ogc.filter.Filter);
// Property comparison filters
@@ -394,7 +394,7 @@ goog.inherits(ol.format.ogc.filter.Bbox, ol.format.ogc.filter.Filter);
*/
ol.format.ogc.filter.Comparison = function(tagName, propertyName) {
goog.base(this, tagName);
ol.format.ogc.filter.Filter.call(this, tagName);
/**
* @public
@@ -402,7 +402,7 @@ ol.format.ogc.filter.Comparison = function(tagName, propertyName) {
*/
this.propertyName = propertyName;
};
goog.inherits(ol.format.ogc.filter.Comparison, ol.format.ogc.filter.Filter);
ol.inherits(ol.format.ogc.filter.Comparison, ol.format.ogc.filter.Filter);
/**
@@ -421,7 +421,7 @@ goog.inherits(ol.format.ogc.filter.Comparison, ol.format.ogc.filter.Filter);
ol.format.ogc.filter.ComparisonBinary = function(
tagName, propertyName, expression, opt_matchCase) {
goog.base(this, tagName, propertyName);
ol.format.ogc.filter.Comparison.call(this, tagName, propertyName);
/**
* @public
@@ -435,7 +435,7 @@ ol.format.ogc.filter.ComparisonBinary = function(
*/
this.matchCase = opt_matchCase;
};
goog.inherits(ol.format.ogc.filter.ComparisonBinary, ol.format.ogc.filter.Comparison);
ol.inherits(ol.format.ogc.filter.ComparisonBinary, ol.format.ogc.filter.Comparison);
/**
@@ -450,9 +450,9 @@ goog.inherits(ol.format.ogc.filter.ComparisonBinary, ol.format.ogc.filter.Compar
* @api
*/
ol.format.ogc.filter.EqualTo = function(propertyName, expression, opt_matchCase) {
goog.base(this, 'PropertyIsEqualTo', propertyName, expression, opt_matchCase);
ol.format.ogc.filter.ComparisonBinary.call(this, 'PropertyIsEqualTo', propertyName, expression, opt_matchCase);
};
goog.inherits(ol.format.ogc.filter.EqualTo, ol.format.ogc.filter.ComparisonBinary);
ol.inherits(ol.format.ogc.filter.EqualTo, ol.format.ogc.filter.ComparisonBinary);
/**
@@ -467,9 +467,9 @@ goog.inherits(ol.format.ogc.filter.EqualTo, ol.format.ogc.filter.ComparisonBinar
* @api
*/
ol.format.ogc.filter.NotEqualTo = function(propertyName, expression, opt_matchCase) {
goog.base(this, 'PropertyIsNotEqualTo', propertyName, expression, opt_matchCase);
ol.format.ogc.filter.ComparisonBinary.call(this, 'PropertyIsNotEqualTo', propertyName, expression, opt_matchCase);
};
goog.inherits(ol.format.ogc.filter.NotEqualTo, ol.format.ogc.filter.ComparisonBinary);
ol.inherits(ol.format.ogc.filter.NotEqualTo, ol.format.ogc.filter.ComparisonBinary);
/**
@@ -483,9 +483,9 @@ goog.inherits(ol.format.ogc.filter.NotEqualTo, ol.format.ogc.filter.ComparisonBi
* @api
*/
ol.format.ogc.filter.LessThan = function(propertyName, expression) {
goog.base(this, 'PropertyIsLessThan', propertyName, expression);
ol.format.ogc.filter.ComparisonBinary.call(this, 'PropertyIsLessThan', propertyName, expression);
};
goog.inherits(ol.format.ogc.filter.LessThan, ol.format.ogc.filter.ComparisonBinary);
ol.inherits(ol.format.ogc.filter.LessThan, ol.format.ogc.filter.ComparisonBinary);
/**
@@ -499,9 +499,9 @@ goog.inherits(ol.format.ogc.filter.LessThan, ol.format.ogc.filter.ComparisonBina
* @api
*/
ol.format.ogc.filter.LessThanOrEqualTo = function(propertyName, expression) {
goog.base(this, 'PropertyIsLessThanOrEqualTo', propertyName, expression);
ol.format.ogc.filter.ComparisonBinary.call(this, 'PropertyIsLessThanOrEqualTo', propertyName, expression);
};
goog.inherits(ol.format.ogc.filter.LessThanOrEqualTo, ol.format.ogc.filter.ComparisonBinary);
ol.inherits(ol.format.ogc.filter.LessThanOrEqualTo, ol.format.ogc.filter.ComparisonBinary);
/**
@@ -515,9 +515,9 @@ goog.inherits(ol.format.ogc.filter.LessThanOrEqualTo, ol.format.ogc.filter.Compa
* @api
*/
ol.format.ogc.filter.GreaterThan = function(propertyName, expression) {
goog.base(this, 'PropertyIsGreaterThan', propertyName, expression);
ol.format.ogc.filter.ComparisonBinary.call(this, 'PropertyIsGreaterThan', propertyName, expression);
};
goog.inherits(ol.format.ogc.filter.GreaterThan, ol.format.ogc.filter.ComparisonBinary);
ol.inherits(ol.format.ogc.filter.GreaterThan, ol.format.ogc.filter.ComparisonBinary);
/**
@@ -531,9 +531,9 @@ goog.inherits(ol.format.ogc.filter.GreaterThan, ol.format.ogc.filter.ComparisonB
* @api
*/
ol.format.ogc.filter.GreaterThanOrEqualTo = function(propertyName, expression) {
goog.base(this, 'PropertyIsGreaterThanOrEqualTo', propertyName, expression);
ol.format.ogc.filter.ComparisonBinary.call(this, 'PropertyIsGreaterThanOrEqualTo', propertyName, expression);
};
goog.inherits(ol.format.ogc.filter.GreaterThanOrEqualTo, ol.format.ogc.filter.ComparisonBinary);
ol.inherits(ol.format.ogc.filter.GreaterThanOrEqualTo, ol.format.ogc.filter.ComparisonBinary);
/**
@@ -546,9 +546,9 @@ goog.inherits(ol.format.ogc.filter.GreaterThanOrEqualTo, ol.format.ogc.filter.Co
* @api
*/
ol.format.ogc.filter.IsNull = function(propertyName) {
goog.base(this, 'PropertyIsNull', propertyName);
ol.format.ogc.filter.Comparison.call(this, 'PropertyIsNull', propertyName);
};
goog.inherits(ol.format.ogc.filter.IsNull, ol.format.ogc.filter.Comparison);
ol.inherits(ol.format.ogc.filter.IsNull, ol.format.ogc.filter.Comparison);
/**
@@ -563,7 +563,7 @@ goog.inherits(ol.format.ogc.filter.IsNull, ol.format.ogc.filter.Comparison);
* @api
*/
ol.format.ogc.filter.IsBetween = function(propertyName, lowerBoundary, upperBoundary) {
goog.base(this, 'PropertyIsBetween', propertyName);
ol.format.ogc.filter.Comparison.call(this, 'PropertyIsBetween', propertyName);
/**
* @public
@@ -577,7 +577,7 @@ ol.format.ogc.filter.IsBetween = function(propertyName, lowerBoundary, upperBoun
*/
this.upperBoundary = upperBoundary;
};
goog.inherits(ol.format.ogc.filter.IsBetween, ol.format.ogc.filter.Comparison);
ol.inherits(ol.format.ogc.filter.IsBetween, ol.format.ogc.filter.Comparison);
/**
@@ -599,7 +599,7 @@ goog.inherits(ol.format.ogc.filter.IsBetween, ol.format.ogc.filter.Comparison);
*/
ol.format.ogc.filter.IsLike = function(propertyName, pattern,
opt_wildCard, opt_singleChar, opt_escapeChar, opt_matchCase) {
goog.base(this, 'PropertyIsLike', propertyName);
ol.format.ogc.filter.Comparison.call(this, 'PropertyIsLike', propertyName);
/**
* @public
@@ -631,4 +631,4 @@ ol.format.ogc.filter.IsLike = function(propertyName, pattern,
*/
this.matchCase = opt_matchCase;
};
goog.inherits(ol.format.ogc.filter.IsLike, ol.format.ogc.filter.Comparison);
ol.inherits(ol.format.ogc.filter.IsLike, ol.format.ogc.filter.Comparison);

4
src/ol/format/osmxmlformat.js
View File

@@ -26,14 +26,14 @@ goog.require('ol.xml');
* @api stable
*/
ol.format.OSMXML = function() {
goog.base(this);
ol.format.XMLFeature.call(this);
/**
* @inheritDoc
*/
this.defaultDataProjection = ol.proj.get('EPSG:4326');
};
goog.inherits(ol.format.OSMXML, ol.format.XMLFeature);
ol.inherits(ol.format.OSMXML, ol.format.XMLFeature);
/**

4
src/ol/format/owsformat.js
View File

@@ -13,9 +13,9 @@ goog.require('ol.xml');
* @extends {ol.format.XML}
*/
ol.format.OWS = function() {
goog.base(this);
ol.format.XML.call(this);
};
goog.inherits(ol.format.OWS, ol.format.XML);
ol.inherits(ol.format.OWS, ol.format.XML);
/**

4
src/ol/format/polylineformat.js
View File

@@ -27,7 +27,7 @@ ol.format.Polyline = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this);
ol.format.TextFeature.call(this);
/**
* @inheritDoc
@@ -47,7 +47,7 @@ ol.format.Polyline = function(opt_options) {
this.geometryLayout_ = options.geometryLayout ?
options.geometryLayout : ol.geom.GeometryLayout.XY;
};
goog.inherits(ol.format.Polyline, ol.format.TextFeature);
ol.inherits(ol.format.Polyline, ol.format.TextFeature);
/**

4
src/ol/format/textfeatureformat.js
View File

@@ -15,9 +15,9 @@ goog.require('ol.format.FormatType');
* @extends {ol.format.Feature}
*/
ol.format.TextFeature = function() {
goog.base(this);
ol.format.Feature.call(this);
};
goog.inherits(ol.format.TextFeature, ol.format.Feature);
ol.inherits(ol.format.TextFeature, ol.format.Feature);
/**

4
src/ol/format/topojsonformat.js
View File

@@ -27,7 +27,7 @@ ol.format.TopoJSON = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this);
ol.format.JSONFeature.call(this);
/**
* @inheritDoc
@@ -37,7 +37,7 @@ ol.format.TopoJSON = function(opt_options) {
options.defaultDataProjection : 'EPSG:4326');
};
goog.inherits(ol.format.TopoJSON, ol.format.JSONFeature);
ol.inherits(ol.format.TopoJSON, ol.format.JSONFeature);
/**

4
src/ol/format/wfsformat.js
View File

@@ -63,9 +63,9 @@ ol.format.WFS = function(opt_options) {
this.schemaLocation_ = options.schemaLocation ?
options.schemaLocation : ol.format.WFS.SCHEMA_LOCATION;
goog.base(this);
ol.format.XMLFeature.call(this);
};
goog.inherits(ol.format.WFS, ol.format.XMLFeature);
ol.inherits(ol.format.WFS, ol.format.XMLFeature);
/**

4
src/ol/format/wktformat.js
View File

@@ -30,7 +30,7 @@ ol.format.WKT = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this);
ol.format.TextFeature.call(this);
/**
* Split GeometryCollection into multiple features.
@@ -41,7 +41,7 @@ ol.format.WKT = function(opt_options) {
options.splitCollection : false;
};
goog.inherits(ol.format.WKT, ol.format.TextFeature);
ol.inherits(ol.format.WKT, ol.format.TextFeature);
/**

4
src/ol/format/wmscapabilitiesformat.js
View File

@@ -19,14 +19,14 @@ goog.require('ol.xml');
*/
ol.format.WMSCapabilities = function() {
goog.base(this);
ol.format.XML.call(this);
/**
* @type {string|undefined}
*/
this.version = undefined;
};
goog.inherits(ol.format.WMSCapabilities, ol.format.XML);
ol.inherits(ol.format.WMSCapabilities, ol.format.XML);
/**

4
src/ol/format/wmsgetfeatureinfoformat.js
View File

@@ -43,9 +43,9 @@ ol.format.WMSGetFeatureInfo = function(opt_options) {
*/
this.layers_ = options.layers ? options.layers : null;
goog.base(this);
ol.format.XMLFeature.call(this);
};
goog.inherits(ol.format.WMSGetFeatureInfo, ol.format.XMLFeature);
ol.inherits(ol.format.WMSGetFeatureInfo, ol.format.XMLFeature);
/**

4
src/ol/format/wmtscapabilitiesformat.js
View File

@@ -19,7 +19,7 @@ goog.require('ol.xml');
* @api
*/
ol.format.WMTSCapabilities = function() {
goog.base(this);
ol.format.XML.call(this);
/**
* @type {ol.format.OWS}
@@ -27,7 +27,7 @@ ol.format.WMTSCapabilities = function() {
*/
this.owsParser_ = new ol.format.OWS();
};
goog.inherits(ol.format.WMTSCapabilities, ol.format.XML);
ol.inherits(ol.format.WMTSCapabilities, ol.format.XML);
/**

4
src/ol/format/xmlfeatureformat.js
View File

@@ -26,9 +26,9 @@ ol.format.XMLFeature = function() {
*/
this.xmlSerializer_ = new XMLSerializer();
goog.base(this);
ol.format.Feature.call(this);
};
goog.inherits(ol.format.XMLFeature, ol.format.Feature);
ol.inherits(ol.format.XMLFeature, ol.format.Feature);
/**