Use named exports from ol/index.js

src/ol/format/EsriJSON.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/EsriJSON
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_extent_ from '../extent.js';
@@ -45,7 +45,7 @@ var _ol_format_EsriJSON_ = function(opt_options) {
 
 };
 
-_ol_.inherits(_ol_format_EsriJSON_, _ol_format_JSONFeature_);
+inherits(_ol_format_EsriJSON_, _ol_format_JSONFeature_);
 
 
 /**

src/ol/format/GML2.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/GML2
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_extent_ from '../extent.js';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_GMLBase_ from '../format/GMLBase.js';
@@ -39,7 +39,7 @@ var _ol_format_GML2_ = function(opt_options) {
 
 };
 
-_ol_.inherits(_ol_format_GML2_, _ol_format_GMLBase_);
+inherits(_ol_format_GML2_, _ol_format_GMLBase_);
 
 
 /**

src/ol/format/GML3.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/GML3
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import _ol_extent_ from '../extent.js';
 import _ol_format_Feature_ from '../format/Feature.js';
@@ -76,7 +76,7 @@ var _ol_format_GML3_ = function(opt_options) {
 
 };
 
-_ol_.inherits(_ol_format_GML3_, _ol_format_GMLBase_);
+inherits(_ol_format_GML3_, _ol_format_GMLBase_);
 
 
 /**

src/ol/format/GMLBase.js

@@ -4,7 +4,7 @@
 // FIXME Envelopes should not be treated as geometries! readEnvelope_ is part
 // of GEOMETRY_PARSERS_ and methods using GEOMETRY_PARSERS_ do not expect
 // envelopes/extents, only geometries!
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_format_Feature_ from '../format/Feature.js';
@@ -78,7 +78,7 @@ var _ol_format_GMLBase_ = function(opt_options) {
   _ol_format_XMLFeature_.call(this);
 };
 
-_ol_.inherits(_ol_format_GMLBase_, _ol_format_XMLFeature_);
+inherits(_ol_format_GMLBase_, _ol_format_XMLFeature_);
 
 
 /**

src/ol/format/GPX.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/GPX
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_array_ from '../array.js';
 import _ol_format_Feature_ from '../format/Feature.js';
@@ -41,7 +41,7 @@ var _ol_format_GPX_ = function(opt_options) {
   this.readExtensions_ = options.readExtensions;
 };
 
-_ol_.inherits(_ol_format_GPX_, _ol_format_XMLFeature_);
+inherits(_ol_format_GPX_, _ol_format_XMLFeature_);
 
 
 /**

src/ol/format/GeoJSON.js

@@ -4,7 +4,7 @@
 // TODO: serialize dataProjection as crs member when writing
 // see https://github.com/openlayers/openlayers/issues/2078
 
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_format_Feature_ from '../format/Feature.js';
@@ -62,7 +62,7 @@ var _ol_format_GeoJSON_ = function(opt_options) {
 
 };
 
-_ol_.inherits(_ol_format_GeoJSON_, _ol_format_JSONFeature_);
+inherits(_ol_format_GeoJSON_, _ol_format_JSONFeature_);
 
 
 /**

src/ol/format/IGC.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/IGC
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_IGCZ_ from '../format/IGCZ.js';
@@ -39,7 +39,7 @@ var _ol_format_IGC_ = function(opt_options) {
 
 };
 
-_ol_.inherits(_ol_format_IGC_, _ol_format_TextFeature_);
+inherits(_ol_format_IGC_, _ol_format_TextFeature_);
 
 
 /**

src/ol/format/JSONFeature.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/JSONFeature
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_FormatType_ from '../format/FormatType.js';
 
@@ -19,7 +19,7 @@ var _ol_format_JSONFeature_ = function() {
   _ol_format_Feature_.call(this);
 };
 
-_ol_.inherits(_ol_format_JSONFeature_, _ol_format_Feature_);
+inherits(_ol_format_JSONFeature_, _ol_format_Feature_);
 
 
 /**

src/ol/format/KML.js

@@ -6,7 +6,7 @@
 // FIXME serialize arbitrary feature properties
 // FIXME don't parse style if extractStyles is false
 
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_array_ from '../array.js';
 import _ol_asserts_ from '../asserts.js';
@@ -97,7 +97,7 @@ var _ol_format_KML_ = function(opt_options) {
 
 };
 
-_ol_.inherits(_ol_format_KML_, _ol_format_XMLFeature_);
+inherits(_ol_format_KML_, _ol_format_XMLFeature_);
 
 
 /**

src/ol/format/MVT.js

@@ -3,7 +3,7 @@
  */
 //FIXME Implement projection handling
 
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_ext_PBF_ from 'pbf';
 import _ol_format_Feature_ from '../format/Feature.js';
