ogcopenapis 0.0.3 → 0.0.4

package/lib/OgcOpenApiFeatureStore.d.ts

@@ -5,11 +5,11 @@ import { Evented, Handle } from '@luciad/ria/util/Evented';
 import { Bounds } from '@luciad/ria/shape/Bounds';
 import { Codec, CodecDecodeOptions } from '@luciad/ria/model/codec/Codec';
 import { CoordinateReference } from '@luciad/ria/reference/CoordinateReference';
-interface OAPIFeatureStoreConstructorOptions {
+export interface OgcOpenApiFeatureStoreConstructorOptions {
     dataUrl: string;
     featureUrl?: string;
     outputFormat: string;
-    useCrs84Bounds: boolean;
+    useCrs84Bounds?: boolean;
     codec: Codec;
     requestHeaders?: {
         [key: string]: string;
@@ -22,7 +22,7 @@ interface OAPIFeatureStoreConstructorOptions {
     };
     reference: CoordinateReference;
 }
-interface OAPIFeatureStoreQueryOptions {
+export interface OgcOpenApiFeatureStoreQueryOptions {
     f?: string;
     limit?: number;
     offset?: number;
@@ -57,7 +57,7 @@ interface OAPIFeatureStoreQueryOptions {
     wkhrCode?: string;
     wkhrRemark?: string;
 }
-interface OgcOpenApiCodecDecodeOptions extends CodecDecodeOptions {
+interface OgcOpenApiFeaturesCodecDecodeOptions extends CodecDecodeOptions {
     contentCrs?: string;
     contentLength?: number;
 }
@@ -74,13 +74,13 @@ export declare class OgcOpenApiFeatureStore implements Store, Evented {
     private outputFormat;
     private useCrs84Bounds;
     private featureUrl;
-    constructor(options: OAPIFeatureStoreConstructorOptions);
+    constructor(options: OgcOpenApiFeatureStoreConstructorOptions);
     on(event: string, callback: any, context: any, options: any): Handle;
     get(id: number | string, optionsInput?: any): Promise<Feature>;
-    query(receivedQuery?: OAPIFeatureStoreQueryOptions, options?: any): Cursor | Promise<Cursor>;
-    spatialQuery(bounds?: Bounds, receivedQuery?: OAPIFeatureStoreQueryOptions, options?: any): Promise<Cursor> | Cursor;
+    query(receivedQuery?: OgcOpenApiFeatureStoreQueryOptions, options?: any): Cursor | Promise<Cursor>;
+    spatialQuery(bounds?: Bounds, receivedQuery?: OgcOpenApiFeatureStoreQueryOptions, options?: any): Promise<Cursor> | Cursor;
     private static getCRS84BoundingBox;
     private static cleanUrl;
     private static dataFormatInQuery;
 }
-export { OgcOpenApiCodecDecodeOptions };
+export { OgcOpenApiFeaturesCodecDecodeOptions };

package/lib/OgcOpenApiFeatureStore.js

@@ -2,6 +2,9 @@ import { EventedSupport } from '@luciad/ria/util/EventedSupport';
 import { createBounds } from '@luciad/ria/shape/ShapeFactory';
 import { getReference } from "@luciad/ria/reference/ReferenceProvider";
 import { createTransformation } from "@luciad/ria/transformation/TransformationFactory";
+import { OgcOpenApiCrsTools } from "./OgcOpenApiCrsTools";
+import { GeoJsonCodec } from "@luciad/ria/model/codec/GeoJsonCodec";
+import { GMLCodec } from "@luciad/ria/model/codec/GMLCodec";
 export class OgcOpenApiFeatureStore {
     constructor(options) {
         // console.log(options);
@@ -67,7 +70,7 @@ export class OgcOpenApiFeatureStore {
                 if (response.status === 200) {
                     response.text().then((content) => {
                         let contentType = response.headers.get('Content-Type');
-                        const contentCrs = response.headers.get('content-crs');
+                        const contentCrs = response.headers.get('content-crs') ? response.headers.get('content-crs') : this.customCrs;
                         const contentLengthStr = response.headers.get('Content-Length');
                         const contentLength = Number(contentLengthStr);
                         contentType = contentType ? contentType : 'text/plain';
@@ -127,7 +130,7 @@ export class OgcOpenApiFeatureStore {
                 if (response.status === 200) {
                     response.text().then((content) => {
                         let contentType = response.headers.get('Content-Type');
-                        const contentCrs = response.headers.get('content-crs');
+                        const contentCrs = response.headers.get('content-crs') ? response.headers.get('content-crs') : this.customCrs;
                         const contentLengthStr = response.headers.get('Content-Length');
                         const contentLength = Number(contentLengthStr);
                         contentType = contentType ? contentType : 'text/plain';
@@ -137,8 +140,14 @@ export class OgcOpenApiFeatureStore {
                         const codecOptions = {
                             content, contentType, contentCrs, contentLength
                         };
-                        const cursor = this.codec.decode(codecOptions);
-                        resolve(cursor);
+                        if (this.codec instanceof GeoJsonCodec || this.codec instanceof GMLCodec) {
+                            const cursor = this.codec.decode(Object.assign(Object.assign({}, codecOptions), { reference: getReference(OgcOpenApiCrsTools.getReferenceName(contentCrs)) }));
+                            resolve(cursor);
+                        }
+                        else {
+                            const cursor = this.codec.decode(codecOptions);
+                            resolve(cursor);
+                        }
                     });
                 }
             });

package/lib/OgcOpenApiFetchTools.js

@@ -18,6 +18,8 @@ class OgcOpenApiFetchTools {
         return fetch(result.url, result.fetchOptions);
     }
     static addHostURL(url, HostUrl) {
+        if (typeof url === "undefined")
+            return url;
         const hostUrl = HostUrl ? HostUrl : "";
         if (url.startsWith("http://") || url.startsWith("https://")) {
             return url;

package/lib/OgcOpenApiGetCapabilities.d.ts

@@ -98,10 +98,7 @@ export declare class OgcOpenApiGetCapabilities {
         requestHeaders?: RequestHeaders;
     }): Promise<TileSetData[]>;
     static getQuadTreeCompatibleLevelOffset(tileMatrixSet: TileSetData): number;
-    static fetchTileSets(capabilities: OgcOpenApiCapabilitiesObject | null, options?: {
-        credentials?: boolean;
-        requestHeaders?: RequestHeaders;
-    }): Promise<TileSetMeta[]>;
+    private static fetchTileSets;
     static getTilesLink(capabilities: OgcOpenApiCapabilitiesObject | null, currentCollection: OgcOpenApiCapabilitiesCollection, tileMatrixId: string, options?: {
         credentials?: boolean;
         requestHeaders?: RequestHeaders;

package/lib/OgcOpenApiGetCapabilities.js

@@ -64,12 +64,13 @@ export class OgcOpenApiGetCapabilities {
                                     const layer = Object.assign({ description: collection.description, id: name, name, title: collection.title, keywords: collection.keywords
                                             ? collection.keywords
                                             : [], defaultReference: 'CRS:84', links: collection.links, outputFormats: options.filterCollectionsByLinkType ?
-                                            this.filterCollectionLinks(collection.links, options.filterCollectionsByLinkType).map(link => this.detectTypeFormat(link)) :
-                                            collection.links.map(link => this.detectTypeFormat(link)), extent: collection.extent }, collectionCrsObject);
+                                            this.filterCollectionLinks(collection.links, options.filterCollectionsByLinkType).map(link => this.detectTypeFormat(link))
+                                            :
+                                                collection.links.map(link => this.detectTypeFormat(link)), extent: collection.extent }, collectionCrsObject);
                                     return layer;
                                 });
                                 // console.log(featureTypes);
-                                const o = Object.assign(Object.assign({ name: '', collections: foundCollections, version: responseOpenApi ? responseOpenApi.openapi : '', service: '', info: responseOpenApi ? responseOpenApi.info : {} }, crsArray), { serverOptions: serverOptions, baseUrl });
+                                const o = Object.assign(Object.assign({ name: '', collections: foundCollections.map(col => (Object.assign(Object.assign({}, col), { crs: col.crs ? col.crs : [], links: col.links.map(l => (Object.assign(Object.assign({}, l), { href: serverOptions.complete(l.href) }))) }))), version: responseOpenApi ? responseOpenApi.openapi : '', service: '', info: responseOpenApi ? responseOpenApi.info : {} }, crsArray), { serverOptions: serverOptions, baseUrl });
                                 resolve(o);
                             });
                         }
@@ -183,7 +184,7 @@ export class OgcOpenApiGetCapabilities {
                 if (result.status === 200) {
                     result.json().then((data) => {
                         if (data.tileMatrixSets) {
-                            resolve(data.tileMatrixSets);
+                            resolve(data.tileMatrixSets.map(tml => (Object.assign(Object.assign({}, tml), { href: capabilities.serverOptions.complete(tml.href) }))));
                         }
                         else {
                             reject({ error: true, message: "tileMatrixSets not defined" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ogcopenapis",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Implements OGC OPEN API Features/Maps/Tiles capabilities and models for LuciadRIA",
   "files": [
     "lib/"