Merge branch 'master' into spring7

Author: axl8713

docs/developer-guide/maps-configuration.md

@@ -1396,13 +1396,19 @@ See format specifications for more info about FlatGeobuf [here](https://flatgeob
 ```javascript
 {
     "type": "flatgeobuf",
-    "url": "https://host-sample/countries.fgb",    
+    "url": "https://host-sample/countries.fgb",
     "title": "Title",
     "group": "",
-    "visibility": true
+    "visibility": true,
+    "maxFeaturesInView": 1000
 }
 ```
 
+Where:
+
+- `url` is the URL of the FlatGeobuf source.
+- `maxFeaturesInView` (optional) the maximum number of features to load for the current map view. Used to limit rendering when the FlatGeobuf source contains many features.
+
 ## Layer groups
 
 Inside the map configuration, near the `layers` entry, you can find also the `groups` entry. This array contains information about the groups in the TOC.

web/client/actions/__tests__/widgets-test.js

@@ -105,6 +105,26 @@ describe('Test correctness of the widgets actions', () => {
         expect(retval.deletedInteractions).toBe(deletedInteractions);
         expect(retval.widget.deletedInteractions).toBeFalsy();
     });
+    it('insertWidget preserves the persisted widget payload (no transient flag stripping)', () => {
+        const widget = {
+            widgetType: 'filter',
+            title: 'My Filter'
+        };
+        const retval = insertWidget(widget);
+        expect(retval).toExist();
+        expect(retval.type).toBe(INSERT);
+        expect(retval.widget.title).toBe('My Filter');
+        expect(retval.widget.widgetType).toBe('filter');
+    });
+    it('insertWidget persists the globalWidgetMode flag so it survives edit mode', () => {
+        const widget = {
+            widgetType: 'filter',
+            globalWidgetMode: true,
+            title: 'TOC Filter'
+        };
+        const retval = insertWidget(widget);
+        expect(retval.widget.globalWidgetMode).toBe(true);
+    });
     it('updateWidget', () => {
         const widget = {};
         const retval = updateWidget(widget);

web/client/api/FlatGeobuf.js

@@ -28,7 +28,12 @@ export const FGB_FEATURE_BATCH_SIZE = 200;
  * when batches arrive faster than the network roundtrip, in cesium plugin
  */
 export const FGB_STREAM_FLUSH_INTERVAL = 500;
+export const FGB_MEANINGFUL_VIEW_RATIO = 0.95;
 
+export const getFlatGeobufMaxFeaturesInView = (options) => {
+    const maxFeaturesInView = Number(options?.maxFeaturesInView);
+    return maxFeaturesInView > 0 ? maxFeaturesInView : undefined;
+};
 export const getFlatGeobufGeojson = () => import('flatgeobuf/lib/mjs/geojson').then(mod => mod);
 export const getFlatGeobufGeneric = () => import('flatgeobuf/lib/mjs/generic').then(mod => mod);
 
@@ -45,7 +50,7 @@ function getTitleFromUrl(url) {
     return nameNoExt || filename;
 }
 
-function extractCapabilities({url}) {
+function extractCapabilities({ url }) {
     const version = FGB_VERSION;
     const format = getFormat(url || '') || FGB;
     return {
@@ -81,7 +86,7 @@ export const getCapabilities = (url) => {
                 crs: getFlatGeobufCrsFromMetadata(metadata)
             };
 
-            const capabilities = extractCapabilities({flatgeobuf, url});
+            const capabilities = extractCapabilities({ flatgeobuf, url });
 
             return {
                 ...capabilities,

web/client/api/__tests__/FlatGeobuf-test.jsx

@@ -12,6 +12,7 @@ import {
     FGB_VERSION,
     getCapabilities,
     createFlatGeobufGeometryTypeResolver,
+    getFlatGeobufMaxFeaturesInView,
     sniffFlatGeobufFirstGeometryType,
     sniffFlatGeobufFirstFeature
 } from '../FlatGeobuf';
@@ -32,6 +33,21 @@ const FGB_FILE_FIRST_FEATURE_PROPS = {
     }
 };
 describe('Test FlatGeobuf API', () => {
+    describe('getFlatGeobufMaxFeaturesInView', () => {
+        it('returns undefined when the option is not configured', () => {
+            expect(getFlatGeobufMaxFeaturesInView()).toBe(undefined);
+            expect(getFlatGeobufMaxFeaturesInView({})).toBe(undefined);
+        });
+        it('returns the positive integer option', () => {
+            expect(getFlatGeobufMaxFeaturesInView({ maxFeaturesInView: 25 })).toBe(25);
+            expect(getFlatGeobufMaxFeaturesInView({ maxFeaturesInView: '25' })).toBe(25);
+        });
+        it('ignores invalid values', () => {
+            expect(getFlatGeobufMaxFeaturesInView({ maxFeaturesInView: 0 })).toBe(undefined);
+            expect(getFlatGeobufMaxFeaturesInView({ maxFeaturesInView: -1 })).toBe(undefined);
+            expect(getFlatGeobufMaxFeaturesInView({ maxFeaturesInView: 'wrong' })).toBe(undefined);
+        });
+    });
     it('getCapabilities from FlatGeobuf file', (done) => {
         getCapabilities(FGB_FILE).then(({ bbox, format, version, title}) => {
             try {

web/client/api/catalog/FlatGeobuf.js

@@ -58,11 +58,14 @@ function validateUrl(serviceUrl) {
  * Converts a FGB record into a layerNode
  * maybe export as util method
  */
-const recordToLayer = (record) => {
+const recordToLayer = (record, {
+    service
+} = {}) => {
     if (!record) {
         return null;
     }
     const { format, properties, bbox } = record;
+    const { layerOptions } = service || {};
     return {
         type: FGB_LAYER_TYPE,
         url: record.url,
@@ -72,7 +75,8 @@ const recordToLayer = (record) => {
         sourceMetadata: record.metadata,
         ...(bbox && { bbox }),
         ...(format && { format }),
-        ...(properties && { properties })
+        ...(properties && { properties }),
+        ...layerOptions
     };
 };
 

web/client/api/catalog/GeoNode.js

@@ -53,13 +53,35 @@ export const resolveTagFilterType = (service) => {
     return getGeoNodeDefaultTagFilterType();
 };
 
+const getTagLabel = (tag, tagFilterType) => {
+    if (!tag || typeof tag !== 'object') {
+        return tag;
+    }
+    if (tagFilterType === 'category') {
+        return tag.label || tag.gn_description || tag.identifier;
+    }
+    if (tagFilterType === 'keyword') {
+        return tag.label || tag.name || tag.slug;
+    }
+    return tag.label || tag.name || tag.gn_description || tag.identifier || tag.slug;
+};
+
+const normalizeTag = (tag, tagFilterType) => {
+    if (!tag || typeof tag !== 'object') {
+        return tag;
+    }
+    const label = getTagLabel(tag, tagFilterType);
+    return label ? { ...tag, label } : tag;
+};
+
 export const getCatalogRecords = (records, options) => {
     if (records && records.records) {
         const tagFilterType = resolveTagFilterType(options?.service);
         return records.records.map((record) => {
-            const tags = tagFilterType === 'keyword'
+            const tags = (tagFilterType === 'keyword'
                 ? (record.keywords || [])
-                : (record.category ? [record.category] : []);
+                : (record.category ? [record.category] : []))
+                .map((tag) => normalizeTag(tag, tagFilterType));
             return {
                 ...record,
                 serviceType: "geonode",

web/client/api/catalog/__tests__/FlatGeobuf-test.js

@@ -42,5 +42,20 @@ describe('Test FlatGeobuf API catalog', () => {
         expect(layer.type).toEqual(FGB_LAYER_TYPE);
         expect(layer.url).toEqual(FGB_FILE);
     });
+    it('should merge service layer options into the layer config', () => {
+        const catalogRecord = {
+            serviceType: FGB_LAYER_TYPE,
+            isValid: true,
+            identifier: FGB_FILE,
+            url: FGB_FILE
+        };
+        const layer = getLayerFromRecord(catalogRecord, {
+            service: {
+                layerOptions: {
+                    maxFeaturesInView: 10
+                }
+            }
+        });
+        expect(layer.maxFeaturesInView).toBe(10);
+    });
 });
-

web/client/api/catalog/__tests__/GeoNode-test.js

@@ -37,6 +37,40 @@ describe('Test correctness of the GeoNode catalog APIs', () => {
         expect(records[0].pk).toBe(123);
     });
 
+    it('geonode catalog records mapping uses category label for tags', () => {
+        const records = getCatalogRecords({
+            records: [{
+                title: 'Title',
+                category: {
+                    identifier: 'boundaries',
+                    gn_description: 'Boundaries'
+                },
+                pk: 123
+            }]
+        });
+        expect(records[0].tags).toEqual([{
+            identifier: 'boundaries',
+            gn_description: 'Boundaries',
+            label: 'Boundaries'
+        }]);
+    });
+
+    it('geonode catalog records mapping falls back to category identifier for tag label', () => {
+        const records = getCatalogRecords({
+            records: [{
+                title: 'Title',
+                category: {
+                    identifier: 'boundaries'
+                },
+                pk: 123
+            }]
+        });
+        expect(records[0].tags).toEqual([{
+            identifier: 'boundaries',
+            label: 'boundaries'
+        }]);
+    });
+
     it('geonode catalog records returns null with no records', () => {
         expect(getCatalogRecords()).toBe(null);
         expect(getCatalogRecords({})).toBe(null);

web/client/components/TOC/fragments/settings/Display.jsx

@@ -16,9 +16,10 @@ import {Checkbox, Col, ControlLabel, FormGroup, Glyphicon, Grid, Row, Button as
 
 import tooltip from '../../../misc/enhancers/buttonTooltip';
 const Button = tooltip(ButtonRB);
-import IntlNumberFormControl from '../../../I18N/IntlNumberFormControl';
+import MSIntlNumberFormControl from '../../../I18N/IntlNumberFormControl';
 import Message from '../../../I18N/Message';
 import InfoPopover from '../../../widgets/widget/InfoPopover';
+import localizedProps from '../../../misc/enhancers/localizedProps';
 import Legend from '../../../../plugins/TOC/components/Legend';
 import VisibilityLimitsForm from './VisibilityLimitsForm';
 import { ServerTypes } from '../../../../utils/LayersUtils';
@@ -32,6 +33,8 @@ import StyleBasedWMSJsonLegend from '../../../../plugins/TOC/components/StyleBas
 import VectorLegend from '../../../../plugins/TOC/components/VectorLegend';
 import { isMapServerUrl } from '../../../../utils/ArcGISUtils';
 
+const IntlNumberFormControl = localizedProps('placeholder')(MSIntlNumberFormControl);
+
 export default class extends React.Component {
     static propTypes = {
         opacityText: PropTypes.node,
@@ -124,6 +127,11 @@ export default class extends React.Component {
         });
     }
 
+    onMaxFeaturesInViewChange = (value) => {
+        const maxFeaturesInView = parseInt(value, 10);
+        this.props.onChange("maxFeaturesInView", maxFeaturesInView > 0 ? maxFeaturesInView : undefined);
+    };
+
     getValidationState = (name) =>{
         if (this.state.legendOptions && this.state.legendOptions[name]) {
             return parseInt(this.state.legendOptions[name], 10) < 12 && "error";
@@ -212,6 +220,22 @@ export default class extends React.Component {
                     </Col>
                 </Row>}
 
+                {this.props.element.type === "flatgeobuf" && <Row>
+                    <Col xs={12}>
+                        <FormGroup>
+                            <ControlLabel><Message msgId="layerProperties.maxFeaturesInView" /></ControlLabel>
+                            <IntlNumberFormControl
+                                data-qa="display-max-features-in-view"
+                                type="number"
+                                min={1}
+                                step={1}
+                                placeholder="layerProperties.maxFeaturesInViewPlaceholder"
+                                value={this.props.element.maxFeaturesInView === undefined ? '' : this.props.element.maxFeaturesInView}
+                                onChange={this.onMaxFeaturesInViewChange}/>
+                        </FormGroup>
+                    </Col>
+                </Row>}
+
                 <Row>
                     <Col xs={12}>
                         <FormGroup>

web/client/components/TOC/fragments/settings/__tests__/Display-test.jsx

@@ -53,6 +53,32 @@ describe('test Layer Properties Display module component', () => {
         ReactTestUtils.Simulate.focus(inputs[0]);
         expect(inputs[0].value).toBe('100');
     });
+    it('tests Display component for FlatGeobuf max features in view field', () => {
+        const l = {
+            name: 'layer00',
+            title: 'Layer',
+            visibility: true,
+            storeIndex: 9,
+            type: 'flatgeobuf',
+            url: 'fakeurl',
+            maxFeaturesInView: 7
+        };
+        const settings = {
+            options: {opacity: 1}
+        };
+        const handlers = {
+            onChange() {}
+        };
+        const spyOn = expect.spyOn(handlers, 'onChange');
+        ReactDOM.render(<Display element={l} settings={settings} onChange={handlers.onChange}/>, document.getElementById("container"));
+        const maxFeaturesInView = document.querySelector('[data-qa="display-max-features-in-view"]');
+        expect(maxFeaturesInView).toBeTruthy();
+        expect(maxFeaturesInView.value).toBe('7');
+        ReactTestUtils.Simulate.change(maxFeaturesInView, { target: { value: '15' } });
+        expect(spyOn.calls[0].arguments).toEqual([ 'maxFeaturesInView', 15 ]);
+        ReactTestUtils.Simulate.change(maxFeaturesInView, { target: { value: '' } });
+        expect(spyOn.calls[1].arguments).toEqual([ 'maxFeaturesInView', undefined ]);
+    });
     it('tests Display component for wms for map viewer', () => {
         const l = {
             name: 'layer00',