Import DataSource 01 Restructuring - Should fix last build issues

camptocamp · Oct 12, 2017 · 2d9ac1e · 2d9ac1e
1 parent 5ba9e31
commit 2d9ac1e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/src/datasource/datasource.js b/src/datasource/datasource.js
@@ -56,10 +56,14 @@ ngeo.datasource.DataSource = class {
 
     /**
      * The attributes of the data source.
+     *
+     * Note: `attributes` is not using the conventionnal getter/setter due
+     * to:  See: https://github.com/google/closure-compiler/issues/1089
+     *
      * @type {?Array.<ngeox.Attribute>}
-     * @private
+     * @export
      */
-    this.attributes_ = options.attributes || null;
+    this.attributes = options.attributes || null;
 
     /**
      * (Required) The data source id.
@@ -143,16 +147,16 @@ ngeo.datasource.DataSource = class {
    * @return {?Array.<ngeox.Attribute>} Attributes
    * @export
    */
-  get attributes() {
-    return this.attributes_;
+  getAttributes() {
+    return this.attributes;
   }
 
   /**
    * @param {?Array.<ngeox.Attribute>} attributes Attributes
    * @export
    */
-  set attributes(attributes) {
-    this.attributes_ = attributes;
+  setAttributes(attributes) {
+    this.attributes = attributes;
   }
 
   /**

diff --git a/src/datasource/datasourceshelper.js b/src/datasource/datasourceshelper.js
@@ -124,7 +124,7 @@ ngeo.datasource.DataSourcesHelper = class {
         const attributes = new ngeo.format.WFSAttribute().read(complexContent);
 
         // Set the attributes in the data source
-        dataSource.attributes = attributes;
+        dataSource.setAttributes(attributes);
 
         wfsDescribeFeatureTypeDefer.resolve(attributes);
       });

diff --git a/src/datasource/ogc.js b/src/datasource/ogc.js
@@ -9,6 +9,9 @@ goog.require('ol.format.WFS');
 goog.require('ol.format.WMSGetFeatureInfo');
 
 
+/**
+ * @implements {ngeox.datasource.OGC}
+ */
 ngeo.datasource.OGC = class extends ngeo.datasource.DataSource {
 
   /**
@@ -422,19 +425,17 @@ ngeo.datasource.OGC = class extends ngeo.datasource.DataSource {
   // =======================================
 
   /**
-   * @return {?Array.<ngeox.Attribute>} Attributes
-   * @export
+   * @inheritDoc
    */
-  get attributes() {
+  getAttributes() {
     return super.attributes;
   }
 
   /**
-   * @param {?Array.<ngeox.Attribute>} attributes Attributes
-   * @export
+   * @inheritDoc
    */
-  set attributes(attributes) {
-    super.attributes = attributes;
+  setAttributes(attributes) {
+    super.setAttributes(attributes);
     this.updateGeometryNameFromAttributes_();
   }
 
@@ -888,7 +889,7 @@ ngeo.datasource.OGC = class extends ngeo.datasource.DataSource {
    * @private
    */
   updateGeometryNameFromAttributes_() {
-    let geometryName = ngeo.datasource.DataSource.DEFAULT_GEOMETRY_NAME_;
+    let geometryName = ngeo.datasource.OGC.DEFAULT_GEOMETRY_NAME_;
 
     if (this.attributes) {
       for (const attribute of this.attributes) {

diff --git a/src/services/querent.js b/src/services/querent.js
@@ -249,6 +249,8 @@ ngeo.Querent = class {
           } else {
             features = dataSource.wmsFormat.readFeatures(response.data);
           }
+        } else {
+          features = []
         }
       }
       const dataSourceId = dataSource.id;