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

Merge pull request #5194 from fredj/rm_goog.inherits

Browse Source 
Get rid of goog.inherits and goog.base
This commit is contained in:
Frédéric Junod
2016-06-08 09:17:07 +02:00
parent 072728b083 e289bfbb7d
commit 3935b7db24
166 changed files with 448 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/example.json
View File

@@ -31,7 +31,6 @@
"*"
],
"jscomp_off": [
"useOfGoogBase",
"lintChecks",
"analyzerChecks",
"missingProvide",

1
config/examples-all.json
View File

@@ -31,7 +31,6 @@
"*"
],
"jscomp_off": [
"useOfGoogBase",
"lintChecks",
"analyzerChecks"
],

1
config/ol.json
View File

@@ -22,7 +22,6 @@
"*"
],
"jscomp_off": [
"useOfGoogBase",
"lintChecks",
"analyzerChecks"
],

1
doc/tutorials/closure.md
View File

@@ -235,7 +235,6 @@ Here is a version of `config.json` with more compilation checks enabled:
],
"jscomp_off": [
"unknownDefines",
"useOfGoogBase",
"lintChecks",
"analyzerChecks"
],

8
src/ol/collection.js
View File

@@ -44,7 +44,7 @@ ol.CollectionEventType = {
*/
ol.CollectionEvent = function(type, opt_element, opt_target) {
goog.base(this, type, opt_target);
ol.events.Event.call(this, type, opt_target);
/**
* The element that is added to or removed from the collection.
@@ -54,7 +54,7 @@ ol.CollectionEvent = function(type, opt_element, opt_target) {
this.element = opt_element;
};
goog.inherits(ol.CollectionEvent, ol.events.Event);
ol.inherits(ol.CollectionEvent, ol.events.Event);
/**
@@ -82,7 +82,7 @@ ol.CollectionProperty = {
*/
ol.Collection = function(opt_array) {
goog.base(this);
ol.Object.call(this);
/**
* @private
@@ -93,7 +93,7 @@ ol.Collection = function(opt_array) {
this.updateLength_();
};
goog.inherits(ol.Collection, ol.Object);
ol.inherits(ol.Collection, ol.Object);
/**

4
src/ol/control/attributioncontrol.js
View File

@@ -105,7 +105,7 @@ ol.control.Attribution = function(opt_options) {
var render = options.render ? options.render : ol.control.Attribution.render;
goog.base(this, {
ol.control.Control.call(this, {
element: element,
render: render,
target: options.target
@@ -136,7 +136,7 @@ ol.control.Attribution = function(opt_options) {
this.logoElements_ = {};
};
goog.inherits(ol.control.Attribution, ol.control.Control);
ol.inherits(ol.control.Attribution, ol.control.Control);
/**

6
src/ol/control/control.js
View File

@@ -38,7 +38,7 @@ goog.require('ol.Object');
*/
ol.control.Control = function(options) {
goog.base(this);
ol.Object.call(this);
/**
* @protected
@@ -74,7 +74,7 @@ ol.control.Control = function(options) {
}
};
goog.inherits(ol.control.Control, ol.Object);
ol.inherits(ol.control.Control, ol.Object);
/**
@@ -82,7 +82,7 @@ goog.inherits(ol.control.Control, ol.Object);
*/
ol.control.Control.prototype.disposeInternal = function() {
goog.dom.removeNode(this.element);
goog.base(this, 'disposeInternal');
ol.Object.prototype.disposeInternal.call(this);
};

6
src/ol/control/fullscreencontrol.js
View File

@@ -72,7 +72,7 @@ ol.control.FullScreen = function(opt_options) {
(!goog.dom.fullscreen.isSupported() ? ol.css.CLASS_UNSUPPORTED : '');
var element = goog.dom.createDom('DIV', cssClasses, button);
goog.base(this, {
ol.control.Control.call(this, {
element: element,
target: options.target
});
@@ -90,7 +90,7 @@ ol.control.FullScreen = function(opt_options) {
this.source_ = options.source;
};
goog.inherits(ol.control.FullScreen, ol.control.Control);
ol.inherits(ol.control.FullScreen, ol.control.Control);
/**
@@ -153,7 +153,7 @@ ol.control.FullScreen.prototype.handleFullScreenChange_ = function() {
* @api stable
*/
ol.control.FullScreen.prototype.setMap = function(map) {
goog.base(this, 'setMap', map);
ol.control.Control.prototype.setMap.call(this, map);
if (map) {
this.listenerKeys.push(
ol.events.listen(ol.global.document, goog.dom.fullscreen.EventType.CHANGE,

6
src/ol/control/mousepositioncontrol.js
View File

@@ -42,7 +42,7 @@ ol.control.MousePosition = function(opt_options) {
var render = options.render ?
options.render : ol.control.MousePosition.render;
goog.base(this, {
ol.control.Control.call(this, {
element: element,
render: render,
target: options.target
@@ -90,7 +90,7 @@ ol.control.MousePosition = function(opt_options) {
this.lastMouseMovePixel_ = null;
};
goog.inherits(ol.control.MousePosition, ol.control.Control);
ol.inherits(ol.control.MousePosition, ol.control.Control);
/**
@@ -174,7 +174,7 @@ ol.control.MousePosition.prototype.handleMouseOut = function(event) {
* @api stable
*/
ol.control.MousePosition.prototype.setMap = function(map) {
goog.base(this, 'setMap', map);
ol.control.Control.prototype.setMap.call(this, map);
if (map) {
var viewport = map.getViewport();
this.listenerKeys.push(

6
src/ol/control/overviewmapcontrol.js
View File

@@ -132,13 +132,13 @@ ol.control.OverviewMap = function(opt_options) {
var render = options.render ? options.render : ol.control.OverviewMap.render;
goog.base(this, {
ol.control.Control.call(this, {
element: element,
render: render,
target: options.target
});
};
goog.inherits(ol.control.OverviewMap, ol.control.Control);
ol.inherits(ol.control.OverviewMap, ol.control.Control);
/**
@@ -156,7 +156,7 @@ ol.control.OverviewMap.prototype.setMap = function(map) {
this.unbindView_(oldView);
}
}
goog.base(this, 'setMap', map);
ol.control.Control.prototype.setMap.call(this, map);
if (map) {
this.listenerKeys.push(ol.events.listen(

4
src/ol/control/rotatecontrol.js
View File

@@ -62,7 +62,7 @@ ol.control.Rotate = function(opt_options) {
this.callResetNorth_ = options.resetNorth ? options.resetNorth : undefined;
goog.base(this, {
ol.control.Control.call(this, {
element: element,
render: render,
target: options.target
@@ -91,7 +91,7 @@ ol.control.Rotate = function(opt_options) {
}
};
goog.inherits(ol.control.Rotate, ol.control.Control);
ol.inherits(ol.control.Rotate, ol.control.Control);
/**

4
src/ol/control/scalelinecontrol.js
View File

@@ -102,7 +102,7 @@ ol.control.ScaleLine = function(opt_options) {
var render = options.render ? options.render : ol.control.ScaleLine.render;
goog.base(this, {
ol.control.Control.call(this, {
element: this.element_,
render: render,
target: options.target
@@ -116,7 +116,7 @@ ol.control.ScaleLine = function(opt_options) {
ol.control.ScaleLineUnits.METRIC);
};
goog.inherits(ol.control.ScaleLine, ol.control.Control);
ol.inherits(ol.control.ScaleLine, ol.control.Control);
/**

4
src/ol/control/zoomcontrol.js
View File

@@ -58,7 +58,7 @@ ol.control.Zoom = function(opt_options) {
ol.css.CLASS_CONTROL;
var element = goog.dom.createDom('DIV', cssClasses, inElement, outElement);
goog.base(this, {
ol.control.Control.call(this, {
element: element,
target: options.target
});
@@ -70,7 +70,7 @@ ol.control.Zoom = function(opt_options) {
this.duration_ = options.duration !== undefined ? options.duration : 250;
};
goog.inherits(ol.control.Zoom, ol.control.Control);
ol.inherits(ol.control.Zoom, ol.control.Control);
/**

8
src/ol/control/zoomslidercontrol.js
View File

@@ -137,12 +137,12 @@ ol.control.ZoomSlider = function(opt_options) {
var render = options.render ? options.render : ol.control.ZoomSlider.render;
goog.base(this, {
ol.control.Control.call(this, {
element: containerElement,
render: render
});
};
goog.inherits(ol.control.ZoomSlider, ol.control.Control);
ol.inherits(ol.control.ZoomSlider, ol.control.Control);
/**
@@ -150,7 +150,7 @@ goog.inherits(ol.control.ZoomSlider, ol.control.Control);
*/
ol.control.ZoomSlider.prototype.disposeInternal = function() {
this.dragger_.dispose();
goog.base(this, 'disposeInternal');
ol.control.Control.prototype.disposeInternal.call(this);
};
@@ -169,7 +169,7 @@ ol.control.ZoomSlider.direction = {
* @inheritDoc
*/
ol.control.ZoomSlider.prototype.setMap = function(map) {
goog.base(this, 'setMap', map);
ol.control.Control.prototype.setMap.call(this, map);
if (map) {
map.render();
}

4
src/ol/control/zoomtoextentcontrol.js
View File

@@ -45,12 +45,12 @@ ol.control.ZoomToExtent = function(opt_options) {
ol.css.CLASS_CONTROL;
var element = goog.dom.createDom('DIV', cssClasses, button);
goog.base(this, {
ol.control.Control.call(this, {
element: element,
target: options.target
});
};
goog.inherits(ol.control.ZoomToExtent, ol.control.Control);
ol.inherits(ol.control.ZoomToExtent, ol.control.Control);
/**

4
src/ol/deviceorientation.js
View File

@@ -77,7 +77,7 @@ ol.DeviceOrientationProperty = {
*/
ol.DeviceOrientation = function(opt_options) {
goog.base(this);
ol.Object.call(this);
var options = opt_options ? opt_options : {};
@@ -102,7 +102,7 @@ goog.inherits(ol.DeviceOrientation, ol.Object);
*/
ol.DeviceOrientation.prototype.disposeInternal = function() {
this.setTracking(false);
goog.base(this, 'disposeInternal');
ol.Object.prototype.disposeInternal.call(this);
};

4
src/ol/events/eventtarget.js
View File

@@ -25,7 +25,7 @@ goog.require('ol.events.Event');
*/
ol.events.EventTarget = function() {
goog.base(this);
ol.Disposable.call(this);
/**
* @private
@@ -46,7 +46,7 @@ ol.events.EventTarget = function() {
this.listeners_ = {};
};
goog.inherits(ol.events.EventTarget, ol.Disposable);
ol.inherits(ol.events.EventTarget, ol.Disposable);
/**

4
src/ol/feature.js
View File

@@ -56,7 +56,7 @@ goog.require('ol.style.Style');
*/
ol.Feature = function(opt_geometryOrProperties) {
goog.base(this);
ol.Object.call(this);
/**
* @private
@@ -108,7 +108,7 @@ ol.Feature = function(opt_geometryOrProperties) {
}
}
};
goog.inherits(ol.Feature, ol.Object);
ol.inherits(ol.Feature, ol.Object);
/**

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);
/**

6
src/ol/geolocation.js
View File

@@ -59,7 +59,7 @@ ol.GeolocationProperty = {
*/
ol.Geolocation = function(opt_options) {
goog.base(this);
ol.Object.call(this);
var options = opt_options || {};
@@ -99,7 +99,7 @@ ol.Geolocation = function(opt_options) {
this.setTracking(options.tracking !== undefined ? options.tracking : false);
};
goog.inherits(ol.Geolocation, ol.Object);
ol.inherits(ol.Geolocation, ol.Object);
/**
@@ -107,7 +107,7 @@ goog.inherits(ol.Geolocation, ol.Object);
*/
ol.Geolocation.prototype.disposeInternal = function() {
this.setTracking(false);
goog.base(this, 'disposeInternal');
ol.Object.prototype.disposeInternal.call(this);
};

4
src/ol/geom/circle.js
View File

@@ -21,11 +21,11 @@ goog.require('ol.proj');
* @api
*/
ol.geom.Circle = function(center, opt_radius, opt_layout) {
goog.base(this);
ol.geom.SimpleGeometry.call(this);
var radius = opt_radius ? opt_radius : 0;
this.setCenterAndRadius(center, radius, opt_layout);
};
goog.inherits(ol.geom.Circle, ol.geom.SimpleGeometry);
ol.inherits(ol.geom.Circle, ol.geom.SimpleGeometry);
/**

4
src/ol/geom/geometry.js
View File

@@ -58,7 +58,7 @@ ol.geom.GeometryLayout = {
*/
ol.geom.Geometry = function() {
goog.base(this);
ol.Object.call(this);
/**
* @private
@@ -91,7 +91,7 @@ ol.geom.Geometry = function() {
this.simplifiedGeometryRevision = 0;
};
goog.inherits(ol.geom.Geometry, ol.Object);
ol.inherits(ol.geom.Geometry, ol.Object);
/**

6
src/ol/geom/geometrycollection.js
View File

@@ -19,7 +19,7 @@ goog.require('ol.object');
*/
ol.geom.GeometryCollection = function(opt_geometries) {
goog.base(this);
ol.geom.Geometry.call(this);
/**
* @private
@@ -29,7 +29,7 @@ ol.geom.GeometryCollection = function(opt_geometries) {
this.listenGeometriesChange_();
};
goog.inherits(ol.geom.GeometryCollection, ol.geom.Geometry);
ol.inherits(ol.geom.GeometryCollection, ol.geom.Geometry);
/**
@@ -301,5 +301,5 @@ ol.geom.GeometryCollection.prototype.translate = function(deltaX, deltaY) {
*/
ol.geom.GeometryCollection.prototype.disposeInternal = function() {
this.unlistenGeometriesChange_();
goog.base(this, 'disposeInternal');
ol.geom.Geometry.prototype.disposeInternal.call(this);
};

4
src/ol/geom/linearring.js
View File

@@ -24,7 +24,7 @@ goog.require('ol.geom.flat.simplify');
*/
ol.geom.LinearRing = function(coordinates, opt_layout) {
goog.base(this);
ol.geom.SimpleGeometry.call(this);
/**
* @private
@@ -41,7 +41,7 @@ ol.geom.LinearRing = function(coordinates, opt_layout) {
this.setCoordinates(coordinates, opt_layout);
};
goog.inherits(ol.geom.LinearRing, ol.geom.SimpleGeometry);
ol.inherits(ol.geom.LinearRing, ol.geom.SimpleGeometry);
/**

4
src/ol/geom/linestring.js
View File

@@ -29,7 +29,7 @@ goog.require('ol.geom.flat.simplify');
*/
ol.geom.LineString = function(coordinates, opt_layout) {
goog.base(this);
ol.geom.SimpleGeometry.call(this);
/**
* @private
@@ -58,7 +58,7 @@ ol.geom.LineString = function(coordinates, opt_layout) {
this.setCoordinates(coordinates, opt_layout);
};
goog.inherits(ol.geom.LineString, ol.geom.SimpleGeometry);
ol.inherits(ol.geom.LineString, ol.geom.SimpleGeometry);
/**

4
src/ol/geom/multilinestring.js
View File

@@ -28,7 +28,7 @@ goog.require('ol.geom.flat.simplify');
*/
ol.geom.MultiLineString = function(coordinates, opt_layout) {
goog.base(this);
ol.geom.SimpleGeometry.call(this);
/**
* @type {Array.<number>}
@@ -51,7 +51,7 @@ ol.geom.MultiLineString = function(coordinates, opt_layout) {
this.setCoordinates(coordinates, opt_layout);
};
goog.inherits(ol.geom.MultiLineString, ol.geom.SimpleGeometry);
ol.inherits(ol.geom.MultiLineString, ol.geom.SimpleGeometry);
/**

4
src/ol/geom/multipoint.js
View File

@@ -23,10 +23,10 @@ goog.require('ol.math');
* @api stable
*/
ol.geom.MultiPoint = function(coordinates, opt_layout) {
goog.base(this);
ol.geom.SimpleGeometry.call(this);
this.setCoordinates(coordinates, opt_layout);
};
goog.inherits(ol.geom.MultiPoint, ol.geom.SimpleGeometry);
ol.inherits(ol.geom.MultiPoint, ol.geom.SimpleGeometry);
/**

4
src/ol/geom/multipolygon.js
View File

@@ -33,7 +33,7 @@ goog.require('ol.geom.flat.simplify');
*/
ol.geom.MultiPolygon = function(coordinates, opt_layout) {
goog.base(this);
ol.geom.SimpleGeometry.call(this);
/**
* @type {Array.<Array.<number>>}
@@ -80,7 +80,7 @@ ol.geom.MultiPolygon = function(coordinates, opt_layout) {
this.setCoordinates(coordinates, opt_layout);
};
goog.inherits(ol.geom.MultiPolygon, ol.geom.SimpleGeometry);
ol.inherits(ol.geom.MultiPolygon, ol.geom.SimpleGeometry);
/**

4
src/ol/geom/point.js
View File

@@ -19,10 +19,10 @@ goog.require('ol.math');
* @api stable
*/
ol.geom.Point = function(coordinates, opt_layout) {
goog.base(this);
ol.geom.SimpleGeometry.call(this);
this.setCoordinates(coordinates, opt_layout);
};
goog.inherits(ol.geom.Point, ol.geom.SimpleGeometry);
ol.inherits(ol.geom.Point, ol.geom.SimpleGeometry);
/**

4
src/ol/geom/polygon.js
View File

@@ -33,7 +33,7 @@ goog.require('ol.math');
*/
ol.geom.Polygon = function(coordinates, opt_layout) {
goog.base(this);
ol.geom.SimpleGeometry.call(this);
/**
* @type {Array.<number>}
@@ -80,7 +80,7 @@ ol.geom.Polygon = function(coordinates, opt_layout) {
this.setCoordinates(coordinates, opt_layout);
};
goog.inherits(ol.geom.Polygon, ol.geom.SimpleGeometry);
ol.inherits(ol.geom.Polygon, ol.geom.SimpleGeometry);
/**

4
src/ol/geom/simplegeometry.js
View File

@@ -20,7 +20,7 @@ goog.require('ol.object');
*/
ol.geom.SimpleGeometry = function() {
goog.base(this);
ol.geom.Geometry.call(this);
/**
* @protected
@@ -41,7 +41,7 @@ ol.geom.SimpleGeometry = function() {
this.flatCoordinates = null;
};
goog.inherits(ol.geom.SimpleGeometry, ol.geom.Geometry);
ol.inherits(ol.geom.SimpleGeometry, ol.geom.Geometry);
/**

4
src/ol/image.js
View File

@@ -23,7 +23,7 @@ goog.require('ol.object');
ol.Image = function(extent, resolution, pixelRatio, attributions, src,
crossOrigin, imageLoadFunction) {
goog.base(this, extent, resolution, pixelRatio, ol.ImageState.IDLE,
ol.ImageBase.call(this, extent, resolution, pixelRatio, ol.ImageState.IDLE,
attributions);
/**
@@ -66,7 +66,7 @@ ol.Image = function(extent, resolution, pixelRatio, attributions, src,
this.imageLoadFunction_ = imageLoadFunction;
};
goog.inherits(ol.Image, ol.ImageBase);
ol.inherits(ol.Image, ol.ImageBase);
/**

4
src/ol/imagebase.js
View File

@@ -29,7 +29,7 @@ ol.ImageState = {
*/
ol.ImageBase = function(extent, resolution, pixelRatio, state, attributions) {
goog.base(this);
ol.events.EventTarget.call(this);
/**
* @private
@@ -62,7 +62,7 @@ ol.ImageBase = function(extent, resolution, pixelRatio, state, attributions) {
this.state = state;
};
goog.inherits(ol.ImageBase, ol.events.EventTarget);
ol.inherits(ol.ImageBase, ol.events.EventTarget);
/**

4
src/ol/imagecanvas.js
View File

@@ -29,7 +29,7 @@ ol.ImageCanvas = function(extent, resolution, pixelRatio, attributions,
var state = opt_loader !== undefined ?
ol.ImageState.IDLE : ol.ImageState.LOADED;
goog.base(this, extent, resolution, pixelRatio, state, attributions);
ol.ImageBase.call(this, extent, resolution, pixelRatio, state, attributions);
/**
* @private
@@ -44,7 +44,7 @@ ol.ImageCanvas = function(extent, resolution, pixelRatio, attributions,
this.error_ = null;
};
goog.inherits(ol.ImageCanvas, ol.ImageBase);
ol.inherits(ol.ImageCanvas, ol.ImageBase);
/**

6
src/ol/imagetile.js
View File

@@ -19,7 +19,7 @@ goog.require('ol.object');
*/
ol.ImageTile = function(tileCoord, state, src, crossOrigin, tileLoadFunction) {
goog.base(this, tileCoord, state);
ol.Tile.call(this, tileCoord, state);
/**
* Image URI
@@ -57,7 +57,7 @@ ol.ImageTile = function(tileCoord, state, src, crossOrigin, tileLoadFunction) {
this.tileLoadFunction_ = tileLoadFunction;
};
goog.inherits(ol.ImageTile, ol.Tile);
ol.inherits(ol.ImageTile, ol.Tile);
/**
@@ -72,7 +72,7 @@ ol.ImageTile.prototype.disposeInternal = function() {
}
this.state = ol.TileState.ABORT;
this.changed();
goog.base(this, 'disposeInternal');
ol.Tile.prototype.disposeInternal.call(this);
};

4
src/ol/interaction/doubleclickzoominteraction.js
View File

@@ -25,7 +25,7 @@ ol.interaction.DoubleClickZoom = function(opt_options) {
*/
this.delta_ = options.delta ? options.delta : 1;
goog.base(this, {
ol.interaction.Interaction.call(this, {
handleEvent: ol.interaction.DoubleClickZoom.handleEvent
});
@@ -36,7 +36,7 @@ ol.interaction.DoubleClickZoom = function(opt_options) {
this.duration_ = options.duration !== undefined ? options.duration : 250;
};
goog.inherits(ol.interaction.DoubleClickZoom, ol.interaction.Interaction);
ol.inherits(ol.interaction.DoubleClickZoom, ol.interaction.Interaction);
/**

10
src/ol/interaction/draganddropinteraction.js
View File

@@ -26,7 +26,7 @@ ol.interaction.DragAndDrop = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this, {
ol.interaction.Interaction.call(this, {
handleEvent: ol.interaction.DragAndDrop.handleEvent
});
@@ -57,7 +57,7 @@ ol.interaction.DragAndDrop = function(opt_options) {
this.target = options.target ? options.target : null;
};
goog.inherits(ol.interaction.DragAndDrop, ol.interaction.Interaction);
ol.inherits(ol.interaction.DragAndDrop, ol.interaction.Interaction);
/**
@@ -145,7 +145,7 @@ ol.interaction.DragAndDrop.prototype.setMap = function(map) {
this.dropListenKeys_.forEach(ol.events.unlistenByKey);
this.dropListenKeys_ = null;
}
goog.base(this, 'setMap', map);
ol.interaction.Interaction.prototype.setMap.call(this, map);
if (map) {
var dropArea = this.target ? this.target : map.getViewport();
this.dropListenKeys_ = [
@@ -207,7 +207,7 @@ ol.interaction.DragAndDropEventType = {
*/
ol.interaction.DragAndDropEvent = function(type, target, file, opt_features, opt_projection) {
goog.base(this, type, target);
ol.events.Event.call(this, type, target);
/**
* The features parsed from dropped data.
@@ -231,4 +231,4 @@ ol.interaction.DragAndDropEvent = function(type, target, file, opt_features, opt
this.projection = opt_projection;
};
goog.inherits(ol.interaction.DragAndDropEvent, ol.events.Event);
ol.inherits(ol.interaction.DragAndDropEvent, ol.events.Event);

8
src/ol/interaction/dragboxinteraction.js
View File

@@ -58,7 +58,7 @@ ol.DragBoxEventType = {
* @implements {oli.DragBoxEvent}
*/
ol.DragBoxEvent = function(type, coordinate, mapBrowserEvent) {
goog.base(this, type);
ol.events.Event.call(this, type);
/**
* The coordinate of the drag event.
@@ -76,7 +76,7 @@ ol.DragBoxEvent = function(type, coordinate, mapBrowserEvent) {
this.mapBrowserEvent = mapBrowserEvent;
};
goog.inherits(ol.DragBoxEvent, ol.events.Event);
ol.inherits(ol.DragBoxEvent, ol.events.Event);
/**
@@ -98,7 +98,7 @@ goog.inherits(ol.DragBoxEvent, ol.events.Event);
*/
ol.interaction.DragBox = function(opt_options) {
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleDownEvent: ol.interaction.DragBox.handleDownEvent_,
handleDragEvent: ol.interaction.DragBox.handleDragEvent_,
handleUpEvent: ol.interaction.DragBox.handleUpEvent_
@@ -132,7 +132,7 @@ ol.interaction.DragBox = function(opt_options) {
this.boxEndCondition_ = options.boxEndCondition ?
options.boxEndCondition : ol.interaction.DragBox.defaultBoxEndCondition;
};
goog.inherits(ol.interaction.DragBox, ol.interaction.Pointer);
ol.inherits(ol.interaction.DragBox, ol.interaction.Pointer);
/**

4
src/ol/interaction/dragpaninteraction.js
View File

@@ -21,7 +21,7 @@ goog.require('ol.interaction.Pointer');
*/
ol.interaction.DragPan = function(opt_options) {
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleDownEvent: ol.interaction.DragPan.handleDownEvent_,
handleDragEvent: ol.interaction.DragPan.handleDragEvent_,
handleUpEvent: ol.interaction.DragPan.handleUpEvent_
@@ -60,7 +60,7 @@ ol.interaction.DragPan = function(opt_options) {
this.noKinetic_ = false;
};
goog.inherits(ol.interaction.DragPan, ol.interaction.Pointer);
ol.inherits(ol.interaction.DragPan, ol.interaction.Pointer);
/**

4
src/ol/interaction/dragrotateandzoominteraction.js
View File

@@ -26,7 +26,7 @@ ol.interaction.DragRotateAndZoom = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleDownEvent: ol.interaction.DragRotateAndZoom.handleDownEvent_,
handleDragEvent: ol.interaction.DragRotateAndZoom.handleDragEvent_,
handleUpEvent: ol.interaction.DragRotateAndZoom.handleUpEvent_
@@ -64,7 +64,7 @@ ol.interaction.DragRotateAndZoom = function(opt_options) {
this.duration_ = options.duration !== undefined ? options.duration : 400;
};
goog.inherits(ol.interaction.DragRotateAndZoom, ol.interaction.Pointer);
ol.inherits(ol.interaction.DragRotateAndZoom, ol.interaction.Pointer);
/**

4
src/ol/interaction/dragrotateinteraction.js
View File

@@ -25,7 +25,7 @@ ol.interaction.DragRotate = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleDownEvent: ol.interaction.DragRotate.handleDownEvent_,
handleDragEvent: ol.interaction.DragRotate.handleDragEvent_,
handleUpEvent: ol.interaction.DragRotate.handleUpEvent_
@@ -50,7 +50,7 @@ ol.interaction.DragRotate = function(opt_options) {
*/
this.duration_ = options.duration !== undefined ? options.duration : 250;
};
goog.inherits(ol.interaction.DragRotate, ol.interaction.Pointer);
ol.inherits(ol.interaction.DragRotate, ol.interaction.Pointer);
/**

4
src/ol/interaction/dragzoominteraction.js
View File

@@ -40,13 +40,13 @@ ol.interaction.DragZoom = function(opt_options) {
*/
this.out_ = options.out !== undefined ? options.out : false;
goog.base(this, {
ol.interaction.DragBox.call(this, {
condition: condition,
className: options.className || 'ol-dragzoom'
});
};
goog.inherits(ol.interaction.DragZoom, ol.interaction.DragBox);
ol.inherits(ol.interaction.DragZoom, ol.interaction.DragBox);
/**

10
src/ol/interaction/drawinteraction.js
View File

@@ -61,7 +61,7 @@ ol.interaction.DrawEventType = {
*/
ol.interaction.DrawEvent = function(type, feature) {
goog.base(this, type);
ol.events.Event.call(this, type);
/**
* The feature being drawn.
@@ -71,7 +71,7 @@ ol.interaction.DrawEvent = function(type, feature) {
this.feature = feature;
};
goog.inherits(ol.interaction.DrawEvent, ol.events.Event);
ol.inherits(ol.interaction.DrawEvent, ol.events.Event);
/**
@@ -86,7 +86,7 @@ goog.inherits(ol.interaction.DrawEvent, ol.events.Event);
*/
ol.interaction.Draw = function(options) {
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleDownEvent: ol.interaction.Draw.handleDownEvent_,
handleEvent: ol.interaction.Draw.handleEvent,
handleUpEvent: ol.interaction.Draw.handleUpEvent_
@@ -311,7 +311,7 @@ ol.interaction.Draw = function(options) {
this.updateState_, this);
};
goog.inherits(ol.interaction.Draw, ol.interaction.Pointer);
ol.inherits(ol.interaction.Draw, ol.interaction.Pointer);
/**
@@ -329,7 +329,7 @@ ol.interaction.Draw.getDefaultStyleFunction = function() {
* @inheritDoc
*/
ol.interaction.Draw.prototype.setMap = function(map) {
goog.base(this, 'setMap', map);
ol.interaction.Pointer.prototype.setMap.call(this, map);
this.updateState_();
};

4
src/ol/interaction/interaction.js
View File

@@ -37,7 +37,7 @@ ol.interaction.InteractionProperty = {
*/
ol.interaction.Interaction = function(options) {
goog.base(this);
ol.Object.call(this);
/**
* @private
@@ -53,7 +53,7 @@ ol.interaction.Interaction = function(options) {
this.handleEvent = options.handleEvent;
};
goog.inherits(ol.interaction.Interaction, ol.Object);
ol.inherits(ol.interaction.Interaction, ol.Object);
/**

4
src/ol/interaction/keyboardpaninteraction.js
View File

@@ -28,7 +28,7 @@ goog.require('ol.interaction.Interaction');
*/
ol.interaction.KeyboardPan = function(opt_options) {
goog.base(this, {
ol.interaction.Interaction.call(this, {
handleEvent: ol.interaction.KeyboardPan.handleEvent
});
@@ -65,7 +65,7 @@ ol.interaction.KeyboardPan = function(opt_options) {
options.pixelDelta : 128;
};
goog.inherits(ol.interaction.KeyboardPan, ol.interaction.Interaction);
ol.inherits(ol.interaction.KeyboardPan, ol.interaction.Interaction);
/**
* Handles the {@link ol.MapBrowserEvent map browser event} if it was a

4
src/ol/interaction/keyboardzoominteraction.js
View File

@@ -25,7 +25,7 @@ goog.require('ol.interaction.Interaction');
*/
ol.interaction.KeyboardZoom = function(opt_options) {
goog.base(this, {
ol.interaction.Interaction.call(this, {
handleEvent: ol.interaction.KeyboardZoom.handleEvent
});
@@ -51,7 +51,7 @@ ol.interaction.KeyboardZoom = function(opt_options) {
this.duration_ = options.duration !== undefined ? options.duration : 100;
};
goog.inherits(ol.interaction.KeyboardZoom, ol.interaction.Interaction);
ol.inherits(ol.interaction.KeyboardZoom, ol.interaction.Interaction);
/**

10
src/ol/interaction/modifyinteraction.js
View File

@@ -63,7 +63,7 @@ ol.ModifyEventType = {
*/
ol.interaction.ModifyEvent = function(type, features, mapBrowserPointerEvent) {
goog.base(this, type);
ol.events.Event.call(this, type);
/**
* The features being modified.
@@ -79,7 +79,7 @@ ol.interaction.ModifyEvent = function(type, features, mapBrowserPointerEvent) {
*/
this.mapBrowserPointerEvent = mapBrowserPointerEvent;
};
goog.inherits(ol.interaction.ModifyEvent, ol.events.Event);
ol.inherits(ol.interaction.ModifyEvent, ol.events.Event);
/**
@@ -94,7 +94,7 @@ goog.inherits(ol.interaction.ModifyEvent, ol.events.Event);
*/
ol.interaction.Modify = function(options) {
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleDownEvent: ol.interaction.Modify.handleDownEvent_,
handleDragEvent: ol.interaction.Modify.handleDragEvent_,
handleEvent: ol.interaction.Modify.handleEvent,
@@ -245,7 +245,7 @@ ol.interaction.Modify = function(options) {
this.lastPointerEvent_ = null;
};
goog.inherits(ol.interaction.Modify, ol.interaction.Pointer);
ol.inherits(ol.interaction.Modify, ol.interaction.Pointer);
/**
@@ -323,7 +323,7 @@ ol.interaction.Modify.prototype.removeFeatureSegmentData_ = function(feature) {
*/
ol.interaction.Modify.prototype.setMap = function(map) {
this.overlay_.setMap(map);
goog.base(this, 'setMap', map);
ol.interaction.Pointer.prototype.setMap.call(this, map);
};

4
src/ol/interaction/mousewheelzoominteraction.js
View File

@@ -18,7 +18,7 @@ goog.require('ol.math');
*/
ol.interaction.MouseWheelZoom = function(opt_options) {
goog.base(this, {
ol.interaction.Interaction.call(this, {
handleEvent: ol.interaction.MouseWheelZoom.handleEvent
});
@@ -61,7 +61,7 @@ ol.interaction.MouseWheelZoom = function(opt_options) {
this.timeoutId_ = undefined;
};
goog.inherits(ol.interaction.MouseWheelZoom, ol.interaction.Interaction);
ol.inherits(ol.interaction.MouseWheelZoom, ol.interaction.Interaction);
/**

4
src/ol/interaction/pinchrotateinteraction.js
View File

@@ -20,7 +20,7 @@ goog.require('ol.interaction.Pointer');
*/
ol.interaction.PinchRotate = function(opt_options) {
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleDownEvent: ol.interaction.PinchRotate.handleDownEvent_,
handleDragEvent: ol.interaction.PinchRotate.handleDragEvent_,
handleUpEvent: ol.interaction.PinchRotate.handleUpEvent_
@@ -65,7 +65,7 @@ ol.interaction.PinchRotate = function(opt_options) {
this.duration_ = options.duration !== undefined ? options.duration : 250;
};
goog.inherits(ol.interaction.PinchRotate, ol.interaction.Pointer);
ol.inherits(ol.interaction.PinchRotate, ol.interaction.Pointer);
/**

4
src/ol/interaction/pinchzoominteraction.js
View File

@@ -20,7 +20,7 @@ goog.require('ol.interaction.Pointer');
*/
ol.interaction.PinchZoom = function(opt_options) {
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleDownEvent: ol.interaction.PinchZoom.handleDownEvent_,
handleDragEvent: ol.interaction.PinchZoom.handleDragEvent_,
handleUpEvent: ol.interaction.PinchZoom.handleUpEvent_
@@ -53,7 +53,7 @@ ol.interaction.PinchZoom = function(opt_options) {
this.lastScaleDelta_ = 1;
};
goog.inherits(ol.interaction.PinchZoom, ol.interaction.Pointer);
ol.inherits(ol.interaction.PinchZoom, ol.interaction.Pointer);
/**

4
src/ol/interaction/pointerinteraction.js
View File

@@ -29,7 +29,7 @@ ol.interaction.Pointer = function(opt_options) {
var handleEvent = options.handleEvent ?
options.handleEvent : ol.interaction.Pointer.handleEvent;
goog.base(this, {
ol.interaction.Interaction.call(this, {
handleEvent: handleEvent
});
@@ -80,7 +80,7 @@ ol.interaction.Pointer = function(opt_options) {
this.targetPointers = [];
};
goog.inherits(ol.interaction.Pointer, ol.interaction.Interaction);
ol.inherits(ol.interaction.Pointer, ol.interaction.Interaction);
/**

10
src/ol/interaction/selectinteraction.js
View File

@@ -45,7 +45,7 @@ ol.interaction.SelectEventType = {
* @constructor
*/
ol.interaction.SelectEvent = function(type, selected, deselected, mapBrowserEvent) {
goog.base(this, type);
ol.events.Event.call(this, type);
/**
* Selected features array.
@@ -68,7 +68,7 @@ ol.interaction.SelectEvent = function(type, selected, deselected, mapBrowserEven
*/
this.mapBrowserEvent = mapBrowserEvent;
};
goog.inherits(ol.interaction.SelectEvent, ol.events.Event);
ol.inherits(ol.interaction.SelectEvent, ol.events.Event);
/**
@@ -91,7 +91,7 @@ goog.inherits(ol.interaction.SelectEvent, ol.events.Event);
*/
ol.interaction.Select = function(opt_options) {
goog.base(this, {
ol.interaction.Interaction.call(this, {
handleEvent: ol.interaction.Select.handleEvent
});
@@ -202,7 +202,7 @@ ol.interaction.Select = function(opt_options) {
this.removeFeature_, this);
};
goog.inherits(ol.interaction.Select, ol.interaction.Interaction);
ol.inherits(ol.interaction.Select, ol.interaction.Interaction);
/**
@@ -346,7 +346,7 @@ ol.interaction.Select.prototype.setMap = function(map) {
if (currentMap) {
selectedFeatures.forEach(currentMap.unskipFeature, currentMap);
}
goog.base(this, 'setMap', map);
ol.interaction.Interaction.prototype.setMap.call(this, map);
this.featureOverlay_.setMap(map);
if (map) {
selectedFeatures.forEach(map.skipFeature, map);

7
src/ol/interaction/snapinteraction.js
View File

@@ -47,7 +47,7 @@ goog.require('ol.structs.RBush');
*/
ol.interaction.Snap = function(opt_options) {
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleEvent: ol.interaction.Snap.handleEvent_,
handleDownEvent: ol.functions.TRUE,
handleUpEvent: ol.interaction.Snap.handleUpEvent_
@@ -159,7 +159,7 @@ ol.interaction.Snap = function(opt_options) {
'GeometryCollection': this.writeGeometryCollectionGeometry_
};
};
goog.inherits(ol.interaction.Snap, ol.interaction.Pointer);
ol.inherits(ol.interaction.Snap, ol.interaction.Pointer);
/**
@@ -344,8 +344,7 @@ ol.interaction.Snap.prototype.setMap = function(map) {
keys.length = 0;
features.forEach(this.forEachFeatureRemove_, this);
}
goog.base(this, 'setMap', map);
ol.interaction.Pointer.prototype.setMap.call(this, map);
if (map) {
if (this.features_) {

8
src/ol/interaction/translateinteraction.js
View File

@@ -47,7 +47,7 @@ ol.interaction.TranslateEventType = {
*/
ol.interaction.TranslateEvent = function(type, features, coordinate) {
goog.base(this, type);
ol.events.Event.call(this, type);
/**
* The features being translated.
@@ -64,7 +64,7 @@ ol.interaction.TranslateEvent = function(type, features, coordinate) {
*/
this.coordinate = coordinate;
};
goog.inherits(ol.interaction.TranslateEvent, ol.events.Event);
ol.inherits(ol.interaction.TranslateEvent, ol.events.Event);
/**
@@ -78,7 +78,7 @@ goog.inherits(ol.interaction.TranslateEvent, ol.events.Event);
* @api
*/
ol.interaction.Translate = function(options) {
goog.base(this, {
ol.interaction.Pointer.call(this, {
handleDownEvent: ol.interaction.Translate.handleDownEvent_,
handleDragEvent: ol.interaction.Translate.handleDragEvent_,
handleMoveEvent: ol.interaction.Translate.handleMoveEvent_,
@@ -144,7 +144,7 @@ ol.interaction.Translate = function(options) {
*/
this.lastFeature_ = null;
};
goog.inherits(ol.interaction.Translate, ol.interaction.Pointer);
ol.inherits(ol.interaction.Translate, ol.interaction.Pointer);
/**

4
src/ol/layer/heatmaplayer.js
View File

@@ -46,7 +46,7 @@ ol.layer.Heatmap = function(opt_options) {
delete baseOptions.blur;
delete baseOptions.shadow;
delete baseOptions.weight;
goog.base(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
ol.layer.Vector.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
/**
* @private
@@ -134,7 +134,7 @@ ol.layer.Heatmap = function(opt_options) {
ol.events.listen(this, ol.render.EventType.RENDER, this.handleRender_, this);
};
goog.inherits(ol.layer.Heatmap, ol.layer.Vector);
ol.inherits(ol.layer.Heatmap, ol.layer.Vector);
/**

4
src/ol/layer/imagelayer.js
View File

@@ -19,9 +19,9 @@ goog.require('ol.layer.Layer');
*/
ol.layer.Image = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this, /** @type {olx.layer.LayerOptions} */ (options));
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (options));
};
goog.inherits(ol.layer.Image, ol.layer.Layer);
ol.inherits(ol.layer.Image, ol.layer.Layer);
/**

4
src/ol/layer/layer.js
View File

@@ -37,7 +37,7 @@ ol.layer.Layer = function(options) {
var baseOptions = ol.object.assign({}, options);
delete baseOptions.source;
goog.base(this, /** @type {olx.layer.BaseOptions} */ (baseOptions));
ol.layer.Base.call(this, /** @type {olx.layer.BaseOptions} */ (baseOptions));
/**
* @private
@@ -68,7 +68,7 @@ ol.layer.Layer = function(options) {
var source = options.source ? options.source : null;
this.setSource(source);
};
goog.inherits(ol.layer.Layer, ol.layer.Base);
ol.inherits(ol.layer.Layer, ol.layer.Base);
/**

4
src/ol/layer/layerbase.js
View File

@@ -37,7 +37,7 @@ ol.layer.LayerProperty = {
*/
ol.layer.Base = function(options) {
goog.base(this);
ol.Object.call(this);
/**
* @type {Object.<string, *>}
@@ -56,7 +56,7 @@ ol.layer.Base = function(options) {
this.setProperties(properties);
};
goog.inherits(ol.layer.Base, ol.Object);
ol.inherits(ol.layer.Base, ol.Object);
/**

4
src/ol/layer/layergroup.js
View File

@@ -42,7 +42,7 @@ ol.layer.Group = function(opt_options) {
var layers = options.layers;
goog.base(this, baseOptions);
ol.layer.Base.call(this, baseOptions);
/**
* @private
@@ -75,7 +75,7 @@ ol.layer.Group = function(opt_options) {
this.setLayers(layers);
};
goog.inherits(ol.layer.Group, ol.layer.Base);
ol.inherits(ol.layer.Group, ol.layer.Base);
/**

4
src/ol/layer/tilelayer.js
View File

@@ -35,13 +35,13 @@ ol.layer.Tile = function(opt_options) {
delete baseOptions.preload;
delete baseOptions.useInterimTilesOnError;
goog.base(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
this.setPreload(options.preload !== undefined ? options.preload : 0);
this.setUseInterimTilesOnError(options.useInterimTilesOnError !== undefined ?
options.useInterimTilesOnError : true);
};
goog.inherits(ol.layer.Tile, ol.layer.Layer);
ol.inherits(ol.layer.Tile, ol.layer.Layer);
/**

4
src/ol/layer/vectorlayer.js
View File

@@ -44,7 +44,7 @@ ol.layer.Vector = function(opt_options) {
delete baseOptions.renderBuffer;
delete baseOptions.updateWhileAnimating;
delete baseOptions.updateWhileInteracting;
goog.base(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
/**
* @type {number}
@@ -84,7 +84,7 @@ ol.layer.Vector = function(opt_options) {
options.updateWhileInteracting : false;
};
goog.inherits(ol.layer.Vector, ol.layer.Layer);
ol.inherits(ol.layer.Vector, ol.layer.Layer);
/**

4
src/ol/layer/vectortilelayer.js
View File

@@ -53,7 +53,7 @@ ol.layer.VectorTile = function(opt_options) {
delete baseOptions.preload;
delete baseOptions.useInterimTilesOnError;
goog.base(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
ol.layer.Vector.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
this.setPreload(options.preload ? options.preload : 0);
this.setUseInterimTilesOnError(options.useInterimTilesOnError ?
@@ -72,7 +72,7 @@ ol.layer.VectorTile = function(opt_options) {
this.renderMode_ = options.renderMode || ol.layer.VectorTileRenderType.HYBRID;
};
goog.inherits(ol.layer.VectorTile, ol.layer.Vector);
ol.inherits(ol.layer.VectorTile, ol.layer.Vector);
/**

6
src/ol/map.js
View File

@@ -155,7 +155,7 @@ ol.MapProperty = {
*/
ol.Map = function(options) {
goog.base(this);
ol.Object.call(this);
var optionsInternal = ol.Map.createOptionsInternal(options);
@@ -473,7 +473,7 @@ ol.Map = function(options) {
}, this);
};
goog.inherits(ol.Map, ol.Object);
ol.inherits(ol.Map, ol.Object);
/**
@@ -583,7 +583,7 @@ ol.Map.prototype.disposeInternal = function() {
this.animationDelayKey_ = undefined;
}
this.setTarget(null);
goog.base(this, 'disposeInternal');
ol.Object.prototype.disposeInternal.call(this);
};

18
src/ol/mapbrowserevent.js
View File

@@ -30,7 +30,7 @@ goog.require('ol.pointer.PointerEventHandler');
ol.MapBrowserEvent = function(type, map, browserEvent, opt_dragging,
opt_frameState) {
goog.base(this, type, map, opt_frameState);
ol.MapEvent.call(this, type, map, opt_frameState);
/**
* The original browser event.
@@ -64,7 +64,7 @@ ol.MapBrowserEvent = function(type, map, browserEvent, opt_dragging,
this.dragging = opt_dragging !== undefined ? opt_dragging : false;
};
goog.inherits(ol.MapBrowserEvent, ol.MapEvent);
ol.inherits(ol.MapBrowserEvent, ol.MapEvent);
/**
@@ -74,7 +74,7 @@ goog.inherits(ol.MapBrowserEvent, ol.MapEvent);
* @api stable
*/
ol.MapBrowserEvent.prototype.preventDefault = function() {
goog.base(this, 'preventDefault');
ol.MapEvent.prototype.preventDefault.call(this);
this.originalEvent.preventDefault();
};
@@ -86,7 +86,7 @@ ol.MapBrowserEvent.prototype.preventDefault = function() {
* @api stable
*/
ol.MapBrowserEvent.prototype.stopPropagation = function() {
goog.base(this, 'stopPropagation');
ol.MapEvent.prototype.stopPropagation.call(this);
this.originalEvent.stopPropagation();
};
@@ -103,7 +103,7 @@ ol.MapBrowserEvent.prototype.stopPropagation = function() {
ol.MapBrowserPointerEvent = function(type, map, pointerEvent, opt_dragging,
opt_frameState) {
goog.base(this, type, map, pointerEvent.originalEvent, opt_dragging,
ol.MapBrowserEvent.call(this, type, map, pointerEvent.originalEvent, opt_dragging,
opt_frameState);
/**
@@ -113,7 +113,7 @@ ol.MapBrowserPointerEvent = function(type, map, pointerEvent, opt_dragging,
this.pointerEvent = pointerEvent;
};
goog.inherits(ol.MapBrowserPointerEvent, ol.MapBrowserEvent);
ol.inherits(ol.MapBrowserPointerEvent, ol.MapBrowserEvent);
/**
@@ -123,7 +123,7 @@ goog.inherits(ol.MapBrowserPointerEvent, ol.MapBrowserEvent);
*/
ol.MapBrowserEventHandler = function(map) {
goog.base(this);
ol.events.EventTarget.call(this);
/**
* This is the element that we will listen to the real events on.
@@ -207,7 +207,7 @@ ol.MapBrowserEventHandler = function(map) {
this.relayEvent_, this);
};
goog.inherits(ol.MapBrowserEventHandler, ol.events.EventTarget);
ol.inherits(ol.MapBrowserEventHandler, ol.events.EventTarget);
/**
@@ -421,7 +421,7 @@ ol.MapBrowserEventHandler.prototype.disposeInternal = function() {
this.pointerEventHandler_.dispose();
this.pointerEventHandler_ = null;
}
goog.base(this, 'disposeInternal');
ol.events.EventTarget.prototype.disposeInternal.call(this);
};

4
src/ol/mapevent.js
View File

@@ -40,7 +40,7 @@ ol.MapEventType = {
*/
ol.MapEvent = function(type, map, opt_frameState) {
goog.base(this, type);
ol.events.Event.call(this, type);
/**
* The map where the event occurred.
@@ -57,4 +57,4 @@ ol.MapEvent = function(type, map, opt_frameState) {
this.frameState = opt_frameState !== undefined ? opt_frameState : null;
};
goog.inherits(ol.MapEvent, ol.events.Event);
ol.inherits(ol.MapEvent, ol.events.Event);

8
src/ol/object.js
View File

@@ -33,7 +33,7 @@ ol.ObjectEventType = {
* @constructor
*/
ol.ObjectEvent = function(type, key, oldValue) {
goog.base(this, type);
ol.events.Event.call(this, type);
/**
* The name of the property whose value is changing.
@@ -51,7 +51,7 @@ ol.ObjectEvent = function(type, key, oldValue) {
this.oldValue = oldValue;
};
goog.inherits(ol.ObjectEvent, ol.events.Event);
ol.inherits(ol.ObjectEvent, ol.events.Event);
/**
@@ -100,7 +100,7 @@ goog.inherits(ol.ObjectEvent, ol.events.Event);
* @api
*/
ol.Object = function(opt_values) {
goog.base(this);
ol.Observable.call(this);
// Call goog.getUid to ensure that the order of objects' ids is the same as
// the order in which they were created. This also helps to ensure that
@@ -118,7 +118,7 @@ ol.Object = function(opt_values) {
this.setProperties(opt_values);
}
};
goog.inherits(ol.Object, ol.Observable);
ol.inherits(ol.Object, ol.Observable);
/**

4
src/ol/observable.js
View File

@@ -21,7 +21,7 @@ goog.require('ol.events.EventType');
*/
ol.Observable = function() {
goog.base(this);
ol.events.EventTarget.call(this);
/**
* @private
@@ -30,7 +30,7 @@ ol.Observable = function() {
this.revision_ = 0;
};
goog.inherits(ol.Observable, ol.events.EventTarget);
ol.inherits(ol.Observable, ol.events.EventTarget);
/**

7
src/ol/ol.js
View File

@@ -261,9 +261,10 @@ ol.WEBGL_EXTENSIONS; // value is set in `ol.has`
* @function
* @api
*/
ol.inherits =
goog.inherits;
// note that the newline above is necessary to satisfy the linter
ol.inherits = function(childCtor, parentCtor) {
childCtor.prototype = Object.create(parentCtor.prototype);
childCtor.prototype.constructor = childCtor;
};
/**

4
src/ol/overlay.js
View File

@@ -68,7 +68,7 @@ ol.OverlayPositioning = {
*/
ol.Overlay = function(options) {
goog.base(this);
ol.Object.call(this);
/**
* @private
@@ -174,7 +174,7 @@ ol.Overlay = function(options) {
}
};
goog.inherits(ol.Overlay, ol.Object);
ol.inherits(ol.Overlay, ol.Object);
/**

4
src/ol/pointer/mousesource.js
View File

@@ -46,7 +46,7 @@ ol.pointer.MouseSource = function(dispatcher) {
'mouseover': this.mouseover,
'mouseout': this.mouseout
};
goog.base(this, dispatcher, mapping);
ol.pointer.EventSource.call(this, dispatcher, mapping);
/**
* @const
@@ -60,7 +60,7 @@ ol.pointer.MouseSource = function(dispatcher) {
*/
this.lastTouches = [];
};
goog.inherits(ol.pointer.MouseSource, ol.pointer.EventSource);
ol.inherits(ol.pointer.MouseSource, ol.pointer.EventSource);
/**

4
src/ol/pointer/mssource.js
View File

@@ -49,7 +49,7 @@ ol.pointer.MsSource = function(dispatcher) {
'MSGotPointerCapture': this.msGotPointerCapture,
'MSLostPointerCapture': this.msLostPointerCapture
};
goog.base(this, dispatcher, mapping);
ol.pointer.EventSource.call(this, dispatcher, mapping);
/**
* @const
@@ -69,7 +69,7 @@ ol.pointer.MsSource = function(dispatcher) {
'mouse'
];
};
goog.inherits(ol.pointer.MsSource, ol.pointer.EventSource);
ol.inherits(ol.pointer.MsSource, ol.pointer.EventSource);
/**

4
src/ol/pointer/nativesource.js
View File

@@ -49,9 +49,9 @@ ol.pointer.NativeSource = function(dispatcher) {
'gotpointercapture': this.gotPointerCapture,
'lostpointercapture': this.lostPointerCapture
};
goog.base(this, dispatcher, mapping);
ol.pointer.EventSource.call(this, dispatcher, mapping);
};
goog.inherits(ol.pointer.NativeSource, ol.pointer.EventSource);
ol.inherits(ol.pointer.NativeSource, ol.pointer.EventSource);
/**

4
src/ol/pointer/pointerevent.js
View File

@@ -49,7 +49,7 @@ goog.require('ol.events.Event');
* initial event properties.
*/
ol.pointer.PointerEvent = function(type, originalEvent, opt_eventDict) {
goog.base(this, type);
ol.events.Event.call(this, type);
/**
* @const
@@ -192,7 +192,7 @@ ol.pointer.PointerEvent = function(type, originalEvent, opt_eventDict) {
};
}
};
goog.inherits(ol.pointer.PointerEvent, ol.events.Event);
ol.inherits(ol.pointer.PointerEvent, ol.events.Event);
/**

6
src/ol/pointer/pointereventhandler.js
View File

@@ -48,7 +48,7 @@ goog.require('ol.pointer.TouchSource');
* @param {Element|HTMLDocument} element Viewport element.
*/
ol.pointer.PointerEventHandler = function(element) {
goog.base(this);
ol.events.EventTarget.call(this);
/**
* @const
@@ -77,7 +77,7 @@ ol.pointer.PointerEventHandler = function(element) {
this.registerSources();
};
goog.inherits(ol.pointer.PointerEventHandler, ol.events.EventTarget);
ol.inherits(ol.pointer.PointerEventHandler, ol.events.EventTarget);
/**
@@ -398,7 +398,7 @@ ol.pointer.PointerEventHandler.prototype.wrapMouseEvent = function(eventType, ev
*/
ol.pointer.PointerEventHandler.prototype.disposeInternal = function() {
this.unregister_();
goog.base(this, 'disposeInternal');
ol.events.EventTarget.prototype.disposeInternal.call(this);
};

4
src/ol/pointer/touchsource.js
View File

@@ -49,7 +49,7 @@ ol.pointer.TouchSource = function(dispatcher, mouseSource) {
'touchend': this.touchend,
'touchcancel': this.touchcancel
};
goog.base(this, dispatcher, mapping);
ol.pointer.EventSource.call(this, dispatcher, mapping);
/**
* @const
@@ -81,7 +81,7 @@ ol.pointer.TouchSource = function(dispatcher, mouseSource) {
*/
this.resetId_ = undefined;
};
goog.inherits(ol.pointer.TouchSource, ol.pointer.EventSource);
ol.inherits(ol.pointer.TouchSource, ol.pointer.EventSource);
/**

4
src/ol/proj/epsg3857projection.js
View File

@@ -17,7 +17,7 @@ goog.require('ol.proj.Units');
* @private
*/
ol.proj.EPSG3857_ = function(code) {
goog.base(this, {
ol.proj.Projection.call(this, {
code: code,
units: ol.proj.Units.METERS,
extent: ol.proj.EPSG3857.EXTENT,
@@ -25,7 +25,7 @@ ol.proj.EPSG3857_ = function(code) {
worldExtent: ol.proj.EPSG3857.WORLD_EXTENT
});
};
goog.inherits(ol.proj.EPSG3857_, ol.proj.Projection);
ol.inherits(ol.proj.EPSG3857_, ol.proj.Projection);
/**

4
src/ol/proj/epsg4326projection.js
View File

@@ -21,7 +21,7 @@ goog.require('ol.sphere.WGS84');
* @private
*/
ol.proj.EPSG4326_ = function(code, opt_axisOrientation) {
goog.base(this, {
ol.proj.Projection.call(this, {
code: code,
units: ol.proj.Units.DEGREES,
extent: ol.proj.EPSG4326.EXTENT,
@@ -31,7 +31,7 @@ ol.proj.EPSG4326_ = function(code, opt_axisOrientation) {
worldExtent: ol.proj.EPSG4326.EXTENT
});
};
goog.inherits(ol.proj.EPSG4326_, ol.proj.Projection);
ol.inherits(ol.proj.EPSG4326_, ol.proj.Projection);
/**

4
src/ol/render/canvas/canvasimmediate.js
View File

@@ -37,7 +37,7 @@ goog.require('ol.vec.Mat4');
* @struct
*/
ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform, viewRotation) {
goog.base(this);
ol.render.VectorContext.call(this);
/**
* @private
@@ -232,7 +232,7 @@ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform, vi
this.tmpLocalTransform_ = goog.vec.Mat4.createNumber();
};
goog.inherits(ol.render.canvas.Immediate, ol.render.VectorContext);
ol.inherits(ol.render.canvas.Immediate, ol.render.VectorContext);
/**

20
src/ol/render/canvas/canvasreplay.js
View File

@@ -57,7 +57,7 @@ ol.render.canvas.Instruction = {
* @struct
*/
ol.render.canvas.Replay = function(tolerance, maxExtent, resolution) {
goog.base(this);
ol.render.VectorContext.call(this);
/**
* @protected
@@ -145,7 +145,7 @@ ol.render.canvas.Replay = function(tolerance, maxExtent, resolution) {
*/
this.tmpLocalTransformInv_ = goog.vec.Mat4.createNumber();
};
goog.inherits(ol.render.canvas.Replay, ol.render.VectorContext);
ol.inherits(ol.render.canvas.Replay, ol.render.VectorContext);
/**
@@ -678,7 +678,7 @@ ol.render.canvas.Replay.prototype.getBufferedMaxExtent = function() {
* @struct
*/
ol.render.canvas.ImageReplay = function(tolerance, maxExtent, resolution) {
goog.base(this, tolerance, maxExtent, resolution);
ol.render.canvas.Replay.call(this, tolerance, maxExtent, resolution);
/**
* @private
@@ -759,7 +759,7 @@ ol.render.canvas.ImageReplay = function(tolerance, maxExtent, resolution) {
this.width_ = undefined;
};
goog.inherits(ol.render.canvas.ImageReplay, ol.render.canvas.Replay);
ol.inherits(ol.render.canvas.ImageReplay, ol.render.canvas.Replay);
/**
@@ -945,7 +945,7 @@ ol.render.canvas.ImageReplay.prototype.setImageStyle = function(imageStyle) {
*/
ol.render.canvas.LineStringReplay = function(tolerance, maxExtent, resolution) {
goog.base(this, tolerance, maxExtent, resolution);
ol.render.canvas.Replay.call(this, tolerance, maxExtent, resolution);
/**
* @private
@@ -980,7 +980,7 @@ ol.render.canvas.LineStringReplay = function(tolerance, maxExtent, resolution) {
};
};
goog.inherits(ol.render.canvas.LineStringReplay, ol.render.canvas.Replay);
ol.inherits(ol.render.canvas.LineStringReplay, ol.render.canvas.Replay);
/**
@@ -1179,7 +1179,7 @@ ol.render.canvas.LineStringReplay.prototype.setFillStrokeStyle = function(fillSt
*/
ol.render.canvas.PolygonReplay = function(tolerance, maxExtent, resolution) {
goog.base(this, tolerance, maxExtent, resolution);
ol.render.canvas.Replay.call(this, tolerance, maxExtent, resolution);
/**
* @private
@@ -1216,7 +1216,7 @@ ol.render.canvas.PolygonReplay = function(tolerance, maxExtent, resolution) {
};
};
goog.inherits(ol.render.canvas.PolygonReplay, ol.render.canvas.Replay);
ol.inherits(ol.render.canvas.PolygonReplay, ol.render.canvas.Replay);
/**
@@ -1534,7 +1534,7 @@ ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyles_ = function() {
*/
ol.render.canvas.TextReplay = function(tolerance, maxExtent, resolution) {
goog.base(this, tolerance, maxExtent, resolution);
ol.render.canvas.Replay.call(this, tolerance, maxExtent, resolution);
/**
* @private
@@ -1603,7 +1603,7 @@ ol.render.canvas.TextReplay = function(tolerance, maxExtent, resolution) {
this.textState_ = null;
};
goog.inherits(ol.render.canvas.TextReplay, ol.render.canvas.Replay);
ol.inherits(ol.render.canvas.TextReplay, ol.render.canvas.Replay);
/**

Some files were not shown because too many files have changed in this diff Show More