@@ -79,7 +79,7 @@ var _ol_format_MVT_ = function(opt_options) {
 
 };
 
-_ol_.inherits(_ol_format_MVT_, _ol_format_Feature_);
+inherits(_ol_format_MVT_, _ol_format_Feature_);
 
 
 /**

src/ol/format/OSMXML.js

@@ -2,7 +2,7 @@
  * @module ol/format/OSMXML
  */
 // FIXME add typedef for stack state objects
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_format_Feature_ from '../format/Feature.js';
@@ -33,7 +33,7 @@ var _ol_format_OSMXML_ = function() {
   this.defaultDataProjection = _ol_proj_.get('EPSG:4326');
 };
 
-_ol_.inherits(_ol_format_OSMXML_, _ol_format_XMLFeature_);
+inherits(_ol_format_OSMXML_, _ol_format_XMLFeature_);
 
 
 /**

src/ol/format/OWS.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/OWS
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_format_XLink_ from '../format/XLink.js';
 import _ol_format_XML_ from '../format/XML.js';
 import _ol_format_XSD_ from '../format/XSD.js';
@@ -15,7 +15,7 @@ var _ol_format_OWS_ = function() {
   _ol_format_XML_.call(this);
 };
 
-_ol_.inherits(_ol_format_OWS_, _ol_format_XML_);
+inherits(_ol_format_OWS_, _ol_format_XML_);
 
 
 /**

src/ol/format/Polyline.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/Polyline
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_format_Feature_ from '../format/Feature.js';
@@ -49,7 +49,7 @@ var _ol_format_Polyline_ = function(opt_options) {
     options.geometryLayout : _ol_geom_GeometryLayout_.XY;
 };
 
-_ol_.inherits(_ol_format_Polyline_, _ol_format_TextFeature_);
+inherits(_ol_format_Polyline_, _ol_format_TextFeature_);
 
 
 /**

src/ol/format/TextFeature.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/TextFeature
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_FormatType_ from '../format/FormatType.js';
 
@@ -19,7 +19,7 @@ var _ol_format_TextFeature_ = function() {
   _ol_format_Feature_.call(this);
 };
 
-_ol_.inherits(_ol_format_TextFeature_, _ol_format_Feature_);
+inherits(_ol_format_TextFeature_, _ol_format_Feature_);
 
 
 /**

src/ol/format/TopoJSON.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/TopoJSON
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_JSONFeature_ from '../format/JSONFeature.js';
@@ -49,7 +49,7 @@ var _ol_format_TopoJSON_ = function(opt_options) {
 
 };
 
-_ol_.inherits(_ol_format_TopoJSON_, _ol_format_JSONFeature_);
+inherits(_ol_format_TopoJSON_, _ol_format_JSONFeature_);
 
 
 /**

src/ol/format/WFS.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WFS
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_format_GML2_ from '../format/GML2.js';
 import _ol_format_GML3_ from '../format/GML3.js';
@@ -60,7 +60,7 @@ var _ol_format_WFS_ = function(opt_options) {
   _ol_format_XMLFeature_.call(this);
 };
 
-_ol_.inherits(_ol_format_WFS_, _ol_format_XMLFeature_);
+inherits(_ol_format_WFS_, _ol_format_XMLFeature_);
 
 
 /**

src/ol/format/WKT.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WKT
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_TextFeature_ from '../format/TextFeature.js';
@@ -42,7 +42,7 @@ var _ol_format_WKT_ = function(opt_options) {
 
 };
 
-_ol_.inherits(_ol_format_WKT_, _ol_format_TextFeature_);
+inherits(_ol_format_WKT_, _ol_format_TextFeature_);
 
 
 /**

src/ol/format/WMSCapabilities.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WMSCapabilities
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_format_XLink_ from '../format/XLink.js';
 import _ol_format_XML_ from '../format/XML.js';
 import _ol_format_XSD_ from '../format/XSD.js';
@@ -25,7 +25,7 @@ var _ol_format_WMSCapabilities_ = function() {
   this.version = undefined;
 };
 
-_ol_.inherits(_ol_format_WMSCapabilities_, _ol_format_XML_);
+inherits(_ol_format_WMSCapabilities_, _ol_format_XML_);
 
 
 /**

src/ol/format/WMSGetFeatureInfo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WMSGetFeatureInfo
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import _ol_format_GML2_ from '../format/GML2.js';
 import _ol_format_XMLFeature_ from '../format/XMLFeature.js';
@@ -45,7 +45,7 @@ var _ol_format_WMSGetFeatureInfo_ = function(opt_options) {
   _ol_format_XMLFeature_.call(this);
 };
 
-_ol_.inherits(_ol_format_WMSGetFeatureInfo_, _ol_format_XMLFeature_);
+inherits(_ol_format_WMSGetFeatureInfo_, _ol_format_XMLFeature_);
 
 
 /**

src/ol/format/WMTSCapabilities.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WMTSCapabilities
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_extent_ from '../extent.js';
 import _ol_format_OWS_ from '../format/OWS.js';
 import _ol_format_XLink_ from '../format/XLink.js';
@@ -27,7 +27,7 @@ var _ol_format_WMTSCapabilities_ = function() {
   this.owsParser_ = new _ol_format_OWS_();
 };
 
-_ol_.inherits(_ol_format_WMTSCapabilities_, _ol_format_XML_);
+inherits(_ol_format_WMTSCapabilities_, _ol_format_XML_);
 
 
 /**

src/ol/format/XMLFeature.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/XMLFeature
  */
