Import DataSource 01 Restructuring - wip (rename ngeox.datasource.Dat…

…aSourceLayer --> OGCLayer)
camptocamp · Oct 3, 2017 · b5df3d0 · b5df3d0
1 parent 84e22f7
commit b5df3d0
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 39 deletions.
diff --git a/options/ngeox.js b/options/ngeox.js
@@ -942,42 +942,6 @@ ngeox.WfsPermalinkOptions.prototype.maxFeatures;
 ngeox.datasource;
 
 
-/**
- * The definition of a single layer (WMS) and/or featureType (WFS).
- * @record
- * @struct
- */
-ngeox.datasource.DataSourceLayer = function() {};
-
-
-/**
- * The maximum resolution the layer should be rendered (when visible).
- * @type {number|undefined}
- */
-ngeox.datasource.DataSourceLayer.prototype.maxResolution;
-
-
-/**
- * The minimum resolution the layer should be rendered (when visible).
- * @type {number|undefined}
- */
-ngeox.datasource.DataSourceLayer.prototype.minResolution;
-
-
-/**
- * The layer name (WMS) and/or feature type name (WFS)
- * @type {string}
- */
-ngeox.datasource.DataSourceLayer.prototype.name;
-
-
-/**
- * Whether the the layer is queryable or not. Defaults to `false`.
- * @type {boolean|undefined}
- */
-ngeox.datasource.DataSourceLayer.prototype.queryable;
-
-
 /**
  * The options required to create a `ngeox.datasource.DataSource`.
  * @record
@@ -1134,7 +1098,7 @@ ngeox.datasource.OGCOptions.prototype.ogcImageType;
  * A list of layer definitions that are used by (WMS) and (WFS) queries.
  * These are **not** used by the (WMTS) queries (the wmtsLayers is used
  * by WMTS queries).
- * @type {Array.<!ngeox.datasource.DataSourceLayer>|undefined}
+ * @type {Array.<!ngeox.datasource.OGCLayer>|undefined}
  */
 ngeox.datasource.OGCOptions.prototype.ogcLayers;
 
@@ -1370,6 +1334,42 @@ ngeox.datasource.OGC.prototype.combinableWithDataSourceForWMS = function(dataSou
 ngeox.datasource.OGC.prototype.haveTheSameActiveDimensions = function(dataSource) {};
 
 
+/**
+ * The definition of a single layer (WMS) and/or featureType (WFS).
+ * @record
+ * @struct
+ */
+ngeox.datasource.OGCLayer = function() {};
+
+
+/**
+ * The maximum resolution the layer should be rendered (when visible).
+ * @type {number|undefined}
+ */
+ngeox.datasource.OGCLayer.prototype.maxResolution;
+
+
+/**
+ * The minimum resolution the layer should be rendered (when visible).
+ * @type {number|undefined}
+ */
+ngeox.datasource.OGCLayer.prototype.minResolution;
+
+
+/**
+ * The layer name (WMS) and/or feature type name (WFS)
+ * @type {string}
+ */
+ngeox.datasource.OGCLayer.prototype.name;
+
+
+/**
+ * Whether the the layer is queryable or not. Defaults to `false`.
+ * @type {boolean|undefined}
+ */
+ngeox.datasource.OGCLayer.prototype.queryable;
+
+
 /**
  * Namespace.
  * @type {Object}

diff --git a/src/datasource/ogc.js b/src/datasource/ogc.js
@@ -95,7 +95,7 @@ ngeo.datasource.OGC = class extends ngeo.datasource.DataSource {
      * A list of layer definitions that are used by (WMS) and (WFS) queries.
      * These are **not** used by the (WMTS) queries (the wmtsLayers is used
      * by WMTS queries).
-     * @type {?Array.<!ngeox.datasource.DataSourceLayer>}
+     * @type {?Array.<!ngeox.datasource.OGCLayer>}
      * @private
      */
     this.ogcLayers_ = options.ogcLayers || null;
@@ -456,7 +456,7 @@ ngeo.datasource.OGC = class extends ngeo.datasource.DataSource {
   }
 
   /**
-   * @return {?Array.<!ngeox.datasource.DataSourceLayer>} OGC layers
+   * @return {?Array.<!ngeox.datasource.OGCLayer>} OGC layers
    * @export
    */
   get ogcLayers() {