diff --git a/config/example.json b/config/example.json index 3743096c8d..6406477839 100644 --- a/config/example.json +++ b/config/example.json @@ -31,7 +31,6 @@ "*" ], "jscomp_off": [ - "useOfGoogBase", "lintChecks", "analyzerChecks", "missingProvide", diff --git a/config/examples-all.json b/config/examples-all.json index b278885837..73463d242d 100644 --- a/config/examples-all.json +++ b/config/examples-all.json @@ -31,7 +31,6 @@ "*" ], "jscomp_off": [ - "useOfGoogBase", "lintChecks", "analyzerChecks" ], diff --git a/config/ol.json b/config/ol.json index 3e527cc313..f99d41177f 100644 --- a/config/ol.json +++ b/config/ol.json @@ -22,7 +22,6 @@ "*" ], "jscomp_off": [ - "useOfGoogBase", "lintChecks", "analyzerChecks" ], diff --git a/doc/tutorials/closure.md b/doc/tutorials/closure.md index fc1a7f77c6..1905603e38 100644 --- a/doc/tutorials/closure.md +++ b/doc/tutorials/closure.md @@ -235,7 +235,6 @@ Here is a version of `config.json` with more compilation checks enabled: ], "jscomp_off": [ "unknownDefines", - "useOfGoogBase", "lintChecks", "analyzerChecks" ], diff --git a/src/ol/collection.js b/src/ol/collection.js index cdb3c73276..f5b2972807 100644 --- a/src/ol/collection.js +++ b/src/ol/collection.js @@ -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); /** diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attributioncontrol.js index 1535416e24..206339033c 100644 --- a/src/ol/control/attributioncontrol.js +++ b/src/ol/control/attributioncontrol.js @@ -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); /** diff --git a/src/ol/control/control.js b/src/ol/control/control.js index 13465598c5..2a66f37096 100644 --- a/src/ol/control/control.js +++ b/src/ol/control/control.js @@ -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); }; diff --git a/src/ol/control/fullscreencontrol.js b/src/ol/control/fullscreencontrol.js index 2955e37296..4d0b6cdb05 100644 --- a/src/ol/control/fullscreencontrol.js +++ b/src/ol/control/fullscreencontrol.js @@ -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, diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js index 286f6372af..5947c4ee13 100644 --- a/src/ol/control/mousepositioncontrol.js +++ b/src/ol/control/mousepositioncontrol.js @@ -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( diff --git a/src/ol/control/overviewmapcontrol.js b/src/ol/control/overviewmapcontrol.js index 8b5aea83cf..3d40f1bee0 100644 --- a/src/ol/control/overviewmapcontrol.js +++ b/src/ol/control/overviewmapcontrol.js @@ -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( diff --git a/src/ol/control/rotatecontrol.js b/src/ol/control/rotatecontrol.js index 8eabf23a22..ff50b99648 100644 --- a/src/ol/control/rotatecontrol.js +++ b/src/ol/control/rotatecontrol.js @@ -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); /** diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js index a6d2cffcb6..6a9f05b528 100644 --- a/src/ol/control/scalelinecontrol.js +++ b/src/ol/control/scalelinecontrol.js @@ -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); /** diff --git a/src/ol/control/zoomcontrol.js b/src/ol/control/zoomcontrol.js index e1e2c6cd93..343b230f8d 100644 --- a/src/ol/control/zoomcontrol.js +++ b/src/ol/control/zoomcontrol.js @@ -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); /** diff --git a/src/ol/control/zoomslidercontrol.js b/src/ol/control/zoomslidercontrol.js index 2ef7843da7..1546fc834e 100644 --- a/src/ol/control/zoomslidercontrol.js +++ b/src/ol/control/zoomslidercontrol.js @@ -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(); } diff --git a/src/ol/control/zoomtoextentcontrol.js b/src/ol/control/zoomtoextentcontrol.js index 017850bb78..62654f3d69 100644 --- a/src/ol/control/zoomtoextentcontrol.js +++ b/src/ol/control/zoomtoextentcontrol.js @@ -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); /** diff --git a/src/ol/deviceorientation.js b/src/ol/deviceorientation.js index 2d89edd793..0136ee5f16 100644 --- a/src/ol/deviceorientation.js +++ b/src/ol/deviceorientation.js @@ -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); }; diff --git a/src/ol/events/eventtarget.js b/src/ol/events/eventtarget.js index 54a25cbd6b..dc685bc6d5 100644 --- a/src/ol/events/eventtarget.js +++ b/src/ol/events/eventtarget.js @@ -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); /** diff --git a/src/ol/feature.js b/src/ol/feature.js index 690391f76f..cb7e794774 100644 --- a/src/ol/feature.js +++ b/src/ol/feature.js @@ -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); /** diff --git a/src/ol/format/esrijsonformat.js b/src/ol/format/esrijsonformat.js index 6bed7afb51..3e0773f22e 100644 --- a/src/ol/format/esrijsonformat.js +++ b/src/ol/format/esrijsonformat.js @@ -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); /** diff --git a/src/ol/format/geojsonformat.js b/src/ol/format/geojsonformat.js index 594665d0de..81a50c69cf 100644 --- a/src/ol/format/geojsonformat.js +++ b/src/ol/format/geojsonformat.js @@ -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); /** diff --git a/src/ol/format/gml/gml2format.js b/src/ol/format/gml/gml2format.js index 937ec5a987..591635c89a 100644 --- a/src/ol/format/gml/gml2format.js +++ b/src/ol/format/gml/gml2format.js @@ -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); /** diff --git a/src/ol/format/gml/gml3format.js b/src/ol/format/gml/gml3format.js index 01c4468b24..d54661e968 100644 --- a/src/ol/format/gml/gml3format.js +++ b/src/ol/format/gml/gml3format.js @@ -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); /** diff --git a/src/ol/format/gml/gmlbaseformat.js b/src/ol/format/gml/gmlbaseformat.js index 2df3529a4d..981a1297ef 100644 --- a/src/ol/format/gml/gmlbaseformat.js +++ b/src/ol/format/gml/gmlbaseformat.js @@ -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); /** diff --git a/src/ol/format/gpxformat.js b/src/ol/format/gpxformat.js index d516e88d54..1c911e1d23 100644 --- a/src/ol/format/gpxformat.js +++ b/src/ol/format/gpxformat.js @@ -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); /** diff --git a/src/ol/format/igcformat.js b/src/ol/format/igcformat.js index 2a66783b67..5955abd709 100644 --- a/src/ol/format/igcformat.js +++ b/src/ol/format/igcformat.js @@ -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); /** diff --git a/src/ol/format/jsonfeatureformat.js b/src/ol/format/jsonfeatureformat.js index 14f704eb73..6500d48e59 100644 --- a/src/ol/format/jsonfeatureformat.js +++ b/src/ol/format/jsonfeatureformat.js @@ -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); /** diff --git a/src/ol/format/kmlformat.js b/src/ol/format/kmlformat.js index 6f8ac7366d..442d73937b 100644 --- a/src/ol/format/kmlformat.js +++ b/src/ol/format/kmlformat.js @@ -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); /** diff --git a/src/ol/format/mvtformat.js b/src/ol/format/mvtformat.js index f588b52a93..4eef126ebf 100644 --- a/src/ol/format/mvtformat.js +++ b/src/ol/format/mvtformat.js @@ -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); /** diff --git a/src/ol/format/ogc/filter.js b/src/ol/format/ogc/filter.js index 9da33a4c58..ba486a91d9 100644 --- a/src/ol/format/ogc/filter.js +++ b/src/ol/format/ogc/filter.js @@ -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); diff --git a/src/ol/format/osmxmlformat.js b/src/ol/format/osmxmlformat.js index d97b519a21..f519f48dd2 100644 --- a/src/ol/format/osmxmlformat.js +++ b/src/ol/format/osmxmlformat.js @@ -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); /** diff --git a/src/ol/format/owsformat.js b/src/ol/format/owsformat.js index 760a09293a..3b3398671f 100644 --- a/src/ol/format/owsformat.js +++ b/src/ol/format/owsformat.js @@ -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); /** diff --git a/src/ol/format/polylineformat.js b/src/ol/format/polylineformat.js index 4fc08d74ad..135a342a41 100644 --- a/src/ol/format/polylineformat.js +++ b/src/ol/format/polylineformat.js @@ -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); /** diff --git a/src/ol/format/textfeatureformat.js b/src/ol/format/textfeatureformat.js index 7c86d92a50..d6d05b4dca 100644 --- a/src/ol/format/textfeatureformat.js +++ b/src/ol/format/textfeatureformat.js @@ -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); /** diff --git a/src/ol/format/topojsonformat.js b/src/ol/format/topojsonformat.js index a458d8f9d0..6fa5060296 100644 --- a/src/ol/format/topojsonformat.js +++ b/src/ol/format/topojsonformat.js @@ -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); /** diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfsformat.js index 9ef6292cf0..e3bd018195 100644 --- a/src/ol/format/wfsformat.js +++ b/src/ol/format/wfsformat.js @@ -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); /** diff --git a/src/ol/format/wktformat.js b/src/ol/format/wktformat.js index 6239509327..32c66d4466 100644 --- a/src/ol/format/wktformat.js +++ b/src/ol/format/wktformat.js @@ -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); /** diff --git a/src/ol/format/wmscapabilitiesformat.js b/src/ol/format/wmscapabilitiesformat.js index 36f3687ba4..726b95c238 100644 --- a/src/ol/format/wmscapabilitiesformat.js +++ b/src/ol/format/wmscapabilitiesformat.js @@ -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); /** diff --git a/src/ol/format/wmsgetfeatureinfoformat.js b/src/ol/format/wmsgetfeatureinfoformat.js index 95b226da04..db32b5f456 100644 --- a/src/ol/format/wmsgetfeatureinfoformat.js +++ b/src/ol/format/wmsgetfeatureinfoformat.js @@ -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); /** diff --git a/src/ol/format/wmtscapabilitiesformat.js b/src/ol/format/wmtscapabilitiesformat.js index b6beaccb1c..5c2e6cdcf6 100644 --- a/src/ol/format/wmtscapabilitiesformat.js +++ b/src/ol/format/wmtscapabilitiesformat.js @@ -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); /** diff --git a/src/ol/format/xmlfeatureformat.js b/src/ol/format/xmlfeatureformat.js index dbb742afde..d506b9dace 100644 --- a/src/ol/format/xmlfeatureformat.js +++ b/src/ol/format/xmlfeatureformat.js @@ -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); /** diff --git a/src/ol/geolocation.js b/src/ol/geolocation.js index 9b5772fc35..2a55bfc78e 100644 --- a/src/ol/geolocation.js +++ b/src/ol/geolocation.js @@ -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); }; diff --git a/src/ol/geom/circle.js b/src/ol/geom/circle.js index 91fc52b9a0..21e25bd219 100644 --- a/src/ol/geom/circle.js +++ b/src/ol/geom/circle.js @@ -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); /** diff --git a/src/ol/geom/geometry.js b/src/ol/geom/geometry.js index 94ee21f57f..eb3ceabb6f 100644 --- a/src/ol/geom/geometry.js +++ b/src/ol/geom/geometry.js @@ -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); /** diff --git a/src/ol/geom/geometrycollection.js b/src/ol/geom/geometrycollection.js index 9cc250ac7f..793141b373 100644 --- a/src/ol/geom/geometrycollection.js +++ b/src/ol/geom/geometrycollection.js @@ -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); }; diff --git a/src/ol/geom/linearring.js b/src/ol/geom/linearring.js index 493de55d90..98348433ef 100644 --- a/src/ol/geom/linearring.js +++ b/src/ol/geom/linearring.js @@ -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); /** diff --git a/src/ol/geom/linestring.js b/src/ol/geom/linestring.js index 4d8722584c..298aae3060 100644 --- a/src/ol/geom/linestring.js +++ b/src/ol/geom/linestring.js @@ -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); /** diff --git a/src/ol/geom/multilinestring.js b/src/ol/geom/multilinestring.js index 81b91f22b6..20559d8f6f 100644 --- a/src/ol/geom/multilinestring.js +++ b/src/ol/geom/multilinestring.js @@ -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.} @@ -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); /** diff --git a/src/ol/geom/multipoint.js b/src/ol/geom/multipoint.js index b9eaae92a5..29a4e109c2 100644 --- a/src/ol/geom/multipoint.js +++ b/src/ol/geom/multipoint.js @@ -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); /** diff --git a/src/ol/geom/multipolygon.js b/src/ol/geom/multipolygon.js index 41e047c692..0e515023a3 100644 --- a/src/ol/geom/multipolygon.js +++ b/src/ol/geom/multipolygon.js @@ -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.>} @@ -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); /** diff --git a/src/ol/geom/point.js b/src/ol/geom/point.js index 45143cae51..91da185d1b 100644 --- a/src/ol/geom/point.js +++ b/src/ol/geom/point.js @@ -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); /** diff --git a/src/ol/geom/polygon.js b/src/ol/geom/polygon.js index e27c51e08f..5aa94dfab6 100644 --- a/src/ol/geom/polygon.js +++ b/src/ol/geom/polygon.js @@ -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.} @@ -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); /** diff --git a/src/ol/geom/simplegeometry.js b/src/ol/geom/simplegeometry.js index 668a6004e1..ba60eea240 100644 --- a/src/ol/geom/simplegeometry.js +++ b/src/ol/geom/simplegeometry.js @@ -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); /** diff --git a/src/ol/image.js b/src/ol/image.js index 845bd9a572..303bd05f73 100644 --- a/src/ol/image.js +++ b/src/ol/image.js @@ -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); /** diff --git a/src/ol/imagebase.js b/src/ol/imagebase.js index f0303e19f4..b7a42b95f4 100644 --- a/src/ol/imagebase.js +++ b/src/ol/imagebase.js @@ -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); /** diff --git a/src/ol/imagecanvas.js b/src/ol/imagecanvas.js index 9bd290d93c..d641b17b4e 100644 --- a/src/ol/imagecanvas.js +++ b/src/ol/imagecanvas.js @@ -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); /** diff --git a/src/ol/imagetile.js b/src/ol/imagetile.js index ada8413958..5d423ee5af 100644 --- a/src/ol/imagetile.js +++ b/src/ol/imagetile.js @@ -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); }; diff --git a/src/ol/interaction/doubleclickzoominteraction.js b/src/ol/interaction/doubleclickzoominteraction.js index e5d93d4a7f..511b7061f4 100644 --- a/src/ol/interaction/doubleclickzoominteraction.js +++ b/src/ol/interaction/doubleclickzoominteraction.js @@ -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); /** diff --git a/src/ol/interaction/draganddropinteraction.js b/src/ol/interaction/draganddropinteraction.js index d3430a9ec6..e5ad0a2c69 100644 --- a/src/ol/interaction/draganddropinteraction.js +++ b/src/ol/interaction/draganddropinteraction.js @@ -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); diff --git a/src/ol/interaction/dragboxinteraction.js b/src/ol/interaction/dragboxinteraction.js index 05f2db8d79..011bd3a8c2 100644 --- a/src/ol/interaction/dragboxinteraction.js +++ b/src/ol/interaction/dragboxinteraction.js @@ -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); /** diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js index 6dcfc068d3..5727f8c0d3 100644 --- a/src/ol/interaction/dragpaninteraction.js +++ b/src/ol/interaction/dragpaninteraction.js @@ -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); /** diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js index a35122d23c..0c8c28fe63 100644 --- a/src/ol/interaction/dragrotateandzoominteraction.js +++ b/src/ol/interaction/dragrotateandzoominteraction.js @@ -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); /** diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index 5c155baed9..0f287a199c 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -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); /** diff --git a/src/ol/interaction/dragzoominteraction.js b/src/ol/interaction/dragzoominteraction.js index 6129a76014..d41c0a696c 100644 --- a/src/ol/interaction/dragzoominteraction.js +++ b/src/ol/interaction/dragzoominteraction.js @@ -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); /** diff --git a/src/ol/interaction/drawinteraction.js b/src/ol/interaction/drawinteraction.js index 6746eb08ed..1be73f81c0 100644 --- a/src/ol/interaction/drawinteraction.js +++ b/src/ol/interaction/drawinteraction.js @@ -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_(); }; diff --git a/src/ol/interaction/interaction.js b/src/ol/interaction/interaction.js index 8a61e99883..2138534efe 100644 --- a/src/ol/interaction/interaction.js +++ b/src/ol/interaction/interaction.js @@ -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); /** diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js index 3a1aa34135..193bc68b7c 100644 --- a/src/ol/interaction/keyboardpaninteraction.js +++ b/src/ol/interaction/keyboardpaninteraction.js @@ -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 diff --git a/src/ol/interaction/keyboardzoominteraction.js b/src/ol/interaction/keyboardzoominteraction.js index c2b055ebe7..0dfbb81d7d 100644 --- a/src/ol/interaction/keyboardzoominteraction.js +++ b/src/ol/interaction/keyboardzoominteraction.js @@ -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); /** diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js index d3aba86bb1..e5329d5116 100644 --- a/src/ol/interaction/modifyinteraction.js +++ b/src/ol/interaction/modifyinteraction.js @@ -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); }; diff --git a/src/ol/interaction/mousewheelzoominteraction.js b/src/ol/interaction/mousewheelzoominteraction.js index 555e566cbe..ef83c7ac07 100644 --- a/src/ol/interaction/mousewheelzoominteraction.js +++ b/src/ol/interaction/mousewheelzoominteraction.js @@ -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); /** diff --git a/src/ol/interaction/pinchrotateinteraction.js b/src/ol/interaction/pinchrotateinteraction.js index 6d86cf5397..f71d473d31 100644 --- a/src/ol/interaction/pinchrotateinteraction.js +++ b/src/ol/interaction/pinchrotateinteraction.js @@ -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); /** diff --git a/src/ol/interaction/pinchzoominteraction.js b/src/ol/interaction/pinchzoominteraction.js index 5267439c33..5ffddba0fc 100644 --- a/src/ol/interaction/pinchzoominteraction.js +++ b/src/ol/interaction/pinchzoominteraction.js @@ -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); /** diff --git a/src/ol/interaction/pointerinteraction.js b/src/ol/interaction/pointerinteraction.js index 6450ea3bf2..18a8522b71 100644 --- a/src/ol/interaction/pointerinteraction.js +++ b/src/ol/interaction/pointerinteraction.js @@ -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); /** diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js index 8316e88be8..cf4ade61c9 100644 --- a/src/ol/interaction/selectinteraction.js +++ b/src/ol/interaction/selectinteraction.js @@ -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); diff --git a/src/ol/interaction/snapinteraction.js b/src/ol/interaction/snapinteraction.js index dc5bf6570f..45172aa136 100644 --- a/src/ol/interaction/snapinteraction.js +++ b/src/ol/interaction/snapinteraction.js @@ -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_) { diff --git a/src/ol/interaction/translateinteraction.js b/src/ol/interaction/translateinteraction.js index e6812186ef..d5ea1b9948 100644 --- a/src/ol/interaction/translateinteraction.js +++ b/src/ol/interaction/translateinteraction.js @@ -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); /** diff --git a/src/ol/layer/heatmaplayer.js b/src/ol/layer/heatmaplayer.js index 26b8ebd764..72517bbb85 100644 --- a/src/ol/layer/heatmaplayer.js +++ b/src/ol/layer/heatmaplayer.js @@ -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); /** diff --git a/src/ol/layer/imagelayer.js b/src/ol/layer/imagelayer.js index f0523c76fa..086c281429 100644 --- a/src/ol/layer/imagelayer.js +++ b/src/ol/layer/imagelayer.js @@ -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); /** diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index 4b5d3b2bc3..b1a8253a75 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -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); /** diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index fa017de72f..02a9a6b98c 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -37,7 +37,7 @@ ol.layer.LayerProperty = { */ ol.layer.Base = function(options) { - goog.base(this); + ol.Object.call(this); /** * @type {Object.} @@ -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); /** diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/layergroup.js index 24ef53260c..d422431fd4 100644 --- a/src/ol/layer/layergroup.js +++ b/src/ol/layer/layergroup.js @@ -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); /** diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js index 4bf1d26ceb..f8bf8f35ac 100644 --- a/src/ol/layer/tilelayer.js +++ b/src/ol/layer/tilelayer.js @@ -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); /** diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js index a001e370e2..01bd3ecda7 100644 --- a/src/ol/layer/vectorlayer.js +++ b/src/ol/layer/vectorlayer.js @@ -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); /** diff --git a/src/ol/layer/vectortilelayer.js b/src/ol/layer/vectortilelayer.js index a1ecd639b7..9125952324 100644 --- a/src/ol/layer/vectortilelayer.js +++ b/src/ol/layer/vectortilelayer.js @@ -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); /** diff --git a/src/ol/map.js b/src/ol/map.js index b41dd653c2..d302e24a61 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -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); }; diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index 746ef93c56..8af03adad3 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -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); }; diff --git a/src/ol/mapevent.js b/src/ol/mapevent.js index 0f4bf981ce..4a92a225a8 100644 --- a/src/ol/mapevent.js +++ b/src/ol/mapevent.js @@ -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); diff --git a/src/ol/object.js b/src/ol/object.js index ab2ac546ac..810be8b9b0 100644 --- a/src/ol/object.js +++ b/src/ol/object.js @@ -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); /** diff --git a/src/ol/observable.js b/src/ol/observable.js index 70563e5991..20f37657c8 100644 --- a/src/ol/observable.js +++ b/src/ol/observable.js @@ -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); /** diff --git a/src/ol/ol.js b/src/ol/ol.js index e332d6473a..211d0198ff 100644 --- a/src/ol/ol.js +++ b/src/ol/ol.js @@ -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; +}; /** diff --git a/src/ol/overlay.js b/src/ol/overlay.js index 206c3bea5b..d802079351 100644 --- a/src/ol/overlay.js +++ b/src/ol/overlay.js @@ -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); /** diff --git a/src/ol/pointer/mousesource.js b/src/ol/pointer/mousesource.js index 8cf03ad081..35102ba59d 100644 --- a/src/ol/pointer/mousesource.js +++ b/src/ol/pointer/mousesource.js @@ -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); /** diff --git a/src/ol/pointer/mssource.js b/src/ol/pointer/mssource.js index 2a72f37df5..5cea2a0d4d 100644 --- a/src/ol/pointer/mssource.js +++ b/src/ol/pointer/mssource.js @@ -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); /** diff --git a/src/ol/pointer/nativesource.js b/src/ol/pointer/nativesource.js index be9218891b..4e1b50f87d 100644 --- a/src/ol/pointer/nativesource.js +++ b/src/ol/pointer/nativesource.js @@ -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); /** diff --git a/src/ol/pointer/pointerevent.js b/src/ol/pointer/pointerevent.js index b0608c167b..c0c190728f 100644 --- a/src/ol/pointer/pointerevent.js +++ b/src/ol/pointer/pointerevent.js @@ -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); /** diff --git a/src/ol/pointer/pointereventhandler.js b/src/ol/pointer/pointereventhandler.js index e49be24df5..21c6e149e3 100644 --- a/src/ol/pointer/pointereventhandler.js +++ b/src/ol/pointer/pointereventhandler.js @@ -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); }; diff --git a/src/ol/pointer/touchsource.js b/src/ol/pointer/touchsource.js index 5a37435103..38e2842df6 100644 --- a/src/ol/pointer/touchsource.js +++ b/src/ol/pointer/touchsource.js @@ -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); /** diff --git a/src/ol/proj/epsg3857projection.js b/src/ol/proj/epsg3857projection.js index 341bcaaa0b..3529b13834 100644 --- a/src/ol/proj/epsg3857projection.js +++ b/src/ol/proj/epsg3857projection.js @@ -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); /** diff --git a/src/ol/proj/epsg4326projection.js b/src/ol/proj/epsg4326projection.js index 7e58e055f9..b30fd11d54 100644 --- a/src/ol/proj/epsg4326projection.js +++ b/src/ol/proj/epsg4326projection.js @@ -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); /** diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index b32a102326..b4af6db0db 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -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); /** diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 7c3091ba2d..1a12c021aa 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -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); /** diff --git a/src/ol/render/renderevent.js b/src/ol/render/renderevent.js index ce60415de1..ca1bf749b8 100644 --- a/src/ol/render/renderevent.js +++ b/src/ol/render/renderevent.js @@ -42,7 +42,7 @@ ol.render.Event = function( type, opt_target, opt_vectorContext, opt_frameState, opt_context, opt_glContext) { - goog.base(this, type, opt_target); + ol.events.Event.call(this, type, opt_target); /** * For canvas, this is an instance of {@link ol.render.canvas.Immediate}. @@ -75,4 +75,4 @@ ol.render.Event = function( this.glContext = opt_glContext; }; -goog.inherits(ol.render.Event, ol.events.Event); +ol.inherits(ol.render.Event, ol.events.Event); diff --git a/src/ol/render/webgl/webglimagedefaultshader.js b/src/ol/render/webgl/webglimagedefaultshader.js index b93096d06a..95069eb2d6 100644 --- a/src/ol/render/webgl/webglimagedefaultshader.js +++ b/src/ol/render/webgl/webglimagedefaultshader.js @@ -13,9 +13,9 @@ goog.require('ol.webgl.shader'); * @struct */ ol.render.webgl.imagereplay.shader.DefaultFragment = function() { - goog.base(this, ol.render.webgl.imagereplay.shader.DefaultFragment.SOURCE); + ol.webgl.shader.Fragment.call(this, ol.render.webgl.imagereplay.shader.DefaultFragment.SOURCE); }; -goog.inherits(ol.render.webgl.imagereplay.shader.DefaultFragment, ol.webgl.shader.Fragment); +ol.inherits(ol.render.webgl.imagereplay.shader.DefaultFragment, ol.webgl.shader.Fragment); goog.addSingletonGetter(ol.render.webgl.imagereplay.shader.DefaultFragment); @@ -48,9 +48,9 @@ ol.render.webgl.imagereplay.shader.DefaultFragment.SOURCE = goog.DEBUG ? * @struct */ ol.render.webgl.imagereplay.shader.DefaultVertex = function() { - goog.base(this, ol.render.webgl.imagereplay.shader.DefaultVertex.SOURCE); + ol.webgl.shader.Vertex.call(this, ol.render.webgl.imagereplay.shader.DefaultVertex.SOURCE); }; -goog.inherits(ol.render.webgl.imagereplay.shader.DefaultVertex, ol.webgl.shader.Vertex); +ol.inherits(ol.render.webgl.imagereplay.shader.DefaultVertex, ol.webgl.shader.Vertex); goog.addSingletonGetter(ol.render.webgl.imagereplay.shader.DefaultVertex); diff --git a/src/ol/render/webgl/webglimmediate.js b/src/ol/render/webgl/webglimmediate.js index f112f71e36..0eb9c4c2cf 100644 --- a/src/ol/render/webgl/webglimmediate.js +++ b/src/ol/render/webgl/webglimmediate.js @@ -20,7 +20,7 @@ goog.require('ol.render.webgl.ReplayGroup'); * @struct */ ol.render.webgl.Immediate = function(context, center, resolution, rotation, size, extent, pixelRatio) { - goog.base(this); + ol.render.VectorContext.call(this); /** * @private @@ -64,7 +64,7 @@ ol.render.webgl.Immediate = function(context, center, resolution, rotation, size this.imageStyle_ = null; }; -goog.inherits(ol.render.webgl.Immediate, ol.render.VectorContext); +ol.inherits(ol.render.webgl.Immediate, ol.render.VectorContext); /** diff --git a/src/ol/render/webgl/webglreplay.js b/src/ol/render/webgl/webglreplay.js index a25b21de8c..687c70b2ad 100644 --- a/src/ol/render/webgl/webglreplay.js +++ b/src/ol/render/webgl/webglreplay.js @@ -25,7 +25,7 @@ goog.require('ol.webgl.Context'); * @struct */ ol.render.webgl.ImageReplay = function(tolerance, maxExtent) { - goog.base(this); + ol.render.VectorContext.call(this); /** * @type {number|undefined} @@ -207,7 +207,7 @@ ol.render.webgl.ImageReplay = function(tolerance, maxExtent) { */ this.width_ = undefined; }; -goog.inherits(ol.render.webgl.ImageReplay, ol.render.VectorContext); +ol.inherits(ol.render.webgl.ImageReplay, ol.render.VectorContext); /** diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index 0526f7f3f9..b70d79d333 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -21,7 +21,7 @@ goog.require('ol.vec.Mat4'); */ ol.renderer.canvas.ImageLayer = function(imageLayer) { - goog.base(this, imageLayer); + ol.renderer.canvas.Layer.call(this, imageLayer); /** * @private @@ -48,7 +48,7 @@ ol.renderer.canvas.ImageLayer = function(imageLayer) { this.hitCanvasContext_ = null; }; -goog.inherits(ol.renderer.canvas.ImageLayer, ol.renderer.canvas.Layer); +ol.inherits(ol.renderer.canvas.ImageLayer, ol.renderer.canvas.Layer); /** diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/canvaslayerrenderer.js index 0cd55e088f..852492ad4d 100644 --- a/src/ol/renderer/canvas/canvaslayerrenderer.js +++ b/src/ol/renderer/canvas/canvaslayerrenderer.js @@ -19,7 +19,7 @@ goog.require('ol.vec.Mat4'); */ ol.renderer.canvas.Layer = function(layer) { - goog.base(this, layer); + ol.renderer.Layer.call(this, layer); /** * @private @@ -28,7 +28,7 @@ ol.renderer.canvas.Layer = function(layer) { this.transform_ = goog.vec.Mat4.createNumber(); }; -goog.inherits(ol.renderer.canvas.Layer, ol.renderer.Layer); +ol.inherits(ol.renderer.canvas.Layer, ol.renderer.Layer); /** diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index ef56ded63e..b8fed0b31f 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -38,7 +38,7 @@ goog.require('ol.vec.Mat4'); */ ol.renderer.canvas.Map = function(container, map) { - goog.base(this, container, map); + ol.renderer.Map.call(this, container, map); /** * @private @@ -70,7 +70,7 @@ ol.renderer.canvas.Map = function(container, map) { this.transform_ = goog.vec.Mat4.createNumber(); }; -goog.inherits(ol.renderer.canvas.Map, ol.renderer.Map); +ol.inherits(ol.renderer.canvas.Map, ol.renderer.Map); /** diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index 5233f55180..271f17e380 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -23,7 +23,7 @@ goog.require('ol.vec.Mat4'); */ ol.renderer.canvas.TileLayer = function(tileLayer) { - goog.base(this, tileLayer); + ol.renderer.canvas.Layer.call(this, tileLayer); /** * @protected @@ -62,7 +62,7 @@ ol.renderer.canvas.TileLayer = function(tileLayer) { this.zDirection = 0; }; -goog.inherits(ol.renderer.canvas.TileLayer, ol.renderer.canvas.Layer); +ol.inherits(ol.renderer.canvas.TileLayer, ol.renderer.canvas.Layer); /** diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index 579c7afc80..18871e438e 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -21,7 +21,7 @@ goog.require('ol.source.Vector'); */ ol.renderer.canvas.VectorLayer = function(vectorLayer) { - goog.base(this, vectorLayer); + ol.renderer.canvas.Layer.call(this, vectorLayer); /** * @private @@ -66,7 +66,7 @@ ol.renderer.canvas.VectorLayer = function(vectorLayer) { this.context_ = ol.dom.createCanvasContext2D(); }; -goog.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer); +ol.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer); /** diff --git a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js index 1197376b72..42732e2cdb 100644 --- a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js @@ -47,7 +47,7 @@ ol.renderer.canvas.VECTOR_REPLAYS = { */ ol.renderer.canvas.VectorTileLayer = function(layer) { - goog.base(this, layer); + ol.renderer.canvas.TileLayer.call(this, layer); /** * @private @@ -66,7 +66,7 @@ ol.renderer.canvas.VectorTileLayer = function(layer) { layer.getRenderMode() == ol.layer.VectorTileRenderType.VECTOR ? 1 : 0; }; -goog.inherits(ol.renderer.canvas.VectorTileLayer, ol.renderer.canvas.TileLayer); +ol.inherits(ol.renderer.canvas.VectorTileLayer, ol.renderer.canvas.TileLayer); /** @@ -342,7 +342,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.handleStyleImageChange_ = function( * @inheritDoc */ ol.renderer.canvas.VectorTileLayer.prototype.prepareFrame = function(frameState, layerState) { - var prepared = goog.base(this, 'prepareFrame', frameState, layerState); + var prepared = ol.renderer.canvas.TileLayer.prototype.prepareFrame.call(this, frameState, layerState); if (prepared) { var skippedFeatures = Object.keys(frameState.skippedFeatureUids_ || {}); for (var i = 0, ii = this.renderedTiles.length; i < ii; ++i) { diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index 63850f6670..d669282cb3 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -22,7 +22,7 @@ ol.renderer.dom.ImageLayer = function(imageLayer) { var target = document.createElement('DIV'); target.style.position = 'absolute'; - goog.base(this, imageLayer, target); + ol.renderer.dom.Layer.call(this, imageLayer, target); /** * The last rendered image. @@ -38,7 +38,7 @@ ol.renderer.dom.ImageLayer = function(imageLayer) { this.transform_ = goog.vec.Mat4.createNumberIdentity(); }; -goog.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer); +ol.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer); /** diff --git a/src/ol/renderer/dom/domlayerrenderer.js b/src/ol/renderer/dom/domlayerrenderer.js index 6165667ca3..043aba3819 100644 --- a/src/ol/renderer/dom/domlayerrenderer.js +++ b/src/ol/renderer/dom/domlayerrenderer.js @@ -13,7 +13,7 @@ goog.require('ol.renderer.Layer'); */ ol.renderer.dom.Layer = function(layer, target) { - goog.base(this, layer); + ol.renderer.Layer.call(this, layer); /** * @type {!Element} @@ -22,7 +22,7 @@ ol.renderer.dom.Layer = function(layer, target) { this.target = target; }; -goog.inherits(ol.renderer.dom.Layer, ol.renderer.Layer); +ol.inherits(ol.renderer.dom.Layer, ol.renderer.Layer); /** diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/dommaprenderer.js index bf57efab58..01abf6dbc8 100644 --- a/src/ol/renderer/dom/dommaprenderer.js +++ b/src/ol/renderer/dom/dommaprenderer.js @@ -36,7 +36,7 @@ goog.require('ol.vec.Mat4'); */ ol.renderer.dom.Map = function(container, map) { - goog.base(this, container, map); + ol.renderer.Map.call(this, container, map); /** * @private @@ -80,7 +80,7 @@ ol.renderer.dom.Map = function(container, map) { this.renderedVisible_ = true; }; -goog.inherits(ol.renderer.dom.Map, ol.renderer.Map); +ol.inherits(ol.renderer.dom.Map, ol.renderer.Map); /** @@ -88,7 +88,7 @@ goog.inherits(ol.renderer.dom.Map, ol.renderer.Map); */ ol.renderer.dom.Map.prototype.disposeInternal = function() { goog.dom.removeNode(this.layersPane_); - goog.base(this, 'disposeInternal'); + ol.renderer.Map.prototype.disposeInternal.call(this); }; diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index 92879f3f52..7c2f6159ef 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -31,7 +31,7 @@ ol.renderer.dom.TileLayer = function(tileLayer) { var target = document.createElement('DIV'); target.style.position = 'absolute'; - goog.base(this, tileLayer, target); + ol.renderer.dom.Layer.call(this, tileLayer, target); /** * @private @@ -58,7 +58,7 @@ ol.renderer.dom.TileLayer = function(tileLayer) { this.tileLayerZs_ = {}; }; -goog.inherits(ol.renderer.dom.TileLayer, ol.renderer.dom.Layer); +ol.inherits(ol.renderer.dom.TileLayer, ol.renderer.dom.Layer); /** diff --git a/src/ol/renderer/dom/domvectorlayerrenderer.js b/src/ol/renderer/dom/domvectorlayerrenderer.js index d025ef6103..116de9bc94 100644 --- a/src/ol/renderer/dom/domvectorlayerrenderer.js +++ b/src/ol/renderer/dom/domvectorlayerrenderer.js @@ -36,7 +36,7 @@ ol.renderer.dom.VectorLayer = function(vectorLayer) { target.style.maxWidth = 'none'; target.style.position = 'absolute'; - goog.base(this, vectorLayer, target); + ol.renderer.dom.Layer.call(this, vectorLayer, target); /** * @private @@ -87,7 +87,7 @@ ol.renderer.dom.VectorLayer = function(vectorLayer) { this.elementTransform_ = goog.vec.Mat4.createNumber(); }; -goog.inherits(ol.renderer.dom.VectorLayer, ol.renderer.dom.Layer); +ol.inherits(ol.renderer.dom.VectorLayer, ol.renderer.dom.Layer); /** diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js index b54701f633..e8eaea77c5 100644 --- a/src/ol/renderer/layerrenderer.js +++ b/src/ol/renderer/layerrenderer.js @@ -24,7 +24,7 @@ goog.require('ol.vec.Mat4'); */ ol.renderer.Layer = function(layer) { - goog.base(this); + ol.Observable.call(this); /** * @private @@ -34,7 +34,7 @@ ol.renderer.Layer = function(layer) { }; -goog.inherits(ol.renderer.Layer, ol.Observable); +ol.inherits(ol.renderer.Layer, ol.Observable); /** diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index a686d14c78..7b9bf67808 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -35,7 +35,7 @@ ol.RendererType = { */ ol.renderer.Map = function(container, map) { - goog.base(this); + ol.Disposable.call(this); /** @@ -57,7 +57,7 @@ ol.renderer.Map = function(container, map) { this.layerRendererListeners_ = {}; }; -goog.inherits(ol.renderer.Map, ol.Disposable); +ol.inherits(ol.renderer.Map, ol.Disposable); /** diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 62c6bd4018..afe4641703 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -24,7 +24,7 @@ goog.require('ol.webgl.Context'); */ ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) { - goog.base(this, mapRenderer, imageLayer); + ol.renderer.webgl.Layer.call(this, mapRenderer, imageLayer); /** * The last rendered image. @@ -46,7 +46,7 @@ ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) { this.hitTransformationMatrix_ = null; }; -goog.inherits(ol.renderer.webgl.ImageLayer, ol.renderer.webgl.Layer); +ol.inherits(ol.renderer.webgl.ImageLayer, ol.renderer.webgl.Layer); /** diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js index 4cf9928928..16734822f1 100644 --- a/src/ol/renderer/webgl/webgllayerrenderer.js +++ b/src/ol/renderer/webgl/webgllayerrenderer.js @@ -23,7 +23,7 @@ goog.require('ol.webgl.Context'); */ ol.renderer.webgl.Layer = function(mapRenderer, layer) { - goog.base(this, layer); + ol.renderer.Layer.call(this, layer); /** * @protected @@ -79,7 +79,7 @@ ol.renderer.webgl.Layer = function(mapRenderer, layer) { this.defaultLocations_ = null; }; -goog.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer); +ol.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer); /** diff --git a/src/ol/renderer/webgl/webglmapdefaultshader.js b/src/ol/renderer/webgl/webglmapdefaultshader.js index 1e5baea022..b9b963fe3b 100644 --- a/src/ol/renderer/webgl/webglmapdefaultshader.js +++ b/src/ol/renderer/webgl/webglmapdefaultshader.js @@ -13,9 +13,9 @@ goog.require('ol.webgl.shader'); * @struct */ ol.renderer.webgl.map.shader.DefaultFragment = function() { - goog.base(this, ol.renderer.webgl.map.shader.DefaultFragment.SOURCE); + ol.webgl.shader.Fragment.call(this, ol.renderer.webgl.map.shader.DefaultFragment.SOURCE); }; -goog.inherits(ol.renderer.webgl.map.shader.DefaultFragment, ol.webgl.shader.Fragment); +ol.inherits(ol.renderer.webgl.map.shader.DefaultFragment, ol.webgl.shader.Fragment); goog.addSingletonGetter(ol.renderer.webgl.map.shader.DefaultFragment); @@ -48,9 +48,9 @@ ol.renderer.webgl.map.shader.DefaultFragment.SOURCE = goog.DEBUG ? * @struct */ ol.renderer.webgl.map.shader.DefaultVertex = function() { - goog.base(this, ol.renderer.webgl.map.shader.DefaultVertex.SOURCE); + ol.webgl.shader.Vertex.call(this, ol.renderer.webgl.map.shader.DefaultVertex.SOURCE); }; -goog.inherits(ol.renderer.webgl.map.shader.DefaultVertex, ol.webgl.shader.Vertex); +ol.inherits(ol.renderer.webgl.map.shader.DefaultVertex, ol.webgl.shader.Vertex); goog.addSingletonGetter(ol.renderer.webgl.map.shader.DefaultVertex); diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index cf6476836c..c3e16f1368 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -41,7 +41,7 @@ goog.require('ol.webgl.WebGLContextEventType'); */ ol.renderer.webgl.Map = function(container, map) { - goog.base(this, container, map); + ol.renderer.Map.call(this, container, map); /** * @private @@ -171,7 +171,7 @@ ol.renderer.webgl.Map = function(container, map) { this.initializeGL_(); }; -goog.inherits(ol.renderer.webgl.Map, ol.renderer.Map); +ol.inherits(ol.renderer.webgl.Map, ol.renderer.Map); /** @@ -304,7 +304,7 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() { }); } this.context_.dispose(); - goog.base(this, 'disposeInternal'); + ol.renderer.Map.prototype.disposeInternal.call(this); }; diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index 609dfcd92f..407a18d184 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -30,7 +30,7 @@ goog.require('ol.webgl.Buffer'); */ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) { - goog.base(this, mapRenderer, tileLayer); + ol.renderer.webgl.Layer.call(this, mapRenderer, tileLayer); /** * @private @@ -87,7 +87,7 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) { this.tmpSize_ = [0, 0]; }; -goog.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer); +ol.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer); /** @@ -96,7 +96,7 @@ goog.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer); ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() { var context = this.mapRenderer.getContext(); context.deleteBuffer(this.renderArrayBuffer_); - goog.base(this, 'disposeInternal'); + ol.renderer.webgl.Layer.prototype.disposeInternal.call(this); }; @@ -140,7 +140,7 @@ ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = function(source, * @inheritDoc */ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() { - goog.base(this, 'handleWebGLContextLost'); + ol.renderer.webgl.Layer.prototype.handleWebGLContextLost.call(this); this.locations_ = null; }; diff --git a/src/ol/renderer/webgl/webgltilelayershader.js b/src/ol/renderer/webgl/webgltilelayershader.js index 0369aa35ec..db10984478 100644 --- a/src/ol/renderer/webgl/webgltilelayershader.js +++ b/src/ol/renderer/webgl/webgltilelayershader.js @@ -13,9 +13,9 @@ goog.require('ol.webgl.shader'); * @struct */ ol.renderer.webgl.tilelayer.shader.Fragment = function() { - goog.base(this, ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE); + ol.webgl.shader.Fragment.call(this, ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE); }; -goog.inherits(ol.renderer.webgl.tilelayer.shader.Fragment, ol.webgl.shader.Fragment); +ol.inherits(ol.renderer.webgl.tilelayer.shader.Fragment, ol.webgl.shader.Fragment); goog.addSingletonGetter(ol.renderer.webgl.tilelayer.shader.Fragment); @@ -48,9 +48,9 @@ ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE = goog.DEBUG ? * @struct */ ol.renderer.webgl.tilelayer.shader.Vertex = function() { - goog.base(this, ol.renderer.webgl.tilelayer.shader.Vertex.SOURCE); + ol.webgl.shader.Vertex.call(this, ol.renderer.webgl.tilelayer.shader.Vertex.SOURCE); }; -goog.inherits(ol.renderer.webgl.tilelayer.shader.Vertex, ol.webgl.shader.Vertex); +ol.inherits(ol.renderer.webgl.tilelayer.shader.Vertex, ol.webgl.shader.Vertex); goog.addSingletonGetter(ol.renderer.webgl.tilelayer.shader.Vertex); diff --git a/src/ol/renderer/webgl/webglvectorlayerrenderer.js b/src/ol/renderer/webgl/webglvectorlayerrenderer.js index abdaffb10c..482bfa11af 100644 --- a/src/ol/renderer/webgl/webglvectorlayerrenderer.js +++ b/src/ol/renderer/webgl/webglvectorlayerrenderer.js @@ -19,7 +19,7 @@ goog.require('ol.vec.Mat4'); */ ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) { - goog.base(this, mapRenderer, vectorLayer); + ol.renderer.webgl.Layer.call(this, mapRenderer, vectorLayer); /** * @private @@ -65,7 +65,7 @@ ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) { this.layerState_ = null; }; -goog.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer); +ol.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer); /** @@ -95,7 +95,7 @@ ol.renderer.webgl.VectorLayer.prototype.disposeInternal = function() { replayGroup.getDeleteResourcesFunction(context)(); this.replayGroup_ = null; } - goog.base(this, 'disposeInternal'); + ol.renderer.webgl.Layer.prototype.disposeInternal.call(this); }; diff --git a/src/ol/reproj/image.js b/src/ol/reproj/image.js index 8264187dfe..b5741f1651 100644 --- a/src/ol/reproj/image.js +++ b/src/ol/reproj/image.js @@ -108,10 +108,10 @@ ol.reproj.Image = function(sourceProj, targetProj, attributions = this.sourceImage_.getAttributions(); } - goog.base(this, targetExtent, targetResolution, this.sourcePixelRatio_, + ol.ImageBase.call(this, targetExtent, targetResolution, this.sourcePixelRatio_, state, attributions); }; -goog.inherits(ol.reproj.Image, ol.ImageBase); +ol.inherits(ol.reproj.Image, ol.ImageBase); /** @@ -121,7 +121,7 @@ ol.reproj.Image.prototype.disposeInternal = function() { if (this.state == ol.ImageState.LOADING) { this.unlistenSource_(); } - goog.base(this, 'disposeInternal'); + ol.ImageBase.prototype.disposeInternal.call(this); }; diff --git a/src/ol/reproj/tile.js b/src/ol/reproj/tile.js index 2950c4cb1c..f2a4b56a8e 100644 --- a/src/ol/reproj/tile.js +++ b/src/ol/reproj/tile.js @@ -38,7 +38,7 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid, pixelRatio, gutter, getTileFunction, opt_errorThreshold, opt_renderEdges) { - goog.base(this, tileCoord, ol.TileState.IDLE); + ol.Tile.call(this, tileCoord, ol.TileState.IDLE); /** * @private @@ -202,7 +202,7 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid, } } }; -goog.inherits(ol.reproj.Tile, ol.Tile); +ol.inherits(ol.reproj.Tile, ol.Tile); /** @@ -212,7 +212,7 @@ ol.reproj.Tile.prototype.disposeInternal = function() { if (this.state == ol.TileState.LOADING) { this.unlistenSources_(); } - goog.base(this, 'disposeInternal'); + ol.Tile.prototype.disposeInternal.call(this); }; diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index 39377efea4..02595e2596 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -23,7 +23,7 @@ goog.require('ol.tilecoord'); */ ol.source.BingMaps = function(options) { - goog.base(this, { + ol.source.TileImage.call(this, { cacheSize: options.cacheSize, crossOrigin: 'anonymous', opaque: true, @@ -54,7 +54,7 @@ ol.source.BingMaps = function(options) { 'jsonp'); }; -goog.inherits(ol.source.BingMaps, ol.source.TileImage); +ol.inherits(ol.source.BingMaps, ol.source.TileImage); /** diff --git a/src/ol/source/cartodb.js b/src/ol/source/cartodb.js index 0dd0f44a1e..5b6bbf8954 100644 --- a/src/ol/source/cartodb.js +++ b/src/ol/source/cartodb.js @@ -40,7 +40,7 @@ ol.source.CartoDB = function(options) { */ this.templateCache_ = {}; - goog.base(this, { + ol.source.XYZ.call(this, { attributions: options.attributions, cacheSize: options.cacheSize, crossOrigin: options.crossOrigin, @@ -53,7 +53,7 @@ ol.source.CartoDB = function(options) { }); this.initializeMap_(); }; -goog.inherits(ol.source.CartoDB, ol.source.XYZ); +ol.inherits(ol.source.CartoDB, ol.source.XYZ); /** diff --git a/src/ol/source/clustersource.js b/src/ol/source/clustersource.js index d01f64e3c7..73b785e3cf 100644 --- a/src/ol/source/clustersource.js +++ b/src/ol/source/clustersource.js @@ -24,7 +24,7 @@ goog.require('ol.source.Vector'); * @api */ ol.source.Cluster = function(options) { - goog.base(this, { + ol.source.Vector.call(this, { attributions: options.attributions, extent: options.extent, logo: options.logo, @@ -70,7 +70,7 @@ ol.source.Cluster = function(options) { this.source_.on(ol.events.EventType.CHANGE, ol.source.Cluster.prototype.onSourceChange_, this); }; -goog.inherits(ol.source.Cluster, ol.source.Vector); +ol.inherits(ol.source.Cluster, ol.source.Vector); /** diff --git a/src/ol/source/imagearcgisrestsource.js b/src/ol/source/imagearcgisrestsource.js index 79ec5f2289..df4eb747e8 100644 --- a/src/ol/source/imagearcgisrestsource.js +++ b/src/ol/source/imagearcgisrestsource.js @@ -31,7 +31,7 @@ ol.source.ImageArcGISRest = function(opt_options) { var options = opt_options || {}; - goog.base(this, { + ol.source.Image.call(this, { attributions: options.attributions, logo: options.logo, projection: options.projection, @@ -91,7 +91,7 @@ ol.source.ImageArcGISRest = function(opt_options) { this.ratio_ = options.ratio !== undefined ? options.ratio : 1.5; }; -goog.inherits(ol.source.ImageArcGISRest, ol.source.Image); +ol.inherits(ol.source.ImageArcGISRest, ol.source.Image); /** diff --git a/src/ol/source/imagecanvassource.js b/src/ol/source/imagecanvassource.js index 1248a74b94..83d66a3fd4 100644 --- a/src/ol/source/imagecanvassource.js +++ b/src/ol/source/imagecanvassource.js @@ -16,7 +16,7 @@ goog.require('ol.source.Image'); */ ol.source.ImageCanvas = function(options) { - goog.base(this, { + ol.source.Image.call(this, { attributions: options.attributions, logo: options.logo, projection: options.projection, @@ -50,7 +50,7 @@ ol.source.ImageCanvas = function(options) { options.ratio : 1.5; }; -goog.inherits(ol.source.ImageCanvas, ol.source.Image); +ol.inherits(ol.source.ImageCanvas, ol.source.Image); /** diff --git a/src/ol/source/imagemapguidesource.js b/src/ol/source/imagemapguidesource.js index 90aeec83bc..bf64da371c 100644 --- a/src/ol/source/imagemapguidesource.js +++ b/src/ol/source/imagemapguidesource.js @@ -21,7 +21,7 @@ goog.require('ol.source.Image'); */ ol.source.ImageMapGuide = function(options) { - goog.base(this, { + ol.source.Image.call(this, { projection: options.projection, resolutions: options.resolutions }); @@ -98,7 +98,7 @@ ol.source.ImageMapGuide = function(options) { this.renderedRevision_ = 0; }; -goog.inherits(ol.source.ImageMapGuide, ol.source.Image); +ol.inherits(ol.source.ImageMapGuide, ol.source.Image); /** diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js index 15bf9d10ad..27e1842d38 100644 --- a/src/ol/source/imagesource.js +++ b/src/ol/source/imagesource.js @@ -24,7 +24,7 @@ goog.require('ol.source.Source'); */ ol.source.Image = function(options) { - goog.base(this, { + ol.source.Source.call(this, { attributions: options.attributions, extent: options.extent, logo: options.logo, @@ -59,7 +59,7 @@ ol.source.Image = function(options) { this.reprojectedRevision_ = 0; }; -goog.inherits(ol.source.Image, ol.source.Source); +ol.inherits(ol.source.Image, ol.source.Source); /** @@ -192,7 +192,7 @@ ol.source.Image.defaultImageLoadFunction = function(image, src) { */ ol.source.ImageEvent = function(type, image) { - goog.base(this, type); + ol.events.Event.call(this, type); /** * The image related to the event. @@ -202,7 +202,7 @@ ol.source.ImageEvent = function(type, image) { this.image = image; }; -goog.inherits(ol.source.ImageEvent, ol.events.Event); +ol.inherits(ol.source.ImageEvent, ol.events.Event); /** diff --git a/src/ol/source/imagestaticsource.js b/src/ol/source/imagestaticsource.js index bcff1b7992..bfe00b5bff 100644 --- a/src/ol/source/imagestaticsource.js +++ b/src/ol/source/imagestaticsource.js @@ -29,7 +29,7 @@ ol.source.ImageStatic = function(options) { options.imageLoadFunction !== undefined ? options.imageLoadFunction : ol.source.Image.defaultImageLoadFunction; - goog.base(this, { + ol.source.Image.call(this, { attributions: options.attributions, logo: options.logo, projection: ol.proj.get(options.projection) @@ -52,7 +52,7 @@ ol.source.ImageStatic = function(options) { this.handleImageChange, this); }; -goog.inherits(ol.source.ImageStatic, ol.source.Image); +ol.inherits(ol.source.ImageStatic, ol.source.Image); /** @@ -93,5 +93,5 @@ ol.source.ImageStatic.prototype.handleImageChange = function(evt) { this.image_.setImage(canvas); } } - goog.base(this, 'handleImageChange', evt); + ol.source.Image.prototype.handleImageChange.call(this, evt); }; diff --git a/src/ol/source/imagevectorsource.js b/src/ol/source/imagevectorsource.js index 228fa8e905..8d3e8ea201 100644 --- a/src/ol/source/imagevectorsource.js +++ b/src/ol/source/imagevectorsource.js @@ -63,7 +63,7 @@ ol.source.ImageVector = function(options) { */ this.replayGroup_ = null; - goog.base(this, { + ol.source.ImageCanvas.call(this, { attributions: options.attributions, canvasFunction: this.canvasFunctionInternal_.bind(this), logo: options.logo, @@ -93,7 +93,7 @@ ol.source.ImageVector = function(options) { this.handleSourceChange_, this); }; -goog.inherits(ol.source.ImageVector, ol.source.ImageCanvas); +ol.inherits(ol.source.ImageVector, ol.source.ImageCanvas); /** diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js index b0c0db0831..533d70ed30 100644 --- a/src/ol/source/imagewmssource.js +++ b/src/ol/source/imagewmssource.js @@ -31,7 +31,7 @@ ol.source.ImageWMS = function(opt_options) { var options = opt_options || {}; - goog.base(this, { + ol.source.Image.call(this, { attributions: options.attributions, logo: options.logo, projection: options.projection, @@ -109,7 +109,7 @@ ol.source.ImageWMS = function(opt_options) { this.ratio_ = options.ratio !== undefined ? options.ratio : 1.5; }; -goog.inherits(ol.source.ImageWMS, ol.source.Image); +ol.inherits(ol.source.ImageWMS, ol.source.Image); /** diff --git a/src/ol/source/mapquestsource.js b/src/ol/source/mapquestsource.js index 860f647e1e..65981ec744 100644 --- a/src/ol/source/mapquestsource.js +++ b/src/ol/source/mapquestsource.js @@ -34,7 +34,7 @@ ol.source.MapQuest = function(opt_options) { 'https://otile{1-4}-s.mqcdn.com/tiles/1.0.0/' + this.layer_ + '/{z}/{x}/{y}.jpg'; - goog.base(this, { + ol.source.XYZ.call(this, { attributions: layerConfig.attributions, cacheSize: options.cacheSize, crossOrigin: 'anonymous', @@ -47,7 +47,7 @@ ol.source.MapQuest = function(opt_options) { }); }; -goog.inherits(ol.source.MapQuest, ol.source.XYZ); +ol.inherits(ol.source.MapQuest, ol.source.XYZ); /** diff --git a/src/ol/source/osmsource.js b/src/ol/source/osmsource.js index c0d6800ef9..c1693c79d4 100644 --- a/src/ol/source/osmsource.js +++ b/src/ol/source/osmsource.js @@ -30,7 +30,7 @@ ol.source.OSM = function(opt_options) { var url = options.url !== undefined ? options.url : 'https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png'; - goog.base(this, { + ol.source.XYZ.call(this, { attributions: attributions, cacheSize: options.cacheSize, crossOrigin: crossOrigin, @@ -43,7 +43,7 @@ ol.source.OSM = function(opt_options) { }); }; -goog.inherits(ol.source.OSM, ol.source.XYZ); +ol.inherits(ol.source.OSM, ol.source.XYZ); /** diff --git a/src/ol/source/rastersource.js b/src/ol/source/rastersource.js index 1dcaa630ac..49bef33e23 100644 --- a/src/ol/source/rastersource.js +++ b/src/ol/source/rastersource.js @@ -132,14 +132,14 @@ ol.source.Raster = function(options) { wantedTiles: {} }; - goog.base(this, {}); + ol.source.Image.call(this, {}); if (options.operation !== undefined) { this.setOperation(options.operation, options.lib); } }; -goog.inherits(ol.source.Raster, ol.source.Image); +ol.inherits(ol.source.Raster, ol.source.Image); /** @@ -458,7 +458,7 @@ ol.source.Raster.createTileRenderer_ = function(source) { * @param {Object} data An object made available to operations. */ ol.source.RasterEvent = function(type, frameState, data) { - goog.base(this, type); + ol.events.Event.call(this, type); /** * The raster extent. @@ -483,7 +483,7 @@ ol.source.RasterEvent = function(type, frameState, data) { this.data = data; }; -goog.inherits(ol.source.RasterEvent, ol.events.Event); +ol.inherits(ol.source.RasterEvent, ol.events.Event); /** diff --git a/src/ol/source/source.js b/src/ol/source/source.js index bdbdefe8c2..0cce27404a 100644 --- a/src/ol/source/source.js +++ b/src/ol/source/source.js @@ -34,7 +34,7 @@ ol.source.State = { */ ol.source.Source = function(options) { - goog.base(this); + ol.Object.call(this); /** * @private @@ -68,7 +68,7 @@ ol.source.Source = function(options) { this.wrapX_ = options.wrapX !== undefined ? options.wrapX : false; }; -goog.inherits(ol.source.Source, ol.Object); +ol.inherits(ol.source.Source, ol.Object); /** * Turns various ways of defining an attribution to an array of `ol.Attributions`. diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamensource.js index 1137abad12..13c2635576 100644 --- a/src/ol/source/stamensource.js +++ b/src/ol/source/stamensource.js @@ -101,7 +101,7 @@ ol.source.Stamen = function(options) { 'https://stamen-tiles-{a-d}.a.ssl.fastly.net/' + options.layer + '/{z}/{x}/{y}.' + layerConfig.extension; - goog.base(this, { + ol.source.XYZ.call(this, { attributions: ol.source.Stamen.ATTRIBUTIONS, cacheSize: options.cacheSize, crossOrigin: 'anonymous', @@ -114,7 +114,7 @@ ol.source.Stamen = function(options) { }); }; -goog.inherits(ol.source.Stamen, ol.source.XYZ); +ol.inherits(ol.source.Stamen, ol.source.XYZ); /** diff --git a/src/ol/source/tilearcgisrestsource.js b/src/ol/source/tilearcgisrestsource.js index a2c01ef545..a3da3253f6 100644 --- a/src/ol/source/tilearcgisrestsource.js +++ b/src/ol/source/tilearcgisrestsource.js @@ -30,7 +30,7 @@ ol.source.TileArcGISRest = function(opt_options) { var options = opt_options || {}; - goog.base(this, { + ol.source.TileImage.call(this, { attributions: options.attributions, cacheSize: options.cacheSize, crossOrigin: options.crossOrigin, @@ -57,7 +57,7 @@ ol.source.TileArcGISRest = function(opt_options) { this.tmpExtent_ = ol.extent.createEmpty(); }; -goog.inherits(ol.source.TileArcGISRest, ol.source.TileImage); +ol.inherits(ol.source.TileArcGISRest, ol.source.TileImage); /** diff --git a/src/ol/source/tiledebugsource.js b/src/ol/source/tiledebugsource.js index 9db0a6a542..575d7e04fa 100644 --- a/src/ol/source/tiledebugsource.js +++ b/src/ol/source/tiledebugsource.js @@ -17,7 +17,7 @@ goog.require('ol.source.Tile'); */ ol.DebugTile_ = function(tileCoord, tileSize, text) { - goog.base(this, tileCoord, ol.TileState.LOADED); + ol.Tile.call(this, tileCoord, ol.TileState.LOADED); /** * @private @@ -38,7 +38,7 @@ ol.DebugTile_ = function(tileCoord, tileSize, text) { this.canvasByContext_ = {}; }; -goog.inherits(ol.DebugTile_, ol.Tile); +ol.inherits(ol.DebugTile_, ol.Tile); /** @@ -87,7 +87,7 @@ ol.DebugTile_.prototype.getImage = function(opt_context) { */ ol.source.TileDebug = function(options) { - goog.base(this, { + ol.source.Tile.call(this, { opaque: false, projection: options.projection, tileGrid: options.tileGrid, @@ -95,7 +95,7 @@ ol.source.TileDebug = function(options) { }); }; -goog.inherits(ol.source.TileDebug, ol.source.Tile); +ol.inherits(ol.source.TileDebug, ol.source.Tile); /** diff --git a/src/ol/source/tileimagesource.js b/src/ol/source/tileimagesource.js index c552c52068..f25b0cb96b 100644 --- a/src/ol/source/tileimagesource.js +++ b/src/ol/source/tileimagesource.js @@ -23,7 +23,7 @@ goog.require('ol.source.UrlTile'); */ ol.source.TileImage = function(options) { - goog.base(this, { + ol.source.UrlTile.call(this, { attributions: options.attributions, cacheSize: options.cacheSize, extent: options.extent, @@ -80,7 +80,7 @@ ol.source.TileImage = function(options) { */ this.renderReprojectionEdges_ = false; }; -goog.inherits(ol.source.TileImage, ol.source.UrlTile); +ol.inherits(ol.source.TileImage, ol.source.UrlTile); /** @@ -88,7 +88,7 @@ goog.inherits(ol.source.TileImage, ol.source.UrlTile); */ ol.source.TileImage.prototype.canExpireCache = function() { if (!ol.ENABLE_RASTER_REPROJECTION) { - return goog.base(this, 'canExpireCache'); + return ol.source.UrlTile.prototype.canExpireCache.call(this); } if (this.tileCache.canExpireCache()) { return true; @@ -108,7 +108,7 @@ ol.source.TileImage.prototype.canExpireCache = function() { */ ol.source.TileImage.prototype.expireCache = function(projection, usedTiles) { if (!ol.ENABLE_RASTER_REPROJECTION) { - goog.base(this, 'expireCache', projection, usedTiles); + ol.source.UrlTile.prototype.expireCache.call(this, projection, usedTiles); return; } var usedTileCache = this.getTileCacheForProjection(projection); @@ -153,7 +153,7 @@ ol.source.TileImage.prototype.getOpaque = function(projection) { !ol.proj.equivalent(this.getProjection(), projection)) { return false; } else { - return goog.base(this, 'getOpaque', projection); + return ol.source.UrlTile.prototype.getOpaque.call(this, projection); } }; @@ -163,7 +163,7 @@ ol.source.TileImage.prototype.getOpaque = function(projection) { */ ol.source.TileImage.prototype.getTileGridForProjection = function(projection) { if (!ol.ENABLE_RASTER_REPROJECTION) { - return goog.base(this, 'getTileGridForProjection', projection); + return ol.source.UrlTile.prototype.getTileGridForProjection.call(this, projection); } var thisProj = this.getProjection(); if (this.tileGrid && @@ -185,7 +185,7 @@ ol.source.TileImage.prototype.getTileGridForProjection = function(projection) { */ ol.source.TileImage.prototype.getTileCacheForProjection = function(projection) { if (!ol.ENABLE_RASTER_REPROJECTION) { - return goog.base(this, 'getTileCacheForProjection', projection); + return ol.source.UrlTile.prototype.getTileCacheForProjection.call(this, projection); } var thisProj = this.getProjection(); if (!thisProj || ol.proj.equivalent(thisProj, projection)) { diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js index c14f9b46cd..0edb8d1b3a 100644 --- a/src/ol/source/tilejsonsource.js +++ b/src/ol/source/tilejsonsource.js @@ -35,7 +35,7 @@ ol.source.TileJSON = function(options) { */ this.tileJSON_ = null; - goog.base(this, { + ol.source.TileImage.call(this, { attributions: options.attributions, cacheSize: options.cacheSize, crossOrigin: options.crossOrigin, @@ -58,7 +58,7 @@ ol.source.TileJSON = function(options) { } }; -goog.inherits(ol.source.TileJSON, ol.source.TileImage); +ol.inherits(ol.source.TileJSON, ol.source.TileImage); /** diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js index f397a3f4f5..79c76f75c3 100644 --- a/src/ol/source/tilesource.js +++ b/src/ol/source/tilesource.js @@ -27,7 +27,7 @@ goog.require('ol.tilegrid.TileGrid'); */ ol.source.Tile = function(options) { - goog.base(this, { + ol.source.Source.call(this, { attributions: options.attributions, extent: options.extent, logo: options.logo, @@ -74,7 +74,7 @@ ol.source.Tile = function(options) { this.key_ = ''; }; -goog.inherits(ol.source.Tile, ol.source.Source); +ol.inherits(ol.source.Tile, ol.source.Source); /** @@ -322,7 +322,7 @@ ol.source.Tile.prototype.useTile = ol.nullFunction; */ ol.source.TileEvent = function(type, tile) { - goog.base(this, type); + ol.events.Event.call(this, type); /** * The tile related to the event. @@ -332,7 +332,7 @@ ol.source.TileEvent = function(type, tile) { this.tile = tile; }; -goog.inherits(ol.source.TileEvent, ol.events.Event); +ol.inherits(ol.source.TileEvent, ol.events.Event); /** diff --git a/src/ol/source/tileutfgridsource.js b/src/ol/source/tileutfgridsource.js index a9faa67a82..a9a8564062 100644 --- a/src/ol/source/tileutfgridsource.js +++ b/src/ol/source/tileutfgridsource.js @@ -25,7 +25,7 @@ goog.require('ol.source.Tile'); * @api */ ol.source.TileUTFGrid = function(options) { - goog.base(this, { + ol.source.Tile.call(this, { projection: ol.proj.get('EPSG:3857'), state: ol.source.State.LOADING }); @@ -72,7 +72,7 @@ ol.source.TileUTFGrid = function(options) { goog.asserts.fail('Either url or tileJSON options must be provided'); } }; -goog.inherits(ol.source.TileUTFGrid, ol.source.Tile); +ol.inherits(ol.source.TileUTFGrid, ol.source.Tile); /** @@ -270,7 +270,7 @@ ol.source.TileUTFGrid.prototype.useTile = function(z, x, y) { */ ol.source.TileUTFGridTile_ = function(tileCoord, state, src, extent, preemptive, jsonp) { - goog.base(this, tileCoord, state); + ol.Tile.call(this, tileCoord, state); /** * @private @@ -316,7 +316,7 @@ ol.source.TileUTFGridTile_ = function(tileCoord, state, src, extent, preemptive, this.jsonp_ = jsonp; }; -goog.inherits(ol.source.TileUTFGridTile_, ol.Tile); +ol.inherits(ol.source.TileUTFGridTile_, ol.Tile); /** diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js index 3d43f097c9..b9a9d78215 100644 --- a/src/ol/source/tilewmssource.js +++ b/src/ol/source/tilewmssource.js @@ -36,7 +36,7 @@ ol.source.TileWMS = function(opt_options) { var transparent = 'TRANSPARENT' in params ? params['TRANSPARENT'] : true; - goog.base(this, { + ol.source.TileImage.call(this, { attributions: options.attributions, cacheSize: options.cacheSize, crossOrigin: options.crossOrigin, @@ -99,7 +99,7 @@ ol.source.TileWMS = function(opt_options) { this.setKey(this.getKeyForParams_()); }; -goog.inherits(ol.source.TileWMS, ol.source.TileImage); +ol.inherits(ol.source.TileWMS, ol.source.TileImage); /** @@ -180,7 +180,7 @@ ol.source.TileWMS.prototype.getGutterInternal = function() { * @inheritDoc */ ol.source.TileWMS.prototype.getKeyZXY = function(z, x, y) { - return this.coordKeyPrefix_ + goog.base(this, 'getKeyZXY', z, x, y); + return this.coordKeyPrefix_ + ol.source.TileImage.prototype.getKeyZXY.call(this, z, x, y); }; diff --git a/src/ol/source/urltilesource.js b/src/ol/source/urltilesource.js index fd359b1c29..69e1b7c0ef 100644 --- a/src/ol/source/urltilesource.js +++ b/src/ol/source/urltilesource.js @@ -18,7 +18,7 @@ goog.require('ol.source.TileEvent'); */ ol.source.UrlTile = function(options) { - goog.base(this, { + ol.source.Tile.call(this, { attributions: options.attributions, cacheSize: options.cacheSize, extent: options.extent, @@ -61,7 +61,7 @@ ol.source.UrlTile = function(options) { } }; -goog.inherits(ol.source.UrlTile, ol.source.Tile); +ol.inherits(ol.source.UrlTile, ol.source.Tile); /** diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js index 458fe99575..7cce6719a4 100644 --- a/src/ol/source/vectorsource.js +++ b/src/ol/source/vectorsource.js @@ -76,7 +76,7 @@ ol.source.Vector = function(opt_options) { var options = opt_options || {}; - goog.base(this, { + ol.source.Source.call(this, { attributions: options.attributions, logo: options.logo, projection: undefined, @@ -183,7 +183,7 @@ ol.source.Vector = function(opt_options) { } }; -goog.inherits(ol.source.Vector, ol.source.Source); +ol.inherits(ol.source.Vector, ol.source.Source); /** @@ -888,7 +888,7 @@ ol.source.Vector.prototype.removeFromIdIndex_ = function(feature) { */ ol.source.VectorEvent = function(type, opt_feature) { - goog.base(this, type); + ol.events.Event.call(this, type); /** * The feature being added or removed. @@ -898,4 +898,4 @@ ol.source.VectorEvent = function(type, opt_feature) { this.feature = opt_feature; }; -goog.inherits(ol.source.VectorEvent, ol.events.Event); +ol.inherits(ol.source.VectorEvent, ol.events.Event); diff --git a/src/ol/source/vectortilesource.js b/src/ol/source/vectortilesource.js index 8b7a57adba..b3fc3b5ee3 100644 --- a/src/ol/source/vectortilesource.js +++ b/src/ol/source/vectortilesource.js @@ -27,7 +27,7 @@ goog.require('ol.source.UrlTile'); */ ol.source.VectorTile = function(options) { - goog.base(this, { + ol.source.UrlTile.call(this, { attributions: options.attributions, cacheSize: options.cacheSize !== undefined ? options.cacheSize : 128, extent: options.extent, @@ -59,7 +59,7 @@ ol.source.VectorTile = function(options) { this.tileClass = options.tileClass ? options.tileClass : ol.VectorTile; }; -goog.inherits(ol.source.VectorTile, ol.source.UrlTile); +ol.inherits(ol.source.VectorTile, ol.source.UrlTile); /** diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index 74d67169a3..ebb71b6360 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -163,7 +163,7 @@ ol.source.WMTS = function(options) { urls.map(createFromWMTSTemplate)) : ol.TileUrlFunction.nullTileUrlFunction; - goog.base(this, { + ol.source.TileImage.call(this, { attributions: options.attributions, cacheSize: options.cacheSize, crossOrigin: options.crossOrigin, @@ -182,7 +182,7 @@ ol.source.WMTS = function(options) { this.setKey(this.getKeyForDimensions_()); }; -goog.inherits(ol.source.WMTS, ol.source.TileImage); +ol.inherits(ol.source.WMTS, ol.source.TileImage); /** diff --git a/src/ol/source/xyzsource.js b/src/ol/source/xyzsource.js index 1091ada585..0bf11bdbcb 100644 --- a/src/ol/source/xyzsource.js +++ b/src/ol/source/xyzsource.js @@ -38,7 +38,7 @@ ol.source.XYZ = function(opt_options) { tileSize: options.tileSize }); - goog.base(this, { + ol.source.TileImage.call(this, { attributions: options.attributions, cacheSize: options.cacheSize, crossOrigin: options.crossOrigin, @@ -56,4 +56,4 @@ ol.source.XYZ = function(opt_options) { }); }; -goog.inherits(ol.source.XYZ, ol.source.TileImage); +ol.inherits(ol.source.XYZ, ol.source.TileImage); diff --git a/src/ol/source/zoomifysource.js b/src/ol/source/zoomifysource.js index af3547376b..390a3e1535 100644 --- a/src/ol/source/zoomifysource.js +++ b/src/ol/source/zoomifysource.js @@ -118,7 +118,7 @@ ol.source.Zoomify = function(opt_options) { } } - goog.base(this, { + ol.source.TileImage.call(this, { attributions: options.attributions, cacheSize: options.cacheSize, crossOrigin: options.crossOrigin, @@ -130,7 +130,7 @@ ol.source.Zoomify = function(opt_options) { }); }; -goog.inherits(ol.source.Zoomify, ol.source.TileImage); +ol.inherits(ol.source.Zoomify, ol.source.TileImage); /** @@ -146,7 +146,7 @@ goog.inherits(ol.source.Zoomify, ol.source.TileImage); ol.source.ZoomifyTile_ = function( tileCoord, state, src, crossOrigin, tileLoadFunction) { - goog.base(this, tileCoord, state, src, crossOrigin, tileLoadFunction); + ol.ImageTile.call(this, tileCoord, state, src, crossOrigin, tileLoadFunction); /** * @private @@ -156,7 +156,7 @@ ol.source.ZoomifyTile_ = function( this.zoomifyImageByContext_ = {}; }; -goog.inherits(ol.source.ZoomifyTile_, ol.ImageTile); +ol.inherits(ol.source.ZoomifyTile_, ol.ImageTile); /** @@ -169,7 +169,7 @@ ol.source.ZoomifyTile_.prototype.getImage = function(opt_context) { if (key in this.zoomifyImageByContext_) { return this.zoomifyImageByContext_[key]; } else { - var image = goog.base(this, 'getImage', opt_context); + var image = ol.ImageTile.prototype.getImage.call(this, opt_context); if (this.state == ol.TileState.LOADED) { if (image.width == tileSize && image.height == tileSize) { this.zoomifyImageByContext_[key] = image; diff --git a/src/ol/style/circlestyle.js b/src/ol/style/circlestyle.js index 9d8c689c23..cef610dfee 100644 --- a/src/ol/style/circlestyle.js +++ b/src/ol/style/circlestyle.js @@ -100,7 +100,7 @@ ol.style.Circle = function(opt_options) { var snapToPixel = options.snapToPixel !== undefined ? options.snapToPixel : true; - goog.base(this, { + ol.style.Image.call(this, { opacity: 1, rotateWithView: false, rotation: 0, @@ -109,7 +109,7 @@ ol.style.Circle = function(opt_options) { }); }; -goog.inherits(ol.style.Circle, ol.style.Image); +ol.inherits(ol.style.Circle, ol.style.Image); /** diff --git a/src/ol/style/iconstyle.js b/src/ol/style/iconstyle.js index aa0d73899d..7198394cc8 100644 --- a/src/ol/style/iconstyle.js +++ b/src/ol/style/iconstyle.js @@ -185,7 +185,7 @@ ol.style.Icon = function(opt_options) { var snapToPixel = options.snapToPixel !== undefined ? options.snapToPixel : true; - goog.base(this, { + ol.style.Image.call(this, { opacity: opacity, rotation: rotation, scale: scale, @@ -194,7 +194,7 @@ ol.style.Icon = function(opt_options) { }); }; -goog.inherits(ol.style.Icon, ol.style.Image); +ol.inherits(ol.style.Icon, ol.style.Image); /** @@ -380,7 +380,7 @@ ol.style.Icon.prototype.unlistenImageChange = function(listener, thisArg) { ol.style.IconImage_ = function(image, src, size, crossOrigin, imageState, color) { - goog.base(this); + ol.events.EventTarget.call(this); /** * @private @@ -446,7 +446,7 @@ ol.style.IconImage_ = function(image, src, size, crossOrigin, imageState, } }; -goog.inherits(ol.style.IconImage_, ol.events.EventTarget); +ol.inherits(ol.style.IconImage_, ol.events.EventTarget); /** diff --git a/src/ol/style/regularshapestyle.js b/src/ol/style/regularshapestyle.js index 2a6242ac35..0bd830711a 100644 --- a/src/ol/style/regularshapestyle.js +++ b/src/ol/style/regularshapestyle.js @@ -131,7 +131,7 @@ ol.style.RegularShape = function(options) { var rotateWithView = options.rotateWithView !== undefined ? options.rotateWithView : false; - goog.base(this, { + ol.style.Image.call(this, { opacity: 1, rotateWithView: rotateWithView, rotation: options.rotation !== undefined ? options.rotation : 0, @@ -140,7 +140,7 @@ ol.style.RegularShape = function(options) { }); }; -goog.inherits(ol.style.RegularShape, ol.style.Image); +ol.inherits(ol.style.RegularShape, ol.style.Image); /** diff --git a/src/ol/tile.js b/src/ol/tile.js index c75479acad..cffb053a24 100644 --- a/src/ol/tile.js +++ b/src/ol/tile.js @@ -30,7 +30,7 @@ ol.TileState = { */ ol.Tile = function(tileCoord, state) { - goog.base(this); + ol.events.EventTarget.call(this); /** * @type {ol.TileCoord} @@ -60,7 +60,7 @@ ol.Tile = function(tileCoord, state) { this.key = ''; }; -goog.inherits(ol.Tile, ol.events.EventTarget); +ol.inherits(ol.Tile, ol.events.EventTarget); /** diff --git a/src/ol/tilecache.js b/src/ol/tilecache.js index 8fe0e5ac68..86fd2c4d9c 100644 --- a/src/ol/tilecache.js +++ b/src/ol/tilecache.js @@ -13,7 +13,7 @@ goog.require('ol.tilecoord'); */ ol.TileCache = function(opt_highWaterMark) { - goog.base(this); + ol.structs.LRUCache.call(this); /** * @private @@ -22,7 +22,7 @@ ol.TileCache = function(opt_highWaterMark) { this.highWaterMark_ = opt_highWaterMark !== undefined ? opt_highWaterMark : 2048; }; -goog.inherits(ol.TileCache, ol.structs.LRUCache); +ol.inherits(ol.TileCache, ol.structs.LRUCache); /** diff --git a/src/ol/tilegrid/wmtstilegrid.js b/src/ol/tilegrid/wmtstilegrid.js index 6036c44472..3b914b2097 100644 --- a/src/ol/tilegrid/wmtstilegrid.js +++ b/src/ol/tilegrid/wmtstilegrid.js @@ -29,7 +29,7 @@ ol.tilegrid.WMTS = function(options) { this.matrixIds_ = options.matrixIds; // FIXME: should the matrixIds become optionnal? - goog.base(this, { + ol.tilegrid.TileGrid.call(this, { extent: options.extent, origin: options.origin, origins: options.origins, @@ -40,7 +40,7 @@ ol.tilegrid.WMTS = function(options) { }); }; -goog.inherits(ol.tilegrid.WMTS, ol.tilegrid.TileGrid); +ol.inherits(ol.tilegrid.WMTS, ol.tilegrid.TileGrid); /** diff --git a/src/ol/tilequeue.js b/src/ol/tilequeue.js index 3d81da31e2..be99eece01 100644 --- a/src/ol/tilequeue.js +++ b/src/ol/tilequeue.js @@ -18,7 +18,7 @@ goog.require('ol.structs.PriorityQueue'); */ ol.TileQueue = function(tilePriorityFunction, tileChangeCallback) { - goog.base( + ol.structs.PriorityQueue.call( this, /** * @param {Array} element Element. @@ -54,14 +54,14 @@ ol.TileQueue = function(tilePriorityFunction, tileChangeCallback) { this.tilesLoadingKeys_ = {}; }; -goog.inherits(ol.TileQueue, ol.structs.PriorityQueue); +ol.inherits(ol.TileQueue, ol.structs.PriorityQueue); /** * @inheritDoc */ ol.TileQueue.prototype.enqueue = function(element) { - var added = goog.base(this, 'enqueue', element); + var added = ol.structs.PriorityQueue.prototype.enqueue.call(this, element); if (added) { var tile = element[0]; ol.events.listen(tile, ol.events.EventType.CHANGE, diff --git a/src/ol/vectortile.js b/src/ol/vectortile.js index 1ed6b49341..88a4bc171c 100644 --- a/src/ol/vectortile.js +++ b/src/ol/vectortile.js @@ -17,7 +17,7 @@ goog.require('ol.proj.Projection'); */ ol.VectorTile = function(tileCoord, state, src, format, tileLoadFunction) { - goog.base(this, tileCoord, state); + ol.Tile.call(this, tileCoord, state); /** * @private @@ -76,7 +76,7 @@ ol.VectorTile = function(tileCoord, state, src, format, tileLoadFunction) { this.url_ = src; }; -goog.inherits(ol.VectorTile, ol.Tile); +ol.inherits(ol.VectorTile, ol.Tile); /** diff --git a/src/ol/view.js b/src/ol/view.js index 0f3b050e61..293316271b 100644 --- a/src/ol/view.js +++ b/src/ol/view.js @@ -96,7 +96,7 @@ ol.ViewHint = { * @api stable */ ol.View = function(opt_options) { - goog.base(this); + ol.Object.call(this); var options = opt_options || {}; /** @@ -167,7 +167,7 @@ ol.View = function(opt_options) { options.rotation !== undefined ? options.rotation : 0; this.setProperties(properties); }; -goog.inherits(ol.View, ol.Object); +ol.inherits(ol.View, ol.Object); /** diff --git a/src/ol/webgl/shader.js b/src/ol/webgl/shader.js index 16398a5787..8879553210 100644 --- a/src/ol/webgl/shader.js +++ b/src/ol/webgl/shader.js @@ -51,9 +51,9 @@ ol.webgl.Shader.prototype.isAnimated = ol.functions.FALSE; * @struct */ ol.webgl.shader.Fragment = function(source) { - goog.base(this, source); + ol.webgl.Shader.call(this, source); }; -goog.inherits(ol.webgl.shader.Fragment, ol.webgl.Shader); +ol.inherits(ol.webgl.shader.Fragment, ol.webgl.Shader); /** @@ -71,9 +71,9 @@ ol.webgl.shader.Fragment.prototype.getType = function() { * @struct */ ol.webgl.shader.Vertex = function(source) { - goog.base(this, source); + ol.webgl.Shader.call(this, source); }; -goog.inherits(ol.webgl.shader.Vertex, ol.webgl.Shader); +ol.inherits(ol.webgl.shader.Vertex, ol.webgl.Shader); /** diff --git a/src/ol/webgl/shader.mustache b/src/ol/webgl/shader.mustache index bfab3c44f7..401fffbfd6 100644 --- a/src/ol/webgl/shader.mustache +++ b/src/ol/webgl/shader.mustache @@ -13,9 +13,9 @@ goog.require('ol.webgl.shader'); * @struct */ {{className}}Fragment = function() { - goog.base(this, {{className}}Fragment.SOURCE); + ol.webgl.shader.Fragment.call(this, {{className}}Fragment.SOURCE); }; -goog.inherits({{className}}Fragment, ol.webgl.shader.Fragment); +ol.inherits({{className}}Fragment, ol.webgl.shader.Fragment); goog.addSingletonGetter({{className}}Fragment); @@ -48,9 +48,9 @@ goog.addSingletonGetter({{className}}Fragment); * @struct */ {{className}}Vertex = function() { - goog.base(this, {{className}}Vertex.SOURCE); + ol.webgl.shader.Vertex.call(this, {{className}}Vertex.SOURCE); }; -goog.inherits({{className}}Vertex, ol.webgl.shader.Vertex); +ol.inherits({{className}}Vertex, ol.webgl.shader.Vertex); goog.addSingletonGetter({{className}}Vertex); diff --git a/test/spec/ol/source/tilesource.test.js b/test/spec/ol/source/tilesource.test.js index 110524dcfe..a0b36b95e7 100644 --- a/test/spec/ol/source/tilesource.test.js +++ b/test/spec/ol/source/tilesource.test.js @@ -248,7 +248,7 @@ ol.test.source.TileMock = function(tileStates) { tileSize: 256 }); - goog.base(this, { + ol.source.Tile.call(this, { projection: ol.proj.get('EPSG:4326'), tileGrid: tileGrid }); @@ -258,7 +258,7 @@ ol.test.source.TileMock = function(tileStates) { } }; -goog.inherits(ol.test.source.TileMock, ol.source.Tile); +ol.inherits(ol.test.source.TileMock, ol.source.Tile); /**