Strict function types

contribs/gmf/src/backgroundlayerselector/component.js

@@ -152,10 +152,11 @@ function Controller($scope, ngeoBackgroundLayerMgr, gmfThemes) {
 
   this.listenerKeys_.push(olEvents.listen(this.backgroundLayerMgr_, 'change',
     /**
-     * @param {!import('ngeo/map/BackgroundLayerMgr.js').BackgroundEvent} event Event.
+     * @param {Event|import('ol/events/Event.js').default} event Event.
      */
     (event) => {
-      this.bgLayer = event.detail.current;
+      this.bgLayer = /** @type{import('ngeo/map/BackgroundLayerMgr.js').BackgroundEvent} */
+          (event).detail.current;
     }));
 
   $scope.$on('$destroy', this.handleDestroy_.bind(this));

contribs/gmf/src/contextualdata/component.js

@@ -62,7 +62,7 @@ function contextualDataComponent() {
      * @param {angular.IScope} scope Scope.
      * @param {JQuery} element Element.
      * @param {angular.IAttributes} attrs Attributes.
-     * @param {ContextualdataController} controller Controller.
+     * @param {angular.IController} controller Controller.
      */
     link: (scope, element, attrs, controller) => {
       controller.init();

contribs/gmf/src/controllers/AbstractAppController.js

@@ -194,7 +194,7 @@ export function AbstractAppController(config, map, $scope, $injector) {
   });
 
   /**
-   * @param {import('gmf/authentication/Service.js').AuthenticationEvent} evt Event.
+   * @param {Event|import('ol/events/Event.js').default} evt Event.
    */
   const userChange = (evt) => {
     if (this.loginRedirectUrl) {

contribs/gmf/src/datasource/ExternalDataSourcesManager.js

@@ -19,6 +19,7 @@ import * as olEvents from 'ol/events.js';
 import olCollection from 'ol/Collection.js';
 import olFormatGPX from 'ol/format/GPX.js';
 import olFormatKML from 'ol/format/KML.js';
+import {CollectionEvent} from 'ol/Collection.js';
 
 
 /**
@@ -580,16 +581,18 @@ export class ExternalDatSourcesManager {
    * Called when a data source is removed from the collection of ngeo data
    * sources. If it's an external data source, remove it from its WMS Group
    *
-   * @param {import("ol/Collection.js").CollectionEvent} evt Collection event.
+   * @param {Event|import('ol/events/Event.js').default} evt Collection event.
    * @private
    */
   handleDataSourcesRemove_(evt) {
-    const dataSource = evt.element;
-    if (this.extDataSources_[dataSource.id] === dataSource) {
-      if (dataSource instanceof ngeoDatasourceFile) {
-        this.removeFileDataSource_(dataSource);
-      } else if (dataSource instanceof ngeoDatasourceOGC) {
-        this.removeOGCDataSource_(dataSource);
+    if (evt instanceof CollectionEvent) {
+      const dataSource = evt.element;
+      if (this.extDataSources_[dataSource.id] === dataSource) {
+        if (dataSource instanceof ngeoDatasourceFile) {
+          this.removeFileDataSource_(dataSource);
+        } else if (dataSource instanceof ngeoDatasourceOGC) {
+          this.removeOGCDataSource_(dataSource);
+        }
       }
     }
   }

contribs/gmf/src/datasource/Helper.js

@@ -66,9 +66,7 @@ export class DatasourceHelper {
    * @return {import('ngeo/datasource/DataSource.js').DataSources} Data sources collection.
    */
   get collection() {
-    return /** @type {import('ngeo/datasource/DataSource.js').DataSources} */ (
-      this.ngeoDataSourcesHelper_.collection
-    );
+    return this.ngeoDataSourcesHelper_.collection;
   }
 
   /**

contribs/gmf/src/datasource/Manager.js

@@ -910,13 +910,13 @@ export class DatasourceManager {
    * The `querySourceIds` property in the layer is used to determine the
    * data sources that are bound to the layer.
    *
-   * @param {!import('ngeo/map/BackgroundLayerMgr.js').BackgroundEvent} evt Event.
+   * @param {Event|import('ol/events/Event.js').default} evt Event.
    * @private
    */
   handleNgeoBackgroundLayerChange_(evt) {
-
-    const previousBackgroundLayer = evt.detail.previous;
-    const currentBackgroundLayer = evt.detail.current;
+    const event = /** @type{import('ngeo/map/BackgroundLayerMgr.js').BackgroundEvent} */(evt);
+    const previousBackgroundLayer = event.detail.previous;
+    const currentBackgroundLayer = event.detail.current;
     const cache = this.dataSourcesCache_;
 
     // Remove data sources linked to previous background layer

contribs/gmf/src/disclaimer/component.js

@@ -8,6 +8,7 @@ import ngeoMapLayerHelper from 'ngeo/map/LayerHelper.js';
 import {MessageType} from 'ngeo/message/Message.js';
 import ngeoMessageDisclaimer from 'ngeo/message/Disclaimer.js';
 import ngeoMiscEventHelper from 'ngeo/misc/EventHelper.js';
+import {CollectionEvent} from 'ol/Collection.js';
 
 import 'angular-sanitize';
 
@@ -155,26 +156,30 @@ Controller.prototype.$onInit = function() {
 };
 
 /**
- * @param {import("ol/Collection.js").CollectionEvent} evt Event.
+ * @param {Event|import('ol/events/Event.js').default} evt Event.
  * @private
  */
 Controller.prototype.handleLayersAdd_ = function(evt) {
-  this.timeout_(() => {
-    const layer = evt.element;
-    console.assert(layer instanceof olLayerBase);
-    this.registerLayer_(layer);
-  });
+  if (evt instanceof CollectionEvent) {
+    this.timeout_(() => {
+      const layer = evt.element;
+      console.assert(layer instanceof olLayerBase);
+      this.registerLayer_(layer);
+    });
+  }
 };
 
 
 /**
- * @param {import("ol/Collection.js").CollectionEvent} evt Event.
+ * @param {Event|import('ol/events/Event.js').default} evt Event.
  * @private
  */
 Controller.prototype.handleLayersRemove_ = function(evt) {
-  const layer = evt.element;
-  console.assert(layer instanceof olLayerBase);
-  this.unregisterLayer_(layer);
+  if (evt instanceof CollectionEvent) {
+    const layer = evt.element;
+    console.assert(layer instanceof olLayerBase);
+    this.unregisterLayer_(layer);
+  }
 };