-import _ol_ from '../index.js';
+import {inherits} from '../index.js';
 import _ol_array_ from '../array.js';
 import _ol_format_Feature_ from '../format/Feature.js';
 import _ol_format_FormatType_ from '../format/FormatType.js';
@@ -28,7 +28,7 @@ var _ol_format_XMLFeature_ = function() {
   _ol_format_Feature_.call(this);
 };
 
-_ol_.inherits(_ol_format_XMLFeature_, _ol_format_Feature_);
+inherits(_ol_format_XMLFeature_, _ol_format_Feature_);
 
 
 /**

src/ol/format/filter/And.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/And
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_LogicalNary_ from '../filter/LogicalNary.js';
 
 /**
@@ -21,5 +21,6 @@ var _ol_format_filter_And_ = function(conditions) {
   _ol_format_filter_LogicalNary_.apply(this, params);
 };
 
-_ol_.inherits(_ol_format_filter_And_, _ol_format_filter_LogicalNary_);
+inherits(_ol_format_filter_And_, _ol_format_filter_LogicalNary_);
+
 export default _ol_format_filter_And_;

src/ol/format/filter/Bbox.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Bbox
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Filter_ from '../filter/Filter.js';
 
 /**
@@ -40,5 +40,6 @@ var _ol_format_filter_Bbox_ = function(geometryName, extent, opt_srsName) {
   this.srsName = opt_srsName;
 };
 
-_ol_.inherits(_ol_format_filter_Bbox_, _ol_format_filter_Filter_);
+inherits(_ol_format_filter_Bbox_, _ol_format_filter_Filter_);
+
 export default _ol_format_filter_Bbox_;

src/ol/format/filter/Comparison.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Comparison
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Filter_ from '../filter/Filter.js';
 
 /**
@@ -29,5 +29,6 @@ var _ol_format_filter_Comparison_ = function(tagName, propertyName) {
   this.propertyName = propertyName;
 };
 
-_ol_.inherits(_ol_format_filter_Comparison_, _ol_format_filter_Filter_);
+inherits(_ol_format_filter_Comparison_, _ol_format_filter_Filter_);
+
 export default _ol_format_filter_Comparison_;

src/ol/format/filter/ComparisonBinary.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/ComparisonBinary
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
 
 /**
@@ -38,5 +38,5 @@ var _ol_format_filter_ComparisonBinary_ = function(
   this.matchCase = opt_matchCase;
 };
 
-_ol_.inherits(_ol_format_filter_ComparisonBinary_, _ol_format_filter_Comparison_);
+inherits(_ol_format_filter_ComparisonBinary_, _ol_format_filter_Comparison_);
 export default _ol_format_filter_ComparisonBinary_;

src/ol/format/filter/Contains.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Contains
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Spatial_ from '../filter/Spatial.js';
 
 /**
@@ -23,5 +23,5 @@ var _ol_format_filter_Contains_ = function(geometryName, geometry, opt_srsName)
 
 };
 
-_ol_.inherits(_ol_format_filter_Contains_, _ol_format_filter_Spatial_);
+inherits(_ol_format_filter_Contains_, _ol_format_filter_Spatial_);
 export default _ol_format_filter_Contains_;

src/ol/format/filter/During.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/During
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
 
 /**
@@ -31,5 +31,5 @@ var _ol_format_filter_During_ = function(propertyName, begin, end) {
   this.end = end;
 };
 
-_ol_.inherits(_ol_format_filter_During_, _ol_format_filter_Comparison_);
+inherits(_ol_format_filter_During_, _ol_format_filter_Comparison_);
 export default _ol_format_filter_During_;

src/ol/format/filter/EqualTo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/EqualTo
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
 
 /**
@@ -19,5 +19,5 @@ var _ol_format_filter_EqualTo_ = function(propertyName, expression, opt_matchCas
   _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsEqualTo', propertyName, expression, opt_matchCase);
 };
 
-_ol_.inherits(_ol_format_filter_EqualTo_, _ol_format_filter_ComparisonBinary_);
+inherits(_ol_format_filter_EqualTo_, _ol_format_filter_ComparisonBinary_);
 export default _ol_format_filter_EqualTo_;

src/ol/format/filter/GreaterThan.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/GreaterThan
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
 
 /**
@@ -18,5 +18,5 @@ var _ol_format_filter_GreaterThan_ = function(propertyName, expression) {
   _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsGreaterThan', propertyName, expression);
 };
 
-_ol_.inherits(_ol_format_filter_GreaterThan_, _ol_format_filter_ComparisonBinary_);
+inherits(_ol_format_filter_GreaterThan_, _ol_format_filter_ComparisonBinary_);
 export default _ol_format_filter_GreaterThan_;

src/ol/format/filter/GreaterThanOrEqualTo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/GreaterThanOrEqualTo
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
 
 /**
@@ -18,5 +18,5 @@ var _ol_format_filter_GreaterThanOrEqualTo_ = function(propertyName, expression)
   _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsGreaterThanOrEqualTo', propertyName, expression);
 };
 
-_ol_.inherits(_ol_format_filter_GreaterThanOrEqualTo_, _ol_format_filter_ComparisonBinary_);
+inherits(_ol_format_filter_GreaterThanOrEqualTo_, _ol_format_filter_ComparisonBinary_);
 export default _ol_format_filter_GreaterThanOrEqualTo_;

src/ol/format/filter/Intersects.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Intersects
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Spatial_ from '../filter/Spatial.js';
 
 /**
@@ -23,5 +23,5 @@ var _ol_format_filter_Intersects_ = function(geometryName, geometry, opt_srsName
 
 };
 
-_ol_.inherits(_ol_format_filter_Intersects_, _ol_format_filter_Spatial_);
+inherits(_ol_format_filter_Intersects_, _ol_format_filter_Spatial_);
 export default _ol_format_filter_Intersects_;

src/ol/format/filter/IsBetween.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/IsBetween
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
 
 /**
@@ -31,5 +31,5 @@ var _ol_format_filter_IsBetween_ = function(propertyName, lowerBoundary, upperBo
   this.upperBoundary = upperBoundary;
 };
 
-_ol_.inherits(_ol_format_filter_IsBetween_, _ol_format_filter_Comparison_);
+inherits(_ol_format_filter_IsBetween_, _ol_format_filter_Comparison_);
 export default _ol_format_filter_IsBetween_;

src/ol/format/filter/IsLike.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/IsLike
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
 
 /**
@@ -56,5 +56,5 @@ var _ol_format_filter_IsLike_ = function(propertyName, pattern,
   this.matchCase = opt_matchCase;
 };
 
-_ol_.inherits(_ol_format_filter_IsLike_, _ol_format_filter_Comparison_);
+inherits(_ol_format_filter_IsLike_, _ol_format_filter_Comparison_);
 export default _ol_format_filter_IsLike_;

src/ol/format/filter/IsNull.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/IsNull
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
 
 /**
@@ -17,5 +17,5 @@ var _ol_format_filter_IsNull_ = function(propertyName) {
   _ol_format_filter_Comparison_.call(this, 'PropertyIsNull', propertyName);
 };
 
-_ol_.inherits(_ol_format_filter_IsNull_, _ol_format_filter_Comparison_);
+inherits(_ol_format_filter_IsNull_, _ol_format_filter_Comparison_);
 export default _ol_format_filter_IsNull_;

src/ol/format/filter/LessThan.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/LessThan
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
 
 /**
@@ -18,5 +18,5 @@ var _ol_format_filter_LessThan_ = function(propertyName, expression) {
   _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsLessThan', propertyName, expression);
 };
 
-_ol_.inherits(_ol_format_filter_LessThan_, _ol_format_filter_ComparisonBinary_);
+inherits(_ol_format_filter_LessThan_, _ol_format_filter_ComparisonBinary_);
 export default _ol_format_filter_LessThan_;

src/ol/format/filter/LessThanOrEqualTo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/LessThanOrEqualTo
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
 
 /**
@@ -18,5 +18,5 @@ var _ol_format_filter_LessThanOrEqualTo_ = function(propertyName, expression) {
   _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsLessThanOrEqualTo', propertyName, expression);
 };
 
-_ol_.inherits(_ol_format_filter_LessThanOrEqualTo_, _ol_format_filter_ComparisonBinary_);
+inherits(_ol_format_filter_LessThanOrEqualTo_, _ol_format_filter_ComparisonBinary_);
 export default _ol_format_filter_LessThanOrEqualTo_;

src/ol/format/filter/LogicalNary.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/LogicalNary
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_asserts_ from '../../asserts.js';
 import _ol_format_filter_Filter_ from '../filter/Filter.js';
 
@@ -28,5 +28,5 @@ var _ol_format_filter_LogicalNary_ = function(tagName, conditions) {
   _ol_asserts_.assert(this.conditions.length >= 2, 57); // At least 2 conditions are required.
 };
 
-_ol_.inherits(_ol_format_filter_LogicalNary_, _ol_format_filter_Filter_);
+inherits(_ol_format_filter_LogicalNary_, _ol_format_filter_Filter_);
 export default _ol_format_filter_LogicalNary_;

src/ol/format/filter/Not.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Not
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Filter_ from '../filter/Filter.js';
 
 /**
@@ -24,5 +24,5 @@ var _ol_format_filter_Not_ = function(condition) {
   this.condition = condition;
 };
 
-_ol_.inherits(_ol_format_filter_Not_, _ol_format_filter_Filter_);
+inherits(_ol_format_filter_Not_, _ol_format_filter_Filter_);
 export default _ol_format_filter_Not_;

src/ol/format/filter/NotEqualTo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/NotEqualTo
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
 
 /**
@@ -19,5 +19,5 @@ var _ol_format_filter_NotEqualTo_ = function(propertyName, expression, opt_match
   _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsNotEqualTo', propertyName, expression, opt_matchCase);
 };
 
-_ol_.inherits(_ol_format_filter_NotEqualTo_, _ol_format_filter_ComparisonBinary_);
+inherits(_ol_format_filter_NotEqualTo_, _ol_format_filter_ComparisonBinary_);
 export default _ol_format_filter_NotEqualTo_;

src/ol/format/filter/Or.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Or
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_LogicalNary_ from '../filter/LogicalNary.js';
 
 /**
@@ -18,5 +18,5 @@ var _ol_format_filter_Or_ = function(conditions) {
   _ol_format_filter_LogicalNary_.apply(this, params);
 };
 
-_ol_.inherits(_ol_format_filter_Or_, _ol_format_filter_LogicalNary_);
+inherits(_ol_format_filter_Or_, _ol_format_filter_LogicalNary_);
 export default _ol_format_filter_Or_;

src/ol/format/filter/Spatial.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Spatial
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Filter_ from '../filter/Filter.js';
 
 /**
@@ -45,5 +45,5 @@ var _ol_format_filter_Spatial_ = function(tagName, geometryName, geometry, opt_s
   this.srsName = opt_srsName;
 };
 
-_ol_.inherits(_ol_format_filter_Spatial_, _ol_format_filter_Filter_);
+inherits(_ol_format_filter_Spatial_, _ol_format_filter_Filter_);
 export default _ol_format_filter_Spatial_;

src/ol/format/filter/Within.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Within
  */
-import _ol_ from '../../index.js';
+import {inherits} from '../../index.js';
 import _ol_format_filter_Spatial_ from '../filter/Spatial.js';
 
 /**
@@ -23,5 +23,5 @@ var _ol_format_filter_Within_ = function(geometryName, geometry, opt_srsName) {
 
 };
 
-_ol_.inherits(_ol_format_filter_Within_, _ol_format_filter_Spatial_);
+inherits(_ol_format_filter_Within_, _ol_format_filter_Spatial_);
 export default _ol_format_filter_Within_;