ogcopenapis 0.0.11 → 0.0.12

package/lib/OgcOpenApiFeatureStore.js

@@ -14,7 +14,7 @@ export class OgcOpenApiFeatureStore {
         this.dataUrl = options.dataUrl;
         this.outputFormat = options.outputFormat;
         const predictedFeatureUrl = this.dataUrl.replace(/\.[^/.]+$/, "");
-        this.featureUrl = options.featureUrl ? OgcOpenApiFeatureStore.cleanUrl(options.featureUrl) : OgcOpenApiFeatureStore.cleanUrl(predictedFeatureUrl);
+        this.featureUrl = options.featureUrl ? OgcOpenApiFeatureStore.cleanUrl(options.featureUrl, true) : OgcOpenApiFeatureStore.cleanUrl(predictedFeatureUrl, true);
         this.baseUrl = OgcOpenApiFeatureStore.cleanUrl(this.dataUrl);
         this.dataFormat = OgcOpenApiFeatureStore.dataFormatInQuery(this.dataUrl);
         this.customCrs = options.crs === "http://www.opengis.net/def/crs/OGC/1.3/CRS84" ? undefined : options.crs;
@@ -109,7 +109,7 @@ export class OgcOpenApiFeatureStore {
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     query(receivedQuery, options) {
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             const query = receivedQuery ? Object.assign({}, receivedQuery) : {};
             query.f = query.f ? query.f : this.dataFormat;
             query.crs = query.crs ? query.crs : this.customCrs;
@@ -165,6 +165,11 @@ export class OgcOpenApiFeatureStore {
                         }
                     });
                 }
+                else {
+                    reject();
+                }
+            }).catch(() => {
+                reject();
             });
         });
     }
@@ -217,10 +222,9 @@ export class OgcOpenApiFeatureStore {
         const newBounds = toTargetReference.transformBounds(bounds);
         return newBounds;
     }
-    static cleanUrl(dataUrl) {
+    static cleanUrl(dataUrl, addSlash = false) {
         const parts = dataUrl.split('?');
-        const cleanUrl = parts[0].endsWith('/') ? parts[0] : parts[0] + '/';
-        return cleanUrl;
+        return parts[0].endsWith('/') ? parts[0] : (addSlash ? parts[0] + '/' : parts[0]);
     }
     static dataFormatInQuery(dataUrl) {
         let format;

package/lib/OgcOpenApiFetchTools.d.ts

@@ -24,6 +24,7 @@ declare class OgcOpenApiFetchTools {
     static fetch(input: string, options: RequestInit, serverOptions: FetchServerOptions): Promise<Response>;
     static addHostURL(url: string, HostUrl?: string): string;
     static cleanUrl(inputUrl: string): string;
+    static cleanUrlToAsset(inputUrl: string): string;
     static getHostURL(fullUrl: string): string;
 }
 export { OgcOpenApiFetchTools };

package/lib/OgcOpenApiFetchTools.js

@@ -33,8 +33,10 @@ class OgcOpenApiFetchTools {
         return hostUrl + "/" + url;
     }
     static cleanUrl(inputUrl) {
-        const url = inputUrl.split("?")[0].replace(/\/?$/, '/');
-        return url;
+        return inputUrl.split("?")[0].replace(/\/?$/, '/');
+    }
+    static cleanUrlToAsset(inputUrl) {
+        return inputUrl.split("?")[0].replace(/\/?$/, '');
     }
     static getHostURL(fullUrl) {
         if (!fullUrl.startsWith("http"))

package/lib/OgcOpenApiGetCapabilities.js

@@ -248,7 +248,7 @@ export class OgcOpenApiGetCapabilities {
             }
             let jsonLink = tileset.links.find(l => l.type ? l.type === "application/json" : false);
             jsonLink = jsonLink ? jsonLink : tileset.links[0];
-            const href = OgcOpenApiFetchTools.cleanUrl(jsonLink.href);
+            const href = OgcOpenApiFetchTools.cleanUrlToAsset(jsonLink.href);
             OgcOpenApiFetchTools.fetch(href, {
                 method: "GET",
                 credentials: (options === null || options === void 0 ? void 0 : options.credentials) ? "same-origin" : "omit",

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "ogcopenapis",
-  "version": "0.0.11",
-  "description": "Implements OGC OPEN API Features/Maps/Tiles capabilities and models for LuciadRIA",
-  "files": [
-    "lib/"
-  ],
-  "scripts": {
-    "test": "jest",
-    "transpile": "tsc -p tsconfig.json",
-    "copyjs": "copyfiles -u 1 \"src/**/*.js\" ./lib",
-    "copycss": "copyfiles -u 1 \"src/**/*.css\" ./lib",
-    "copyscss": "copyfiles -u 1 \"src/**/*.scss\" ./lib",
-    "copysvg": "copyfiles -u 1 \"src/**/*.svg\" ./lib",
-    "copyfonts": "copyfiles -u 1 \"src/fonts/**\" ./lib",
-    "build": "npm run transpile && npm run copyjs && npm run copycss && npm run copyscss && npm run copysvg && npm run copyfonts"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-typescript": "^7.18.6",
-    "@jest/globals": "^29.3.1",
-    "copyfiles": "^2.3.0",
-    "isomorphic-fetch": "^3.0.0",
-    "jest": "^29.3.1",
-    "jest-canvas-mock": "^2.4.0",
-    "jest-environment-jsdom": "^29.3.1",
-    "typescript": "^4.6.3"
-  },
-  "dependencies": {
-    "@luciad/ria": ">=2020.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/felipecarrillo100/ogcopenapis"
-  }
-}
+{
+  "name": "ogcopenapis",
+  "version": "0.0.12",
+  "description": "Implements OGC OPEN API Features/Maps/Tiles capabilities and models for LuciadRIA",
+  "files": [
+    "lib/"
+  ],
+  "scripts": {
+    "test": "jest",
+    "transpile": "tsc -p tsconfig.json",
+    "copyjs": "copyfiles -u 1 \"src/**/*.js\" ./lib",
+    "copycss": "copyfiles -u 1 \"src/**/*.css\" ./lib",
+    "copyscss": "copyfiles -u 1 \"src/**/*.scss\" ./lib",
+    "copysvg": "copyfiles -u 1 \"src/**/*.svg\" ./lib",
+    "copyfonts": "copyfiles -u 1 \"src/fonts/**\" ./lib",
+    "build": "npm run transpile && npm run copyjs && npm run copycss && npm run copyscss && npm run copysvg && npm run copyfonts"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-typescript": "^7.18.6",
+    "@jest/globals": "^29.3.1",
+    "copyfiles": "^2.3.0",
+    "isomorphic-fetch": "^3.0.0",
+    "jest": "^29.3.1",
+    "jest-canvas-mock": "^2.4.0",
+    "jest-environment-jsdom": "^29.3.1",
+    "typescript": "^4.6.3"
+  },
+  "dependencies": {
+    "@luciad/ria": ">=2020.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/felipecarrillo100/ogcopenapis"
+  }
+}