ogcopenapis 0.0.6 → 0.0.8

package/lib/OgcOpenApiFeatureStore.d.ts

@@ -4,9 +4,9 @@ import { Feature } from '@luciad/ria/model/feature/Feature';
 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';
 import { ProxifyFunction } from "./OgcOpenApiGetCapabilities";
 export interface OgcOpenApiFeatureStoreConstructorOptions {
+    swapAxes?: string[];
     dataUrl: string;
     featureUrl?: string;
     outputFormat: string;
@@ -16,13 +16,12 @@ export interface OgcOpenApiFeatureStoreConstructorOptions {
     requestHeaders?: {
         [key: string]: string;
     };
-    customCrs: string;
     extent?: {
         spatial: {
             bbox: any[];
         };
     };
-    reference: CoordinateReference;
+    crs: string;
     proxify?: ProxifyFunction;
 }
 export interface OgcOpenApiFeatureStoreQueryOptions {
@@ -80,12 +79,14 @@ export declare class OgcOpenApiFeatureStore implements Store, Evented {
     private proxy;
     private credentials;
     private serverOptions;
+    private swapAxes;
     constructor(options: OgcOpenApiFeatureStoreConstructorOptions);
     on(event: string, callback: any, context: any, options: any): Handle;
     get(id: number | string, optionsInput?: any): Promise<Feature>;
     query(receivedQuery?: OgcOpenApiFeatureStoreQueryOptions, options?: any): Cursor | Promise<Cursor>;
     spatialQuery(bounds?: Bounds, receivedQuery?: OgcOpenApiFeatureStoreQueryOptions, options?: any): Promise<Cursor> | Cursor;
     private static getCRS84BoundingBox;
+    private static targetBounds;
     private static cleanUrl;
     private static dataFormatInQuery;
 }

package/lib/OgcOpenApiFeatureStore.js

@@ -9,6 +9,7 @@ import { OgcOpenApiFetchTools } from "./OgcOpenApiFetchTools";
 export class OgcOpenApiFeatureStore {
     constructor(options) {
         // console.log(options);
+        this.swapAxes = options.swapAxes;
         this.useCrs84Bounds = typeof options.useCrs84Bounds !== "undefined" ? options.useCrs84Bounds : false;
         this.dataUrl = options.dataUrl;
         this.outputFormat = options.outputFormat;
@@ -16,11 +17,12 @@ export class OgcOpenApiFeatureStore {
         this.featureUrl = options.featureUrl ? OgcOpenApiFeatureStore.cleanUrl(options.featureUrl) : OgcOpenApiFeatureStore.cleanUrl(predictedFeatureUrl);
         this.baseUrl = OgcOpenApiFeatureStore.cleanUrl(this.dataUrl);
         this.dataFormat = OgcOpenApiFeatureStore.dataFormatInQuery(this.dataUrl);
-        this.customCrs = options.customCrs;
+        this.customCrs = options.crs === "http://www.opengis.net/def/crs/OGC/1.3/CRS84" ? undefined : options.crs;
         this.codec = options.codec;
         this.eventedSupport = new EventedSupport();
         this.requestHeaders = options.requestHeaders ? options.requestHeaders : {};
-        this.reference = options.reference;
+        const referenceName = OgcOpenApiCrsTools.getReferenceName(options.crs);
+        this.reference = getReference(referenceName);
         this.proxy = options.proxify;
         this.credentials = options.credentials;
         this.serverOptions = OgcOpenApiFetchTools.createFetchOptions({ originalUrl: this.dataUrl, proxify: options.proxify });
@@ -29,13 +31,14 @@ export class OgcOpenApiFeatureStore {
             options.extent.spatial.bbox &&
             options.extent.spatial.bbox.length > 0) {
             const bbox = options.extent.spatial.bbox[0];
-            // console.log(options.extent.spatial);
-            this.bounds = createBounds(this.reference, [
+            const WGS84 = getReference("CRS:84");
+            const tmpBounds = createBounds(WGS84, [
                 bbox[0],
                 bbox[2] - bbox[0],
                 bbox[1],
                 bbox[3] - bbox[1],
             ]);
+            this.bounds = OgcOpenApiFeatureStore.targetBounds(tmpBounds, this.reference);
         }
     }
     on(event, callback, context, options) {
@@ -85,8 +88,14 @@ export class OgcOpenApiFeatureStore {
                         const codecOptions = {
                             content, contentType, contentCrs, contentLength
                         };
-                        const cursor = this.codec.decode(codecOptions);
-                        if (cursor.hasNext()) {
+                        let cursor = null;
+                        if (this.codec instanceof GeoJsonCodec || this.codec instanceof GMLCodec) {
+                            cursor = this.codec.decode(Object.assign(Object.assign({}, codecOptions), { reference: getReference(OgcOpenApiCrsTools.getReferenceName(contentCrs)) }));
+                        }
+                        else {
+                            cursor = this.codec.decode(codecOptions);
+                        }
+                        if (cursor && cursor.hasNext()) {
                             const feaure = cursor.next();
                             resolve(feaure);
                         }
@@ -187,6 +196,10 @@ export class OgcOpenApiFeatureStore {
                 if (this.customCrs) {
                     query["bbox-crs"] = this.customCrs;
                 }
+                const referenceName = OgcOpenApiCrsTools.getReferenceName(this.customCrs);
+                if (this.swapAxes && this.swapAxes.findIndex(f => f === referenceName) > -1) {
+                    query.bbox = [query.bbox[1], query.bbox[0], query.bbox[3], query.bbox[2]];
+                }
             }
         }
         return this.query(query, options);
@@ -198,6 +211,12 @@ export class OgcOpenApiFeatureStore {
         const newBounds = toWgs84.transformBounds(bounds);
         return newBounds;
     }
+    static targetBounds(bounds, targetReferenceBounds) {
+        const WGS84 = getReference("CRS:84");
+        const toTargetReference = createTransformation(WGS84, targetReferenceBounds);
+        const newBounds = toTargetReference.transformBounds(bounds);
+        return newBounds;
+    }
     static cleanUrl(dataUrl) {
         const parts = dataUrl.split('?');
         const cleanUrl = parts[0].endsWith('/') ? parts[0] : parts[0] + '/';

package/package.json

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