update flatgeobuf 4.4.0 using readMetadata

Author: stefanocudini

package.json

@@ -159,7 +159,7 @@
     "eventlistener": "0.0.1",
     "file-saver": "1.3.3",
     "filtrex": "2.1.0",
-    "flatgeobuf": "4.3.3",
+    "flatgeobuf": "4.4.0",
     "font-awesome": "4.7.0",
     "fs-extra": "3.0.1",
     "git-revision-webpack-plugin": "5.0.0",
@@ -302,4 +302,4 @@
   },
   "author": "GeoSolutions",
   "license": "BSD-2-Clause"
-}
+}

web/client/api/FlatGeobuf.js

@@ -7,8 +7,6 @@
  */
 import axios from '../libs/ajax';
 import isEmpty from 'lodash/isEmpty';
-import { extend, createEmpty } from 'ol/extent';
-import { GeoJSON } from 'ol/format';
 
 /**
  * constants of FlatGeobuf format
@@ -18,6 +16,7 @@ export const FGB_LAYER_TYPE = 'flatgeobuf';
 export const FGB_VERSION = '3.0.1'; // supported format version
 
 export const getFlatGeobufGeojson = () => import('flatgeobuf/lib/mjs/geojson').then(mod => mod);
+export const getFlatGeobufGeneric = () => import('flatgeobuf/lib/mjs/generic').then(mod => mod);  // implement readMetadata()
 export const getFlatGeobufOl = () => import('flatgeobuf/lib/mjs/ol').then(mod => mod);
 
 function getFormat(url) {
@@ -28,7 +27,9 @@ function getFormat(url) {
 
 function getTitleFromUrl(url) {
     const parts = url.split('/');
-    return parts[parts.length - 2];
+    const filename = parts[parts.length - 1];
+    const nameNoExt = filename.split('.').slice(0, -1).join('.');
+    return nameNoExt || filename;
 }
 
 function extractCapabilities({url}) {
@@ -45,56 +46,25 @@ function extractCapabilities({url}) {
 // copy and paste in catalog for testing: https://flatgeobuf.org/test/data/countries.fgb
 //
 export const getCapabilities = (url) => {
-    return getFlatGeobufGeojson().then(async flatgeobuf => { // load lib dynamically
+    return getFlatGeobufGeneric().then(async flatgeobuf => { // load lib dynamically
         return axios.get(url, {
-            adapter: config => {
-                return fetch(config.url); // use fetch adapter to get a stream
+            adapter: async config => {
+                // fetch(config.url); // use fetch adapter to get a stream
+                return await flatgeobuf.readMetadata(config.url); // readMetadata accept also request headers as param
             }
-        }).then(async({body}) => {
+        }).then(async(metadata) => {
 
-            const features = [];
-            let metadata = {};
-            let rect; // if undefined read all features
-
-            // ///// TODO  replace .deserialize() with new method .readMetadata()
-            // when available in flatgeobuf lib > v4.4.5
-            // just merged here: https://github.com/flatgeobuf/flatgeobuf/commit/15f137cdf30495dd84afda6159e537df39d5309c
-
-            /**
-             * flatgeobuf.deserialize() return a AsyncGenerator
-             */
-            for await (let feature of flatgeobuf.deserialize(
-                body,
-                rect,
-                function HeaderMetaFn(meta) {
-                    // sample of metadata structure /web/client/test-resources/flatgeobuf/UScounties_subset.metadata.json
-                    const crs = `${meta?.crs?.org}:${meta?.crs?.code}`;
-                    const title = !isEmpty(meta?.title) ? meta.title : getTitleFromUrl(url);
-                    metadata = {
-                        ...metadata,
-                        title,
-                        crs
-                    };
-                })
-            ) {
-                features.push(new GeoJSON().readFeature(feature));
-            }
-
-            // TODO simplify using new method readMetadata(url) when available in flatgeobuf lib > v4.4.5
-            // that return envelope
-
-            const totExtent = features.reduce((extent, feature) => {
-                return extend(extent, feature.getGeometry().getExtent());
-            }, createEmpty());
+            // const metadata = await flatgeobuf.readMetadata(url);
+            metadata.title = !isEmpty(metadata?.title) ? metadata.title : getTitleFromUrl(url);
 
             const bbox = {
                 bounds: {
-                    minx: totExtent[0],
-                    miny: totExtent[1],
-                    maxx: totExtent[2],
-                    maxy: totExtent[3]
+                    minx: metadata.envelope[0],
+                    miny: metadata.envelope[1],
+                    maxx: metadata.envelope[2],
+                    maxy: metadata.envelope[3]
                 },
-                crs: metadata.crs || 'EPSG:4326'
+                crs: metadata.crs ? `${metadata.crs.org}:${metadata.crs.code}` : 'EPSG:4326'
             };
 
             const capabilities = extractCapabilities({flatgeobuf, url});

web/client/api/catalog/FlatGeobuf.js

@@ -23,6 +23,7 @@ const getRecords = (url) => {
         .then(({ ...properties }) => {
             const records = [{
                 ...properties,
+                visibility: true,
                 type: FGB_LAYER_TYPE,
                 url
             }];
@@ -55,13 +56,12 @@ const recordToLayer = (record) => {
     if (!record) {
         return null;
     }
-    const { bbox, format, properties } = record;
+    const { format, properties } = record;
     return {
         type: FGB_LAYER_TYPE,
         url: record.url,
         title: record.title,
         visibility: true,
-        ...(bbox && { bbox }),
         ...(format && { format }),
         ...(properties && { properties })
     };
@@ -76,6 +76,7 @@ export const validate = (service) => {
     throw new Error("catalog.config.notValidURLTemplate");
 };
 export const testService = (service) => Observable.of(service);
+
 export const textSearch = (url, startPosition, maxRecords, text, info) => getRecords(url, startPosition, maxRecords, text, info);
 
 export const getCatalogRecords = (response) => {

…pi/catalog/__tests__/FlatGeobuf-test.jsx …api/catalog/__tests__/FlatGeobuf-test.jsweb/client/api/catalog/__tests__/FlatGeobuf-test.jsx renamed to web/client/api/catalog/__tests__/FlatGeobuf-test.js web/client/api/catalog/__tests__/FlatGeobuf-test.jsx renamed to web/client/api/catalog/__tests__/FlatGeobuf-test.js

@@ -25,8 +25,8 @@ describe('Test FlatGeobuf API catalog', () => {
                 expect(response.records.length).toBe(1);
                 expect(response.records[0].type).toBe(FGB_LAYER_TYPE);
                 expect(response.records[0].visibility).toBe(true);
+                expect(response.records[0].title).toBe('UScounties_subset');
                 expect(response.records[0].format).toBe(FGB);
-                // TODO test bbox on flatgeobuf upgrade > v4.4.5
                 done();
             });
     });
@@ -38,11 +38,9 @@ describe('Test FlatGeobuf API catalog', () => {
             url: FGB_FILE
         };
         const layer = getLayerFromRecord(catalogRecord);
-        expect(layer.type).toEqual("model");
+        expect(layer.visibility).toBe(true);
+        expect(layer.type).toEqual(FGB_LAYER_TYPE);
         expect(layer.url).toEqual(FGB_FILE);
-        expect(layer.title).toEqual("Title");
-        expect(layer.visibility).toEqual(true);
-        expect(layer.bbox.crs).toEqual('EPSG:4326');
     });
 });