From e63214a2cc7669900ca0a4e3bc9b21887a668d94 Mon Sep 17 00:00:00 2001
From: Tino Desjardins <tino.desjardins@arcor.de>
Date: Mon, 4 Sep 2017 17:46:21 +0200
Subject: [PATCH 1/3] Mark ol.format.filter.Spatial as abstract class

Add missing abstract class description for class ol.format.filter.Spatial like in all other abstract classes.
---
 src/ol/format/filter/spatial.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ol/format/filter/spatial.js b/src/ol/format/filter/spatial.js
index e00fd95423..c63a2a8944 100644
--- a/src/ol/format/filter/spatial.js
+++ b/src/ol/format/filter/spatial.js
@@ -6,6 +6,7 @@ goog.require('ol.format.filter.Filter');
 
 /**
  * @classdesc
+ * Abstract class; normally only used for creating subclasses and not instantiated in apps.
  * Represents a spatial operator to test whether a geometry-valued property
  * relates to a given geometry.
  *

From 6ed414e8f78da23861d0dc9136a297014349f782 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 5 Sep 2017 08:07:10 +0200
Subject: [PATCH 2/3] Add missing 'abstract' tag in ol.format.filter classes

---
 src/ol/format/filter/and.js              | 1 +
 src/ol/format/filter/comparison.js       | 1 +
 src/ol/format/filter/comparisonbinary.js | 1 +
 src/ol/format/filter/filter.js           | 1 +
 src/ol/format/filter/logicalnary.js      | 1 +
 src/ol/format/filter/spatial.js          | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/ol/format/filter/and.js b/src/ol/format/filter/and.js
index aa173c2aa9..52c9468a7a 100644
--- a/src/ol/format/filter/and.js
+++ b/src/ol/format/filter/and.js
@@ -8,6 +8,7 @@ goog.require('ol.format.filter.LogicalNary');
  * Represents a logical `<And>` operator between two or more filter conditions.
  *
  * @constructor
+ * @abstract
  * @param {...ol.format.filter.Filter} conditions Conditions.
  * @extends {ol.format.filter.LogicalNary}
  * @api
diff --git a/src/ol/format/filter/comparison.js b/src/ol/format/filter/comparison.js
index dc9a069a19..86de8ab7cf 100644
--- a/src/ol/format/filter/comparison.js
+++ b/src/ol/format/filter/comparison.js
@@ -10,6 +10,7 @@ goog.require('ol.format.filter.Filter');
  * Base class for WFS GetFeature property comparison filters.
  *
  * @constructor
+ * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @param {!string} propertyName Name of the context property to compare.
  * @extends {ol.format.filter.Filter}
diff --git a/src/ol/format/filter/comparisonbinary.js b/src/ol/format/filter/comparisonbinary.js
index 45a3d815a9..f52a6810e2 100644
--- a/src/ol/format/filter/comparisonbinary.js
+++ b/src/ol/format/filter/comparisonbinary.js
@@ -10,6 +10,7 @@ goog.require('ol.format.filter.Comparison');
  * Base class for WFS GetFeature property binary comparison filters.
  *
  * @constructor
+ * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @param {!string} propertyName Name of the context property to compare.
  * @param {!(string|number)} expression The value to compare.
diff --git a/src/ol/format/filter/filter.js b/src/ol/format/filter/filter.js
index 48c9f0f3b8..847994b4e0 100644
--- a/src/ol/format/filter/filter.js
+++ b/src/ol/format/filter/filter.js
@@ -7,6 +7,7 @@ goog.provide('ol.format.filter.Filter');
  * Base class for WFS GetFeature filters.
  *
  * @constructor
+ * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @struct
  * @api
diff --git a/src/ol/format/filter/logicalnary.js b/src/ol/format/filter/logicalnary.js
index 530c5e4d4f..748bb8f6af 100644
--- a/src/ol/format/filter/logicalnary.js
+++ b/src/ol/format/filter/logicalnary.js
@@ -11,6 +11,7 @@ goog.require('ol.format.filter.Filter');
  * Base class for WFS GetFeature n-ary logical filters.
  *
  * @constructor
+ * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @param {...ol.format.filter.Filter} conditions Conditions.
  * @extends {ol.format.filter.Filter}
diff --git a/src/ol/format/filter/spatial.js b/src/ol/format/filter/spatial.js
index c63a2a8944..016fe432bd 100644
--- a/src/ol/format/filter/spatial.js
+++ b/src/ol/format/filter/spatial.js
@@ -11,6 +11,7 @@ goog.require('ol.format.filter.Filter');
  * relates to a given geometry.
  *
  * @constructor
+ * @abstract
  * @param {!string} tagName The XML tag name for this filter.
  * @param {!string} geometryName Geometry name to use.
  * @param {!ol.geom.Geometry} geometry Geometry.

From f0fd866eaffe09d8abf6c5b05cb5c55a722b6f2e Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Wed, 13 Sep 2017 16:31:08 +0200
Subject: [PATCH 3/3] Add a deprecated warning in abstract filter classes

---
 src/ol/format/filter/and.js              | 2 ++
 src/ol/format/filter/comparison.js       | 2 ++
 src/ol/format/filter/comparisonbinary.js | 2 ++
 src/ol/format/filter/filter.js           | 2 ++
 src/ol/format/filter/spatial.js          | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/src/ol/format/filter/and.js b/src/ol/format/filter/and.js
index 52c9468a7a..0a23faca86 100644
--- a/src/ol/format/filter/and.js
+++ b/src/ol/format/filter/and.js
@@ -7,6 +7,8 @@ goog.require('ol.format.filter.LogicalNary');
  * @classdesc
  * Represents a logical `<And>` operator between two or more filter conditions.
  *
+ * deprecated: This class will no longer be exported starting from the next major version.
+ *
  * @constructor
  * @abstract
  * @param {...ol.format.filter.Filter} conditions Conditions.
diff --git a/src/ol/format/filter/comparison.js b/src/ol/format/filter/comparison.js
index 86de8ab7cf..e3724036c8 100644
--- a/src/ol/format/filter/comparison.js
+++ b/src/ol/format/filter/comparison.js
@@ -9,6 +9,8 @@ goog.require('ol.format.filter.Filter');
  * Abstract class; normally only used for creating subclasses and not instantiated in apps.
  * Base class for WFS GetFeature property comparison filters.
  *
+ * deprecated: This class will no longer be exported starting from the next major version.
+ *
  * @constructor
  * @abstract
  * @param {!string} tagName The XML tag name for this filter.
diff --git a/src/ol/format/filter/comparisonbinary.js b/src/ol/format/filter/comparisonbinary.js
index f52a6810e2..3ab5c67992 100644
--- a/src/ol/format/filter/comparisonbinary.js
+++ b/src/ol/format/filter/comparisonbinary.js
@@ -9,6 +9,8 @@ goog.require('ol.format.filter.Comparison');
  * Abstract class; normally only used for creating subclasses and not instantiated in apps.
  * Base class for WFS GetFeature property binary comparison filters.
  *
+ * deprecated: This class will no longer be exported starting from the next major version.
+ *
  * @constructor
  * @abstract
  * @param {!string} tagName The XML tag name for this filter.
diff --git a/src/ol/format/filter/filter.js b/src/ol/format/filter/filter.js
index 847994b4e0..7f21c3f0d4 100644
--- a/src/ol/format/filter/filter.js
+++ b/src/ol/format/filter/filter.js
@@ -6,6 +6,8 @@ goog.provide('ol.format.filter.Filter');
  * Abstract class; normally only used for creating subclasses and not instantiated in apps.
  * Base class for WFS GetFeature filters.
  *
+ * deprecated: This class will no longer be exported starting from the next major version.
+ *
  * @constructor
  * @abstract
  * @param {!string} tagName The XML tag name for this filter.
diff --git a/src/ol/format/filter/spatial.js b/src/ol/format/filter/spatial.js
index 016fe432bd..b86ebc0e47 100644
--- a/src/ol/format/filter/spatial.js
+++ b/src/ol/format/filter/spatial.js
@@ -10,6 +10,8 @@ goog.require('ol.format.filter.Filter');
  * Represents a spatial operator to test whether a geometry-valued property
  * relates to a given geometry.
  *
+ * deprecated: This class will no longer be exported starting from the next major version.
+ *
  * @constructor
  * @abstract
  * @param {!string} tagName The XML tag name for this filter.