Better import and class name in ol/format/filter/

src/ol/format/filter/Bbox.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/Bbox
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_Filter_ from '../filter/Filter.js';
+import Filter from '../filter/Filter.js';
 
 /**
  * @classdesc
@@ -17,9 +17,9 @@ import _ol_format_filter_Filter_ from '../filter/Filter.js';
  * @extends {ol.format.filter.Filter}
  * @api
  */
-var _ol_format_filter_Bbox_ = function(geometryName, extent, opt_srsName) {
+var Bbox = function(geometryName, extent, opt_srsName) {
 
-  _ol_format_filter_Filter_.call(this, 'BBOX');
+  Filter.call(this, 'BBOX');
 
   /**
    * @public
@@ -40,6 +40,6 @@ var _ol_format_filter_Bbox_ = function(geometryName, extent, opt_srsName) {
   this.srsName = opt_srsName;
 };
 
-inherits(_ol_format_filter_Bbox_, _ol_format_filter_Filter_);
+inherits(Bbox, Filter);
 
-export default _ol_format_filter_Bbox_;
+export default Bbox;

src/ol/format/filter/ComparisonBinary.js

@@ -17,8 +17,7 @@ import Comparison from '../filter/Comparison.js';
  * @param {boolean=} opt_matchCase Case-sensitive?
  * @extends {ol.format.filter.Comparison}
  */
-var ComparisonBinary = function(
+var ComparisonBinary = function(tagName, propertyName, expression, opt_matchCase) {
-    tagName, propertyName, expression, opt_matchCase) {
 
   Comparison.call(this, tagName, propertyName);
 

src/ol/format/filter/Contains.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/Contains
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_Spatial_ from '../filter/Spatial.js';
+import Spatial from '../filter/Spatial.js';
 
 /**
  * @classdesc
@@ -17,11 +17,11 @@ import _ol_format_filter_Spatial_ from '../filter/Spatial.js';
  * @extends {ol.format.filter.Spatial}
  * @api
  */
-var _ol_format_filter_Contains_ = function(geometryName, geometry, opt_srsName) {
+var Contains = function(geometryName, geometry, opt_srsName) {
 
-  _ol_format_filter_Spatial_.call(this, 'Contains', geometryName, geometry, opt_srsName);
+  Spatial.call(this, 'Contains', geometryName, geometry, opt_srsName);
 
 };
 
-inherits(_ol_format_filter_Contains_, _ol_format_filter_Spatial_);
+inherits(Contains, Spatial);
-export default _ol_format_filter_Contains_;
+export default Contains;

src/ol/format/filter/During.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/During
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
+import Comparison from '../filter/Comparison.js';
 
 /**
  * @classdesc
@@ -15,8 +15,8 @@ import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
  * @extends {ol.format.filter.Comparison}
  * @api
  */
-var _ol_format_filter_During_ = function(propertyName, begin, end) {
+var During = function(propertyName, begin, end) {
-  _ol_format_filter_Comparison_.call(this, 'During', propertyName);
+  Comparison.call(this, 'During', propertyName);
 
   /**
    * @public
@@ -31,5 +31,5 @@ var _ol_format_filter_During_ = function(propertyName, begin, end) {
   this.end = end;
 };
 
-inherits(_ol_format_filter_During_, _ol_format_filter_Comparison_);
+inherits(During, Comparison);
-export default _ol_format_filter_During_;
+export default During;

src/ol/format/filter/EqualTo.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/EqualTo
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
+import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**
  * @classdesc
@@ -15,9 +15,9 @@ import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
  * @extends {ol.format.filter.ComparisonBinary}
  * @api
  */
-var _ol_format_filter_EqualTo_ = function(propertyName, expression, opt_matchCase) {
+var EqualTo = function(propertyName, expression, opt_matchCase) {
-  _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsEqualTo', propertyName, expression, opt_matchCase);
+  ComparisonBinary.call(this, 'PropertyIsEqualTo', propertyName, expression, opt_matchCase);
 };
 
-inherits(_ol_format_filter_EqualTo_, _ol_format_filter_ComparisonBinary_);
+inherits(EqualTo, ComparisonBinary);
-export default _ol_format_filter_EqualTo_;
+export default EqualTo;

src/ol/format/filter/GreaterThan.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/GreaterThan
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
+import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**
  * @classdesc
@@ -14,9 +14,9 @@ import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
  * @extends {ol.format.filter.ComparisonBinary}
  * @api
  */
-var _ol_format_filter_GreaterThan_ = function(propertyName, expression) {
+var GreaterThan = function(propertyName, expression) {
-  _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsGreaterThan', propertyName, expression);
+  ComparisonBinary.call(this, 'PropertyIsGreaterThan', propertyName, expression);
 };
 
-inherits(_ol_format_filter_GreaterThan_, _ol_format_filter_ComparisonBinary_);
+inherits(GreaterThan, ComparisonBinary);
-export default _ol_format_filter_GreaterThan_;
+export default GreaterThan;

src/ol/format/filter/GreaterThanOrEqualTo.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/GreaterThanOrEqualTo
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
+import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**
  * @classdesc
@@ -14,9 +14,9 @@ import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
  * @extends {ol.format.filter.ComparisonBinary}
  * @api
  */
-var _ol_format_filter_GreaterThanOrEqualTo_ = function(propertyName, expression) {
+var GreaterThanOrEqualTo = function(propertyName, expression) {
-  _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsGreaterThanOrEqualTo', propertyName, expression);
+  ComparisonBinary.call(this, 'PropertyIsGreaterThanOrEqualTo', propertyName, expression);
 };
 
-inherits(_ol_format_filter_GreaterThanOrEqualTo_, _ol_format_filter_ComparisonBinary_);
+inherits(GreaterThanOrEqualTo, ComparisonBinary);
-export default _ol_format_filter_GreaterThanOrEqualTo_;
+export default GreaterThanOrEqualTo;

src/ol/format/filter/Intersects.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/Intersects
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_Spatial_ from '../filter/Spatial.js';
+import Spatial from '../filter/Spatial.js';
 
 /**
  * @classdesc
@@ -17,11 +17,11 @@ import _ol_format_filter_Spatial_ from '../filter/Spatial.js';
  * @extends {ol.format.filter.Spatial}
  * @api
  */
-var _ol_format_filter_Intersects_ = function(geometryName, geometry, opt_srsName) {
+var Intersects = function(geometryName, geometry, opt_srsName) {
 
-  _ol_format_filter_Spatial_.call(this, 'Intersects', geometryName, geometry, opt_srsName);
+  Spatial.call(this, 'Intersects', geometryName, geometry, opt_srsName);
 
 };
 
-inherits(_ol_format_filter_Intersects_, _ol_format_filter_Spatial_);
+inherits(Intersects, Spatial);
-export default _ol_format_filter_Intersects_;
+export default Intersects;

src/ol/format/filter/IsBetween.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/IsBetween
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
+import Comparison from '../filter/Comparison.js';
 
 /**
  * @classdesc
@@ -15,8 +15,8 @@ import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
  * @extends {ol.format.filter.Comparison}
  * @api
  */
-var _ol_format_filter_IsBetween_ = function(propertyName, lowerBoundary, upperBoundary) {
+var IsBetween = function(propertyName, lowerBoundary, upperBoundary) {
-  _ol_format_filter_Comparison_.call(this, 'PropertyIsBetween', propertyName);
+  Comparison.call(this, 'PropertyIsBetween', propertyName);
 
   /**
    * @public
@@ -31,5 +31,5 @@ var _ol_format_filter_IsBetween_ = function(propertyName, lowerBoundary, upperBo
   this.upperBoundary = upperBoundary;
 };
 
-inherits(_ol_format_filter_IsBetween_, _ol_format_filter_Comparison_);
+inherits(IsBetween, Comparison);
-export default _ol_format_filter_IsBetween_;
+export default IsBetween;

src/ol/format/filter/IsLike.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/IsLike
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
+import Comparison from '../filter/Comparison.js';
 
 /**
  * @classdesc
@@ -21,9 +21,8 @@ import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
  * @extends {ol.format.filter.Comparison}
  * @api
  */
-var _ol_format_filter_IsLike_ = function(propertyName, pattern,
+var IsLike = function(propertyName, pattern, opt_wildCard, opt_singleChar, opt_escapeChar, opt_matchCase) {
-    opt_wildCard, opt_singleChar, opt_escapeChar, opt_matchCase) {
+  Comparison.call(this, 'PropertyIsLike', propertyName);
-  _ol_format_filter_Comparison_.call(this, 'PropertyIsLike', propertyName);
 
   /**
    * @public
@@ -56,5 +55,5 @@ var _ol_format_filter_IsLike_ = function(propertyName, pattern,
   this.matchCase = opt_matchCase;
 };
 
-inherits(_ol_format_filter_IsLike_, _ol_format_filter_Comparison_);
+inherits(IsLike, Comparison);
-export default _ol_format_filter_IsLike_;
+export default IsLike;

src/ol/format/filter/IsNull.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/IsNull
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
+import Comparison from '../filter/Comparison.js';
 
 /**
  * @classdesc
@@ -13,9 +13,9 @@ import _ol_format_filter_Comparison_ from '../filter/Comparison.js';
  * @extends {ol.format.filter.Comparison}
  * @api
  */
-var _ol_format_filter_IsNull_ = function(propertyName) {
+var IsNull = function(propertyName) {
-  _ol_format_filter_Comparison_.call(this, 'PropertyIsNull', propertyName);
+  Comparison.call(this, 'PropertyIsNull', propertyName);
 };
 
-inherits(_ol_format_filter_IsNull_, _ol_format_filter_Comparison_);
+inherits(IsNull, Comparison);
-export default _ol_format_filter_IsNull_;
+export default IsNull;

src/ol/format/filter/LessThan.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/LessThan
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
+import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**
  * @classdesc
@@ -14,9 +14,9 @@ import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
  * @extends {ol.format.filter.ComparisonBinary}
  * @api
  */
-var _ol_format_filter_LessThan_ = function(propertyName, expression) {
+var LessThan = function(propertyName, expression) {
-  _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsLessThan', propertyName, expression);
+  ComparisonBinary.call(this, 'PropertyIsLessThan', propertyName, expression);
 };
 
-inherits(_ol_format_filter_LessThan_, _ol_format_filter_ComparisonBinary_);
+inherits(LessThan, ComparisonBinary);
-export default _ol_format_filter_LessThan_;
+export default LessThan;

src/ol/format/filter/LessThanOrEqualTo.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/LessThanOrEqualTo
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
+import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**
  * @classdesc
@@ -14,9 +14,9 @@ import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
  * @extends {ol.format.filter.ComparisonBinary}
  * @api
  */
-var _ol_format_filter_LessThanOrEqualTo_ = function(propertyName, expression) {
+var LessThanOrEqualTo = function(propertyName, expression) {
-  _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsLessThanOrEqualTo', propertyName, expression);
+  ComparisonBinary.call(this, 'PropertyIsLessThanOrEqualTo', propertyName, expression);
 };
 
-inherits(_ol_format_filter_LessThanOrEqualTo_, _ol_format_filter_ComparisonBinary_);
+inherits(LessThanOrEqualTo, ComparisonBinary);
-export default _ol_format_filter_LessThanOrEqualTo_;
+export default LessThanOrEqualTo;

src/ol/format/filter/LogicalNary.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../../index.js';
 import _ol_asserts_ from '../../asserts.js';
-import _ol_format_filter_Filter_ from '../filter/Filter.js';
+import Filter from '../filter/Filter.js';
 
 /**
  * @classdesc
@@ -16,9 +16,9 @@ import _ol_format_filter_Filter_ from '../filter/Filter.js';
  * @param {...ol.format.filter.Filter} conditions Conditions.
  * @extends {ol.format.filter.Filter}
  */
-var _ol_format_filter_LogicalNary_ = function(tagName, conditions) {
+var LogicalNary = function(tagName, conditions) {
 
-  _ol_format_filter_Filter_.call(this, tagName);
+  Filter.call(this, tagName);
 
   /**
    * @public
@@ -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.
 };
 
-inherits(_ol_format_filter_LogicalNary_, _ol_format_filter_Filter_);
+inherits(LogicalNary, Filter);
-export default _ol_format_filter_LogicalNary_;
+export default LogicalNary;

src/ol/format/filter/Not.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/Not
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_Filter_ from '../filter/Filter.js';
+import Filter from '../filter/Filter.js';
 
 /**
  * @classdesc
@@ -13,9 +13,9 @@ import _ol_format_filter_Filter_ from '../filter/Filter.js';
  * @extends {ol.format.filter.Filter}
  * @api
  */
-var _ol_format_filter_Not_ = function(condition) {
+var Not = function(condition) {
 
-  _ol_format_filter_Filter_.call(this, 'Not');
+  Filter.call(this, 'Not');
 
   /**
    * @public
@@ -24,5 +24,5 @@ var _ol_format_filter_Not_ = function(condition) {
   this.condition = condition;
 };
 
-inherits(_ol_format_filter_Not_, _ol_format_filter_Filter_);
+inherits(Not, Filter);
-export default _ol_format_filter_Not_;
+export default Not;

src/ol/format/filter/NotEqualTo.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/NotEqualTo
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
+import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**
  * @classdesc
@@ -15,9 +15,9 @@ import _ol_format_filter_ComparisonBinary_ from '../filter/ComparisonBinary.js';
  * @extends {ol.format.filter.ComparisonBinary}
  * @api
  */
-var _ol_format_filter_NotEqualTo_ = function(propertyName, expression, opt_matchCase) {
+var NotEqualTo = function(propertyName, expression, opt_matchCase) {
-  _ol_format_filter_ComparisonBinary_.call(this, 'PropertyIsNotEqualTo', propertyName, expression, opt_matchCase);
+  ComparisonBinary.call(this, 'PropertyIsNotEqualTo', propertyName, expression, opt_matchCase);
 };
 
-inherits(_ol_format_filter_NotEqualTo_, _ol_format_filter_ComparisonBinary_);
+inherits(NotEqualTo, ComparisonBinary);
-export default _ol_format_filter_NotEqualTo_;
+export default NotEqualTo;

src/ol/format/filter/Or.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/Or
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_LogicalNary_ from '../filter/LogicalNary.js';
+import LogicalNary from '../filter/LogicalNary.js';
 
 /**
  * @classdesc
@@ -13,10 +13,10 @@ import _ol_format_filter_LogicalNary_ from '../filter/LogicalNary.js';
  * @extends {ol.format.filter.LogicalNary}
  * @api
  */
-var _ol_format_filter_Or_ = function(conditions) {
+var Or = function(conditions) {
   var params = ['Or'].concat(Array.prototype.slice.call(arguments));
-  _ol_format_filter_LogicalNary_.apply(this, params);
+  LogicalNary.apply(this, params);
 };
 
-inherits(_ol_format_filter_Or_, _ol_format_filter_LogicalNary_);
+inherits(Or, LogicalNary);
-export default _ol_format_filter_Or_;
+export default Or;

src/ol/format/filter/Within.js

@@ -2,7 +2,7 @@
  * @module ol/format/filter/Within
  */
 import {inherits} from '../../index.js';
-import _ol_format_filter_Spatial_ from '../filter/Spatial.js';
+import Spatial from '../filter/Spatial.js';
 
 /**
  * @classdesc
@@ -17,11 +17,11 @@ import _ol_format_filter_Spatial_ from '../filter/Spatial.js';
  * @extends {ol.format.filter.Spatial}
  * @api
  */
-var _ol_format_filter_Within_ = function(geometryName, geometry, opt_srsName) {
+var Within = function(geometryName, geometry, opt_srsName) {
 
-  _ol_format_filter_Spatial_.call(this, 'Within', geometryName, geometry, opt_srsName);
+  Spatial.call(this, 'Within', geometryName, geometry, opt_srsName);
 
 };
 
-inherits(_ol_format_filter_Within_, _ol_format_filter_Spatial_);
+inherits(Within, Spatial);
-export default _ol_format_filter_Within_;
+export default Within;