Update map with latest PM after datasources are connected

CHANGELOG.md

@@ -0,0 +1,41 @@
+# Changelog
+
+## **3.1.5**
+### Fixes
+Add forgotten offset parameter to `DataStream`'s `searchObservations()` method
+
+## **3.1.4**
+### Fixes
+Allow specification of page offset in collection requests.
+
+## **3.1.3**
+### Fixes
+Fixed DataStream stream connector using MQTT `shared` property.
+
+## **3.1.2**
+### Fixes
+- Uncomment `obsFormat` in `parseDataBlock()` which broke live data streams.
+
+## **3.1.1**
+### Fixes
+- Add headers to collection requests made using the Connected Systems API. This fixes authentication issues when collection requests are made.
+- Fixed command and command status collection parsing.
+- Corrected `ObservationFilter` to use accurate default query parameters according to OGC API - Connected Systems specification.
+### Additions
+- Added Jest for unit testing.
+- Added control stream and data stream collection tests.
+
+## **3.1.0**
+### Changes
+Added `addImageOverlay()` method to `LeafletView` for adding image overlay onto Leaflet map.
+
+## **3.0.0**
+### Changes
+Refactored SWE API code to use naming conventions, query parameters, and correct paths of newer OGC API - Connected Systems standard.
+OGC API - Connected Systems is the newest, OGC compliant version of the old Sensor Web Enablement (SWE) API.
+
+## **2.1.0**
+
+## **2.0.1**
+
+## **1.0.0**

README.md

@@ -71,6 +71,7 @@ $ npm run prod
 
 
 ## Dependencies
+
 ### Cesium
 
 If you use the CesiumView, don't forget to install the corresponding npm package 'cesium'.

babel.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+    presets: [
+        ['@babel/preset-env', { targets: { node: 'current' } }],
+    ],
+};

config/prepare-lib.js

@@ -23,3 +23,8 @@ fs.copyFileSync(
   path.resolve(__dirname, '../README.md'),
   path.join(buildDir, 'README.md')
 );
+
+fs.copyFileSync(
+    path.resolve(__dirname, '../CHANGELOG.md'),
+    path.join(buildDir, 'CHANGELOG.md')
+);

config/prepare-package.js

@@ -23,3 +23,8 @@ fs.copyFileSync(
   path.resolve(__dirname, '../README.md'),
   path.join(buildDir, 'README.md')
 );
+
+fs.copyFileSync(
+    path.resolve(__dirname, '../CHANGELOG.md'),
+    path.join(buildDir, 'CHANGELOG.md')
+);

demos/misb/src/App.vue

