Query: Fix max results message

src/query/MapQuerent.js

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2017-2024 Camptocamp SA
+// Copyright (c) 2017-2025 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -225,7 +225,7 @@ export class MapQuerent {
       console.assert(dataSource);
       const querentResultItem = response[id];
       const features = querentResultItem.features;
-      const limit = querentResultItem.limit;
+      const featuresCount = querentResultItem.featuresCount;
       const tooManyResults = querentResultItem.tooManyFeatures === true;
       const totalFeatureCount = querentResultItem.totalFeatureCount;
       const requestPartners = querentResultItem.requestPartners;
@@ -299,7 +299,7 @@ export class MapQuerent {
             features: featuresByType,
             id: id,
             label: label,
-            limit: limit,
+            featuresCount: featuresCount,
             pending: false,
             tooManyResults: tooManyResults,
             totalFeatureCount: totalFeatureCount,

src/query/Querent.js

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2017-2024 Camptocamp SA
+// Copyright (c) 2017-2025 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -46,7 +46,7 @@ import olSourceImageWMS from 'ol/source/ImageWMS';
 /**
  * @typedef {Object} QuerentResultItem
  * @property {import('ol/Feature').default<import('ol/geom/Geometry').default>[]} features
- * @property {number} limit
+ * @property {number} featuresCount
  * @property {boolean} [tooManyFeatures]
  * @property {number} [totalFeatureCount]
  * @property {string []} [requestPartners] All datasources requested in the same request
@@ -403,8 +403,9 @@ export class Querent {
         'version': '1.0.0',
       });
     }
-    const limit = formatWFS.readFeatures(response.data).length;
-    const tooManyFeatures = totalFeatureCount > limit;
+    const featuresCount = formatWFS.readFeatures(response.data).length;
+    const tooManyFeatures =
+      totalFeatureCount > 0 ? totalFeatureCount > featuresCount : maxFeatures <= featuresCount;
     /** @type {string[]} */
     const datasourceNames = [];
     for (const dataSource of dataSources) {
@@ -418,13 +419,13 @@ export class Querent {
       this.setUniqueIds_(features, dataSource.id);
       hash[dataSourceId] = {
         features,
-        limit,
+        featuresCount: featuresCount,
         tooManyFeatures,
         totalFeatureCount,
       };
     }
     Object.values(hash).forEach(function (value, index) {
-      value.limit = limit;
+      value.featuresCount = featuresCount;
       value.tooManyFeatures = tooManyFeatures;
       value.requestPartners = datasourceNames;
     });
@@ -456,7 +457,7 @@ export class Querent {
         this.setUniqueIds_(features, dataSource.id);
         hash[dataSourceId] = {
           features,
-          limit,
+          featuresCount: limit,
           tooManyFeatures,
           totalFeatureCount,
         };
@@ -468,7 +469,7 @@ export class Querent {
         this.setUniqueIds_(features, dataSource.id);
         hash[dataSourceId] = {
           features,
-          limit,
+          featuresCount: limit,
         };
       }
     }
@@ -740,7 +741,6 @@ export class Querent {
       //     If we do not need to count features first, then proceed with
       //     an normal WFS GetFeature request.
 
-      options.queryCountFirst = false;
       const canceler = this.registerCanceler_();
       /** @type {angular.IPromise<QuerentResult>} */
       const countPromise = new Promise((resolve, reject) => {
@@ -877,7 +877,7 @@ export class Querent {
     const promises = [];
 
     // The 'limit' option is mandatory in the querent service
-    const FEATURE_COUNT = options.limit;
+    const limit = options.limit;
     const map = options.map;
     const view = map.getView();
     const resolution = view.getResolution();
@@ -987,7 +987,7 @@ export class Querent {
       // (4) Build query url, then launch
       const wmsGetFeatureInfoUrl = wmsSource.getFeatureInfoUrl(coordinate, resolution, projCode, {
         // Without extern, quoting is necessary
-        'FEATURE_COUNT': FEATURE_COUNT,
+        'FEATURE_COUNT': limit,
         'INFO_FORMAT': INFO_FORMAT,
       });
       if (!wmsGetFeatureInfoUrl) {
@@ -1001,7 +1001,7 @@ export class Querent {
           })
           .then(
             /** @type {function(angular.IHttpResponse<Document|Element|string>|number): QuerentResult} */
-            this.handleQueryResult_.bind(this, dataSources, FEATURE_COUNT, false),
+            this.handleQueryResult_.bind(this, dataSources, limit, false),
           ),
       );
     }

src/query/gridComponent.html.js

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2024 Camptocamp SA
+// Copyright (c) 2024-2025 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -62,9 +62,12 @@ export default `<div class="gmf-displayquerygrid panel" ng-show="ctrl.active">
       >
         <div class="col-md-5 my-auto">
           <span ng-if="ctrl.hasOneWithTooManyResults_()" class="gmf-query-grid-too-many text-warning"
-            >{{'Only' | translate}} {{ctrl.sumOfFeatures}} {{'of' | translate}} {{ctrl.sumOfAvailableResults}}
+            ><span ng-if="ctrl.sumOfAvailableResults >= 0">{{'Only' | translate}} {{ctrl.sumOfFeatures}} {{'of' | translate}} {{ctrl.sumOfAvailableResults}}
             {{'results displayed, as the maximum number is reached. Please refine your query.' | translate
             }}</span
+          ><span ng-if="ctrl.sumOfAvailableResults < 0">{{'One of the queries returns the maximum number of results, but probably not all the  results are displayed. Please refine your query.' | translate}}
+          </span
+          ></span
           >
         </div>
         <div class="col-md-7" class="pull-right">

src/query/gridComponent.js

@@ -10,7 +10,7 @@ QueryGridController.$inject = [
 ];
 // The MIT License (MIT)
 //
-// Copyright (c) 2016-2024 Camptocamp SA
+// Copyright (c) 2016-2025 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -368,7 +368,12 @@ QueryGridController.prototype.updateData_ = function () {
       this.sumOfFeatures += source.features.length;
     }
     if (!source.requestPartners || !source.requestPartners.some((label) => countedSources.includes(label))) {
-      this.sumOfAvailableResults += source.totalFeatureCount;
+      if (source.totalFeatureCount < 0 || this.sumOfAvailableResults < 0) {
+        // At least one query without any count => we can't display the total count
+        this.sumOfAvailableResults = -1;
+      } else {
+        this.sumOfAvailableResults += source.totalFeatureCount;
+      }
     }
     countedSources.push(source.label);
   });
@@ -520,7 +525,7 @@ QueryGridController.prototype.getMergedSource_ = function (source, mergedSources
       features: [],
       id: mergeSourceId,
       label: mergeSourceId,
-      limit: 0,
+      featuresCount: 0,
       //the sum of the obtained results of the query is computed later
       pending: false,
       tooManyResults: false,
@@ -547,7 +552,7 @@ QueryGridController.prototype.getMergedSource_ = function (source, mergedSources
           ? mergeSource.totalFeatureCount + source.totalFeatureCount
           : source.totalFeatureCount;
     }
-    mergeSource.limit += source.limit;
+    mergeSource.featuresCount += source.featuresCount;
   }
   return mergeSource;
 };

src/statemanager/WfsPermalink.js

@@ -7,7 +7,7 @@ WfsPermalinkService.$inject = [
 ];
 // The MIT License (MIT)
 //
-// Copyright (c) 2016-2024 Camptocamp SA
+// Copyright (c) 2016-2025 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -42,8 +42,7 @@ import olFormatWFS from 'ol/format/WFS';
  * @property {Feature<import('ol/geom/Geometry').default>[]} features The matching features for this source.
  * @property {number|string} id Identifier (can be not unique).
  * @property {string} label Label.
- * @property {number} [limit] The maximum number of features that can be returned for a query with this
- *    source.
+ * @property {number} [featuresCount] The total number of features that corresponds to the query.
  * @property {boolean} pending Is the request for this source still ongoing?
  * @property {boolean} [tooManyResults] If the last query for this source would return more features than the
  *    configured limit.