@@ -88,6 +88,7 @@ export default {
       endpointUrl:  'api.georobotix.io/ogc/t18/api',
       protocol: 'mqtt',
       mqttOpts: {
+        shared: true,
         prefix: '/api',
         endpointUrl: 'api.georobotix.io:443/ogc/t18'
       },

demos/sweapi/src/App.vue

@@ -341,6 +341,7 @@ export default {
         tls: this.$store.state.server.tls,
         endpointUrl: this.$store.state.server.url,
         mqttOpts: {
+          shared: false,
           prefix: this.$store.state.server.mqtt.prefix,
           endpointUrl: this.$store.state.server.mqtt.url
         }

demos/sweapi/src/components/LiveCommands.vue

@@ -82,6 +82,7 @@ export default {
             ...this.controlObj.networkProperties,
             streamProtocol: value,
             mqttOpts: {
+              shared: false,
               prefix: this.mqttPrefix,
               endpointUrl: this.mqttUrl
             },

demos/sweapi/src/components/LiveControlStatus.vue

@@ -78,6 +78,7 @@ export default {
             ...this.controlObj.networkProperties,
             streamProtocol: value,
             mqttOpts: {
+              shared: false,
               prefix: this.mqttPrefix,
               endpointUrl: this.mqttUrl
             },

demos/sweapi/src/components/LiveObservations.vue

@@ -80,6 +80,7 @@ export default {
             ...this.datastreamObj.networkProperties,
             streamProtocol: value,
             mqttOpts: {
+              shared: false,
               prefix: this.mqttPrefix,
               endpointUrl: this.mqttUrl
             },

demos/sweapi/webpack.config.js

@@ -37,7 +37,7 @@ const config = {
     toUrlUndefined: true
   },
   devServer: {
-    https: true,
+    https: false,
     compress: false,
     hot: true,
   },

demos/tasking/src/App.vue

@@ -81,6 +81,7 @@ export default {
     const cmdStreamId = "rtbajuvqi9b54";
 
     const mqttProps = {
+      shared: true,
       prefix: '/api',
       endpointUrl: 'api.georobotix.io:443/ogc/t18',
       username: 'uxs-team',

jest.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+    testEnvironment: "node",
+    transform: {
+        '^.+\\.jsx?$': 'babel-jest'
+    },
+    roots: ["tests"],
+    moduleFileExtensions: ["js"],
+};

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "@osh-branches/osh-js",
-  "version": "2.2.0-mcs+0001",
+  "name": "@osh/osh-js",
+  "version": "3.1.5",
   "description": "OSH javascript Toolkit",
-  "main": "core/OSH.js",
+  "main": "source/core/OSH.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/opensensorhub/osh-js.git"
@@ -27,6 +27,8 @@
     "access": "public"
   },
   "scripts": {
+    "test": "jest",
+    "test:bundlers": "bash tests/bundler/test-bundlers.sh",
     "build": "webpack --config webpack.config.js --mode production",
     "documentation": "yarn  --cwd jsdoc/ clean && yarn  --cwd jsdoc/ install && yarn  --cwd jsdoc/  all",
     "vuepress": "yarn install && shx rm -fr vuepress/docs/dist; yarn --cwd vuepress/docs prod",
@@ -41,29 +43,32 @@
     "build-lib": "yarn prepare-lib && yarn copy-sources-lib && yarn transpile-lib && node config/prepare-lib && tar -czvf osh-js.tar.gz dist/* && mv osh-js.tar.gz ./dist"
   },
   "devDependencies": {
+    "@babel/core": "^7.28.5",
+    "@babel/preset-env": "^7.28.5",
+    "@types/linkify-it": "3.0.5",
+    "@types/markdown-it": "^14.1.1",
+    "babel-jest": "^30.2.0",
     "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^5.1.1",
-    "css-loader": "^3.4.2",
+    "copy-webpack-plugin": "^12.0.2",
+    "css-loader": "^6.11.0",
     "empty-module": "0.0.2",
     "file-loader": "^5.1.0",
     "jsdoc": "^4.0.3",
+    "jest": "^30.2.0",
     "moment": "^2.24.0",
     "npm-install-webpack-plugin": "^4.0.5",
     "null-loader": "^3.0.0",
     "patch-package": "^6.2.2",
     "shx": "^0.3.3",
     "strip-ansi": "^6.0.0",
-    "style-loader": "^1.1.3",
+    "style-loader": "^4.0.0",
     "typescript": "^4.3.5",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "unminified-webpack-plugin": "^2.0.0",
-    "webpack": "^4.42.0",
-    "webpack-cli": "^3.3.11",
+    "vite": "^6.2.0",
+    "webpack": "^5.97.1",
+    "webpack-cli": "^6.0.1",
     "webpack-node-externals": "^1.7.2",
-    "wnumb": "^1.2.0",
-    "worker-loader": "^2.0.0",
-    "worker-plugin": "^4.0.2"
-  },
-  "dependencies": {},
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+    "wnumb": "^1.2.0"
+  }
 }

showcase-dev/examples/datasource-sweapifetch/datasource-sweapifetch.js → showcase-dev/examples/datasource-consysapi/datasource-consysapi.js

@@ -1,9 +1,9 @@
 import {EventType} from 'osh-js/core/event/EventType';
-// #region snippet_datasource_sweapifetch
-import SweApiFetch from "osh-js/core/datasource/sweapi/SweApi.datasource.js";
+// #region snippet_datasource_consysapi
+import ConSysApi from "osh-js/core/datasource/consysapi/ConSysApi.datasource.js";
 import {Mode} from "osh-js/core/datasource/Mode";
 
-let gpsDataSource = new SweApiFetch("android-GPS", {
+let gpsDataSource = new ConSysApi("android-GPS", {
   endpointUrl: 'api.georobotix.io/ogc/t18/api',
   resource: '/datastreams/o7pce3e60s0ie/observations',
   tls: true,
@@ -15,7 +15,7 @@ let gpsDataSource = new SweApiFetch("android-GPS", {
   mode : Mode.REAL_TIME
 });
 
-// #endregion snippet_datasource_sweapifetch
+// #endregion snippet_datasource_consysapi
 
 gpsDataSource.subscribe(async (message) => {
   let dataEvent;

showcase-dev/examples/datasource-sweapifetch/webpack.config.js → showcase-dev/examples/datasource-consysapi/webpack.config.js

@@ -8,10 +8,10 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 
 module.exports = {
     // Tell Webpack which file kicks off our app.
-    entry: path.resolve(__dirname,'./datasource-sweapifetch.js'),
+    entry: path.resolve(__dirname,'./datasource-consysapi.js'),
     // Tell Weback to output our bundle to ./dist/bundle.js
     output: {
-        filename: 'bundle.datasource.sweapifetch.js',
+        filename: 'bundle.datasource.consysapi.js',
         path: path.resolve(__dirname, 'dist')
     },
     // Tell Webpack which directories to look in to resolve import statements.
@@ -53,7 +53,7 @@ module.exports = {
         compress: true,
         port: 9000,
         hot: true,
-        index: 'datasource-sweapifetch.html',
+        index: 'datasource-consysapi.html',
         https:true
     },
     devtool: 'source-map',
@@ -74,8 +74,8 @@ module.exports = {
         // by the Webpack dev server. We can give it a template file (written in EJS)
         // and it will handle injecting our bundle for us.
         new HtmlWebpackPlugin({
-            filename: "datasource-sweapifetch.html",
-            template: path.resolve(__dirname, 'datasource-sweapifetch.html')
+            filename: "datasource-consysapi.html",
+            template: path.resolve(__dirname, 'datasource-consysapi.html')
         }),
         new CopyWebpackPlugin([
             { from: path.resolve(__dirname,'data'), to: 'data'}

showcase-dev/examples/datasource-geojson/datasource-geojson.html

@@ -0,0 +1,18 @@
+<style>
+    .file {
+        padding: 5px;
+        max-height: 250px;
+
+        overflow: auto;
+    }
+
+    body, html {
+        margin: 0;
+        padding: 0;
+        overflow: auto;
+    }
+</style>
+<div class="text file">
+  <pre id="datasource-file"><code id="json-container">No DATA</code></pre>
+</div>
+<div id="container"></div>

showcase-dev/examples/datasource-geojson/datasource-geojson.js

@@ -0,0 +1,80 @@
+import File from 'osh-js/ext/datasource/file/File.datasource';
+import {EventType} from 'osh-js/core/event/EventType';
+// create data source for Android phone GPS
+import SosGetResult from 'osh-js/core/datasource/sos/SosGetResult.datasource.js';
+import PointMarkerLayer from 'osh-js/core/ui/layer/PointMarkerLayer.js';
+import PolylineLayer from 'osh-js/core/ui/layer/PolylineLayer.js';
+import DeckGlView from 'osh-js/core/ui/view/map/DeckGlView.js';
+import {TileLayer} from '@deck.gl/geo-layers';
+import {BitmapLayer} from '@deck.gl/layers';
+import {Mode} from 'osh-js/core/datasource/Mode';
+import GeoJSON from "osh-js/ext/ui/layer/GeoJSON";
+import DeckGlViewGeoJSON from "osh-js/ext/ui/view/DeckGlGeoJSON";
+
+
+const NB_FILES = 8;
+const files = ['./data/data.json'];
+
+const fileDatasource = new File('GeoJSON',{
+  paths: files,
+  batchSize: 5000
+});
+
+let geojsonLayer = new GeoJSON({
+  dataSourceId: fileDatasource.id,
+  getData: (rec) => {
+    console.log(rec);
+    return rec.data;
+  },
+});
+
+let deckglMapView = new DeckGlViewGeoJSON({
+      container: "container",
+      layers: [geojsonLayer],
+      deckProps: {
+        initialViewState: {
+          longitude: -122.28363249999997,
+          latitude:  37.87402129999999,
+          zoom: 13,
+          bearing: 0,
+          pitch: 20
+        },
+        layers: [
+          new TileLayer({
+            // https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Tile_servers
+            data: 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
+            minZoom: 0,
+            maxZoom: 19,
+            tileSize: 256,
+
+            renderSubLayers: props => {
+              const {
+                bbox: {west, south, east, north}
+              } = props.tile;
+
+              return new BitmapLayer(props, {
+                data: null,
+                image: props.data,
+                bounds: [west, south, east, north]
+              });
+            }
+          }),
+        ]
+      },
+      autoZoomOnFirstMarker: false
+    }
+);
+
+const container = document.getElementById('json-container');
+fileDatasource.subscribe(async (message) => {
+  let dataEvent;
+  for (let i = 0; i < message.values.length; i++) {
+    dataEvent = message.values[i];
+    const str = JSON.stringify(dataEvent.data,null,2);
+    container.innerHTML = str;
+  }
+}, [EventType.DATA]);
+
+
+// start streaming onclick
+fileDatasource.connect();