diff --git a/showcase-dev/examples/datasource-sweapifetch/datasource-sweapifetch.html b/showcase-dev/examples/datasource-consysapi/datasource-consysapi.html similarity index 100% rename from showcase-dev/examples/datasource-sweapifetch/datasource-sweapifetch.html rename to showcase-dev/examples/datasource-consysapi/datasource-consysapi.html diff --git a/showcase-dev/examples/datasource-sweapifetch/datasource-sweapifetch.js b/showcase-dev/examples/datasource-consysapi/datasource-consysapi.js similarity index 76% rename from showcase-dev/examples/datasource-sweapifetch/datasource-sweapifetch.js rename to showcase-dev/examples/datasource-consysapi/datasource-consysapi.js index 4ee4225ca1..199a296213 100644 --- a/showcase-dev/examples/datasource-sweapifetch/datasource-sweapifetch.js +++ b/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; diff --git a/showcase-dev/examples/datasource-sweapifetch/package.json b/showcase-dev/examples/datasource-consysapi/package.json similarity index 100% rename from showcase-dev/examples/datasource-sweapifetch/package.json rename to showcase-dev/examples/datasource-consysapi/package.json diff --git a/showcase-dev/examples/datasource-sweapifetch/webpack.config.js b/showcase-dev/examples/datasource-consysapi/webpack.config.js similarity index 90% rename from showcase-dev/examples/datasource-sweapifetch/webpack.config.js rename to showcase-dev/examples/datasource-consysapi/webpack.config.js index bbda5fc140..2ca343f4d5 100644 --- a/showcase-dev/examples/datasource-sweapifetch/webpack.config.js +++ b/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'} diff --git a/showcase-dev/examples/datasynchronizer-dynamic-add-remove-realtime/datasynchronizer-dynamic-add-remove-realtime.js b/showcase-dev/examples/datasynchronizer-dynamic-add-remove-realtime/datasynchronizer-dynamic-add-remove-realtime.js index 912a8a3b6a..901610e7a4 100644 --- a/showcase-dev/examples/datasynchronizer-dynamic-add-remove-realtime/datasynchronizer-dynamic-add-remove-realtime.js +++ b/showcase-dev/examples/datasynchronizer-dynamic-add-remove-realtime/datasynchronizer-dynamic-add-remove-realtime.js @@ -1,5 +1,5 @@ import {EventType} from 'osh-js/core/event/EventType'; -import SweApiDatasource from "osh-js/core/datasource/sweapi/SweApi.datasource.js"; +import ConSysApi from "osh-js/core/datasource/consysapi/ConSysApi.datasource.js"; import {Mode} from "osh-js/core/datasource/Mode"; import DataSynchronizer from "../../../source/core/timesync/DataSynchronizer"; @@ -14,19 +14,19 @@ const commonDatasourceOpts = { }, }; -const ds0 = new SweApiDatasource('MISB Drone - Video', { +const ds0 = new ConSysApi('MISB Drone - Video', { ...commonDatasourceOpts, resource: '/datastreams/h225hesual08g/observations', responseFormat: 'application/swe+binary', }); -const ds1 = new SweApiDatasource('MISB UAS - Platform Location', { +const ds1 = new ConSysApi('MISB UAS - Platform Location', { ...commonDatasourceOpts, resource: '/datastreams/o7pce3e60s0ie/observations', responseFormat: 'application/swe+json', }); -const ds2 = new SweApiDatasource('MISB UAS - Platform Attitude', { +const ds2 = new ConSysApi('MISB UAS - Platform Attitude', { ...commonDatasourceOpts, resource: '/datastreams/mlme3gtdfepvc/observations', responseFormat: 'application/swe+json', diff --git a/showcase-dev/examples/datasynchronizer-dynamic-add-remove-replay/datasynchronizer-dynamic-add-remove-replay.js b/showcase-dev/examples/datasynchronizer-dynamic-add-remove-replay/datasynchronizer-dynamic-add-remove-replay.js index 5be98782da..2097f31666 100644 --- a/showcase-dev/examples/datasynchronizer-dynamic-add-remove-replay/datasynchronizer-dynamic-add-remove-replay.js +++ b/showcase-dev/examples/datasynchronizer-dynamic-add-remove-replay/datasynchronizer-dynamic-add-remove-replay.js @@ -1,5 +1,5 @@ import {EventType} from 'osh-js/core/event/EventType'; -import SweApiDatasource from "osh-js/core/datasource/sweapi/SweApi.datasource.js"; +import ConSysApi from "osh-js/core/datasource/consysapi/ConSysApi.datasource.js"; import {Mode} from "osh-js/core/datasource/Mode"; import DataSynchronizer from "../../../source/core/timesync/DataSynchronizer"; @@ -18,19 +18,19 @@ const commonDatasourceOpts = { prefetchBatchSize: 50 }; -const ds0 = new SweApiDatasource('MISB Drone - Video', { +const ds0 = new ConSysApi('MISB Drone - Video', { ...commonDatasourceOpts, resource: '/datastreams/8ni90dbu4uf0g/observations', responseFormat: 'application/swe+binary', }); -const ds1 = new SweApiDatasource('MISB UAS - Platform Location', { +const ds1 = new ConSysApi('MISB UAS - Platform Location', { ...commonDatasourceOpts, resource: '/datastreams/fled6eics1cl4/observations', responseFormat: 'application/swe+json', }); -const ds2 = new SweApiDatasource('MISB UAS - Platform Attitude', { +const ds2 = new ConSysApi('MISB UAS - Platform Attitude', { ...commonDatasourceOpts, resource: '/datastreams/adheadf9nghts/observations', responseFormat: 'application/swe+json', diff --git a/showcase-dev/examples/mqtt-utility/mqtt-utility.js b/showcase-dev/examples/mqtt-utility/mqtt-utility.js index c6046f97a1..51c73b2784 100644 --- a/showcase-dev/examples/mqtt-utility/mqtt-utility.js +++ b/showcase-dev/examples/mqtt-utility/mqtt-utility.js @@ -1,6 +1,6 @@ import MqttProvider from "osh-js/core/mqtt/MqttProvider"; import {randomUUID} from "osh-js/core/utils/Utils"; -import ObservationFilter from "../../../source/core/sweapi/observation/ObservationFilter"; +import ObservationFilter from "../../../source/core/consysapi/observation/ObservationFilter"; const textAreaElement0 = document.getElementById("data-container0"); const textAreaElement1 = document.getElementById("data-container1"); diff --git a/showcase-dev/examples/switch-realtime-batch/switch-realtime-batch.html b/showcase-dev/examples/switch-realtime-batch/switch-realtime-batch.html index 19afc9fbcc..e786514090 100644 --- a/showcase-dev/examples/switch-realtime-batch/switch-realtime-batch.html +++ b/showcase-dev/examples/switch-realtime-batch/switch-realtime-batch.html @@ -29,7 +29,7 @@ diff --git a/showcase-dev/examples/switch-realtime-batch/switch-realtime-batch.js b/showcase-dev/examples/switch-realtime-batch/switch-realtime-batch.js index 02fe90a551..1f760b8206 100644 --- a/showcase-dev/examples/switch-realtime-batch/switch-realtime-batch.js +++ b/showcase-dev/examples/switch-realtime-batch/switch-realtime-batch.js @@ -4,7 +4,7 @@ import CurveLayer from 'osh-js/core/ui/layer/CurveLayer.js'; import SosGetResult from 'osh-js/core/datasource/sos/SosGetResult.datasource.js'; import {Mode} from 'osh-js/core/datasource/Mode'; import DataSynchronizer from "../../../source/core/timesync/DataSynchronizer"; -import SweApiDatasource from "../../../source/core/datasource/sweapi/SweApi.datasource"; +import ConSysApi from "../../../source/core/datasource/consysapi/ConSysApi.datasource"; import {EventType} from "../../../source/core/event/EventType"; function getRandomArbitrary(min, max) { @@ -17,7 +17,7 @@ const dataContentElt = document.getElementById("data-content"); const masterTimeElt = document.getElementById("master-time"); let initSos = false; -let initSweapi = false; +let initConsysapi = false; let chartDataSource = new SosGetResult("weather", { endpointUrl: "sensiasoft.net/sensorhub/sos", @@ -38,7 +38,7 @@ const sosDataSynchronizer = new DataSynchronizer({ }); async function startSosExample() { - await sweapiDataSynchronizer.disconnect(); + await consysapiDataSynchronizer.disconnect(); replayButtonElt.onclick = async () => { await sosDataSynchronizer.setTimeRange( new Date(Date.now() - 60 * 1000 * 60 * 2).toISOString(), @@ -105,19 +105,19 @@ const commonDatasourceOpts = { prefetchBatchSize: 250 }; -const droneLocationDataSource = new SweApiDatasource('MISB UAS - Platform Location', { +const droneLocationDataSource = new ConSysApi('MISB UAS - Platform Location', { ...commonDatasourceOpts, resource: '/datastreams/fled6eics1cl4/observations', responseFormat: 'application/swe+json', }); -const droneOrientationDataSource = new SweApiDatasource('MISB UAS - Platform Attitude', { +const droneOrientationDataSource = new ConSysApi('MISB UAS - Platform Attitude', { ...commonDatasourceOpts, resource: '/datastreams/adheadf9nghts/observations', responseFormat: 'application/swe+json', }); -const sweapiDataSynchronizer = new DataSynchronizer({ +const consysapiDataSynchronizer = new DataSynchronizer({ replaySpeed: 2, masterTimeRefreshRate: 250, startTime: START_TIME, @@ -125,11 +125,11 @@ const sweapiDataSynchronizer = new DataSynchronizer({ dataSources: [droneOrientationDataSource, droneLocationDataSource] }); -async function startSweApiExample() { +async function startConSysApiExample() { await sosDataSynchronizer.disconnect(); replayButtonElt.onclick = async () => { - await sweapiDataSynchronizer.setMode(Mode.REPLAY); - // await sweapiDataSynchronizer.setTimeRange( + await consysapiDataSynchronizer.setMode(Mode.REPLAY); + // await consysapiDataSynchronizer.setTimeRange( // START_TIME, // END_TIME, // 2.0, @@ -138,12 +138,12 @@ async function startSweApiExample() { // ); replayButtonElt.disabled = true; realtimeButtonElt.disabled = false; - await sweapiDataSynchronizer.connect(); + await consysapiDataSynchronizer.connect(); } realtimeButtonElt.onclick = async () => { - await sweapiDataSynchronizer.setMode(Mode.REAL_TIME); - // await sweapiDataSynchronizer.setTimeRange( + await consysapiDataSynchronizer.setMode(Mode.REAL_TIME); + // await consysapiDataSynchronizer.setTimeRange( // 'now', // '2055-01-01', // 1.0, @@ -153,11 +153,11 @@ async function startSweApiExample() { realtimeButtonElt.disabled = true; replayButtonElt.disabled = false; - await sweapiDataSynchronizer.connect(); + await consysapiDataSynchronizer.connect(); } - sweapiDataSynchronizer.subscribe(message => displayData(message), [EventType.DATA]); - sweapiDataSynchronizer.subscribe(message => displayMasterTime(message), [EventType.MASTER_TIME]); + consysapiDataSynchronizer.subscribe(message => displayData(message), [EventType.DATA]); + consysapiDataSynchronizer.subscribe(message => displayMasterTime(message), [EventType.MASTER_TIME]); } const listBoxElement = document.getElementById('services'); @@ -165,8 +165,8 @@ listBoxElement.onchange = (event) => { let value = event.target.value; if(value === 'sos') { startSosExample(); - } else if(value === 'sweapi') { - startSweApiExample() + } else if(value === 'consysapi') { + startConSysApiExample() } } diff --git a/showcase-dev/index.js b/showcase-dev/index.js index b5190e2cf1..a1ae7c7c47 100644 --- a/showcase-dev/index.js +++ b/showcase-dev/index.js @@ -21,13 +21,13 @@ var samples = [ url: "datasource-file" }, { - name: "DataSource SweApiFetch", - description: "Display GPS data using the SweApiFetch datasource", - url: "datasource-sweapifetch" + name: "Connected Systems DataSource", + description: "Display GPS data using the ConSysApi datasource", + url: "datasource-consysapi" }, { - name: "DataSource SweApiFetch Json", - description: "Display data using the SweApiFetch datasource in JSON format", + name: "SOS DataSource Swe Json", + description: "Display data using the SOS datasource in SWE JSON format", url: "datasource-swejson" }, { @@ -56,8 +56,8 @@ var samples = [ url: "multi-datasources-synchronized" }, { - name: 'Switch between Replay & realtime using SOS or SWEAPI service', - description: 'Switch between Replay & realtime using SOS or SWEAPI service', + name: 'Switch between Replay & realtime using SOS or Connected Systems API service', + description: 'Switch between Replay & realtime using SOS or Connected Systems API service', url: 'switch-realtime-batch' }, { diff --git a/showcase-dev/webpack.config.js b/showcase-dev/webpack.config.js index 6868f0d1ea..29f0ec0e49 100644 --- a/showcase-dev/webpack.config.js +++ b/showcase-dev/webpack.config.js @@ -77,7 +77,7 @@ module.exports = [{ let directories = [ 'datasource-audio', 'datasource-file', - 'datasource-sweapifetch', + 'datasource-consysapi', 'datasource-swejson', 'datasource-video', 'datasources-synchronized', diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/.browserslistrc b/showcase/examples/chart-archive-realtime-synchronized-consysapi/.browserslistrc similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/.browserslistrc rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/.browserslistrc diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/.eslintignore b/showcase/examples/chart-archive-realtime-synchronized-consysapi/.eslintignore similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/.eslintignore rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/.eslintignore diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/.eslintrc.js b/showcase/examples/chart-archive-realtime-synchronized-consysapi/.eslintrc.js similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/.eslintrc.js rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/.eslintrc.js diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/.gitignore b/showcase/examples/chart-archive-realtime-synchronized-consysapi/.gitignore similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/.gitignore rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/.gitignore diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/README.md b/showcase/examples/chart-archive-realtime-synchronized-consysapi/README.md similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/README.md rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/README.md diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/babel.config.js b/showcase/examples/chart-archive-realtime-synchronized-consysapi/babel.config.js similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/babel.config.js rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/babel.config.js diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/chart-archive-realtime-synchronized-sweapi.html b/showcase/examples/chart-archive-realtime-synchronized-consysapi/chart-archive-realtime-synchronized-consysapi.html similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/chart-archive-realtime-synchronized-sweapi.html rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/chart-archive-realtime-synchronized-consysapi.html diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/chart-archive-realtime-synchronized-sweapi.js b/showcase/examples/chart-archive-realtime-synchronized-consysapi/chart-archive-realtime-synchronized-consysapi.js similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/chart-archive-realtime-synchronized-sweapi.js rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/chart-archive-realtime-synchronized-consysapi.js diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/favicon.ico b/showcase/examples/chart-archive-realtime-synchronized-consysapi/favicon.ico similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/favicon.ico rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/favicon.ico diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/android-chrome-192x192.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/android-chrome-192x192.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/android-chrome-192x192.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/android-chrome-192x192.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/android-chrome-512x512.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/android-chrome-512x512.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/android-chrome-512x512.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/android-chrome-512x512.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/android-chrome-maskable-192x192.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/android-chrome-maskable-192x192.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/android-chrome-maskable-192x192.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/android-chrome-maskable-192x192.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/android-chrome-maskable-512x512.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/android-chrome-maskable-512x512.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/android-chrome-maskable-512x512.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/android-chrome-maskable-512x512.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-120x120.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-120x120.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-120x120.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-120x120.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-152x152.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-152x152.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-152x152.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-152x152.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-180x180.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-180x180.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-180x180.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-180x180.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-60x60.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-60x60.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-60x60.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-60x60.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-76x76.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-76x76.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon-76x76.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon-76x76.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/apple-touch-icon.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/apple-touch-icon.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/favicon-16x16.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/favicon-16x16.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/favicon-16x16.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/favicon-16x16.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/favicon-32x32.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/favicon-32x32.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/favicon-32x32.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/favicon-32x32.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/msapplication-icon-144x144.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/msapplication-icon-144x144.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/msapplication-icon-144x144.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/msapplication-icon-144x144.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/mstile-150x150.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/mstile-150x150.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/mstile-150x150.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/mstile-150x150.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/safari-pinned-tab.svg b/showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/safari-pinned-tab.svg similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/img/icons/safari-pinned-tab.svg rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/img/icons/safari-pinned-tab.svg diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/main.js b/showcase/examples/chart-archive-realtime-synchronized-consysapi/main.js similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/main.js rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/main.js diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/package.json b/showcase/examples/chart-archive-realtime-synchronized-consysapi/package.json similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/package.json rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/package.json diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/patches/nouislider+14.4.0.patch b/showcase/examples/chart-archive-realtime-synchronized-consysapi/patches/nouislider+14.4.0.patch similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/patches/nouislider+14.4.0.patch rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/patches/nouislider+14.4.0.patch diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/robots.txt b/showcase/examples/chart-archive-realtime-synchronized-consysapi/robots.txt similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/robots.txt rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/robots.txt diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/src/App.vue b/showcase/examples/chart-archive-realtime-synchronized-consysapi/src/App.vue similarity index 94% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/src/App.vue rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/src/App.vue index a97607cb1b..c28dd9a64e 100644 --- a/showcase/examples/chart-archive-realtime-synchronized-sweapi/src/App.vue +++ b/showcase/examples/chart-archive-realtime-synchronized-consysapi/src/App.vue @@ -18,7 +18,7 @@ import TimeController from 'osh-js/vue/components/TimeController.vue'; import DataSynchronizer from 'osh-js/core/timesync/DataSynchronizer'; import {Mode} from 'osh-js/core/datasource/Mode'; -import SweApiDatasource from "osh-js/core/datasource/sweapi/SweApi.datasource"; +import ConSysApi from "osh-js/core/datasource/consysapi/ConSysApi.datasource.js"; export default { components: { @@ -55,7 +55,7 @@ export default { prefetchBatchSize: 250 }; - const chartDataSource1 = new SweApiDatasource('Simulated Weather Sensor - weather', { + const chartDataSource1 = new ConSysApi('Simulated Weather Sensor - weather', { ...commonDatasourceOpts, resource: '/datastreams/0tsop3f16nvp8/observations', responseFormat: 'application/swe+json', diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/src/assets/logo.png b/showcase/examples/chart-archive-realtime-synchronized-consysapi/src/assets/logo.png similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/src/assets/logo.png rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/src/assets/logo.png diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/src/config/index.js b/showcase/examples/chart-archive-realtime-synchronized-consysapi/src/config/index.js similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/src/config/index.js rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/src/config/index.js diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/src/main.js b/showcase/examples/chart-archive-realtime-synchronized-consysapi/src/main.js similarity index 100% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/src/main.js rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/src/main.js diff --git a/showcase/examples/chart-archive-realtime-synchronized-sweapi/webpack.config.js b/showcase/examples/chart-archive-realtime-synchronized-consysapi/webpack.config.js similarity index 90% rename from showcase/examples/chart-archive-realtime-synchronized-sweapi/webpack.config.js rename to showcase/examples/chart-archive-realtime-synchronized-consysapi/webpack.config.js index c8e2b0315f..9c2d627a55 100644 --- a/showcase/examples/chart-archive-realtime-synchronized-sweapi/webpack.config.js +++ b/showcase/examples/chart-archive-realtime-synchronized-consysapi/webpack.config.js @@ -8,9 +8,9 @@ const path = require('path'); // Now, using the cesiumConfig in your real configuration const config = { - entry: path.resolve(__dirname,'chart-archive-realtime-synchronized-sweapi.js'), + entry: path.resolve(__dirname,'chart-archive-realtime-synchronized-consysapi.js'), output: { - filename: 'bundle.chart-archive-realtime-synchronized-sweapi.js', + filename: 'bundle.chart-archive-realtime-synchronized-consysapi.js', path: path.resolve(__dirname, 'dist'), }, @@ -85,15 +85,15 @@ const config = { compress: true, port: 9000, hot: true, - index: 'chart-archive-realtime-synchronized-sweapi.html', + index: 'chart-archive-realtime-synchronized-consysapi.html', https:true }, plugins: [ new VueLoaderPlugin(), new CleanWebpackPlugin(), new HtmlWebpackPlugin({ - template: path.resolve(__dirname, 'chart-archive-realtime-synchronized-sweapi.html'), - filename: './chart-archive-realtime-synchronized-sweapi.html', + template: path.resolve(__dirname, 'chart-archive-realtime-synchronized-consysapi.html'), + filename: './chart-archive-realtime-synchronized-consysapi.html', favicon: path.resolve(__dirname,'favicon.ico') }), new DefinePlugin({ diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/.browserslistrc b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/.browserslistrc similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/.browserslistrc rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/.browserslistrc diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/.eslintignore b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/.eslintignore similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/.eslintignore rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/.eslintignore diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/.eslintrc.js b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/.eslintrc.js similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/.eslintrc.js rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/.eslintrc.js diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/.gitignore b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/.gitignore similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/.gitignore rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/.gitignore diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/README.md b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/README.md similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/README.md rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/README.md diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/babel.config.js b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/babel.config.js similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/babel.config.js rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/babel.config.js diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/favicon.ico b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/favicon.ico similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/favicon.ico rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/favicon.ico diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-192x192.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-192x192.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-192x192.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-192x192.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-512x512.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-512x512.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-512x512.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-512x512.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-maskable-192x192.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-maskable-192x192.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-maskable-192x192.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-maskable-192x192.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-maskable-512x512.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-maskable-512x512.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-maskable-512x512.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/android-chrome-maskable-512x512.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-120x120.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-120x120.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-120x120.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-120x120.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-152x152.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-152x152.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-152x152.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-152x152.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-180x180.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-180x180.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-180x180.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-180x180.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-60x60.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-60x60.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-60x60.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-60x60.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-76x76.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-76x76.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-76x76.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon-76x76.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/apple-touch-icon.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/favicon-16x16.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/favicon-16x16.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/favicon-16x16.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/favicon-16x16.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/favicon-32x32.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/favicon-32x32.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/favicon-32x32.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/favicon-32x32.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/msapplication-icon-144x144.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/msapplication-icon-144x144.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/msapplication-icon-144x144.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/msapplication-icon-144x144.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/mstile-150x150.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/mstile-150x150.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/mstile-150x150.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/mstile-150x150.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/safari-pinned-tab.svg b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/safari-pinned-tab.svg similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/img/icons/safari-pinned-tab.svg rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/img/icons/safari-pinned-tab.svg diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/main.js b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/main.js similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/main.js rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/main.js diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/package.json b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/package.json similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/package.json rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/package.json diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/patches/nouislider+14.4.0.patch b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/patches/nouislider+14.4.0.patch similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/patches/nouislider+14.4.0.patch rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/patches/nouislider+14.4.0.patch diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/robots.txt b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/robots.txt similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/robots.txt rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/robots.txt diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/src/App.vue b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/src/App.vue similarity index 93% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/src/App.vue rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/src/App.vue index 4d505c0e22..08a7919ccd 100644 --- a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/src/App.vue +++ b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/src/App.vue @@ -19,7 +19,7 @@ import TimeController from 'osh-js/vue/components/TimeController.vue'; import FFMPEGView from 'osh-js/core/ui/view/video/FFMPEGView'; import DataSynchronizer from 'osh-js/core/timesync/DataSynchronizer'; -import SweApiFetch from 'osh-js/core/datasource/sweapi/SweApi.datasource.js'; +import ConSysApi from 'osh-js/core/datasource/consysapi/ConSysApi.datasource.js'; import {Mode} from 'osh-js/core/datasource/Mode'; import VideoView from 'osh-js/core/ui/view/video/VideoView'; import VideoDataLayer from 'osh-js/core/ui/layer/VideoDataLayer'; @@ -49,19 +49,19 @@ export default { prefetchBatchSize: 250 }; - const dataSource0 = new SweApiFetch("drone-Video", { + const dataSource0 = new ConSysApi("drone-Video", { ...opts }); - const dataSource1 = new SweApiFetch("drone-Video1", { + const dataSource1 = new ConSysApi("drone-Video1", { ...opts }); - const dataSource2 = new SweApiFetch("drone-Video2", { + const dataSource2 = new ConSysApi("drone-Video2", { ...opts }); - const dataSource3 = new SweApiFetch("drone-Video3", { + const dataSource3 = new ConSysApi("drone-Video3", { ...opts }); diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/src/assets/logo.png b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/src/assets/logo.png similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/src/assets/logo.png rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/src/assets/logo.png diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/src/config/index.js b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/src/config/index.js similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/src/config/index.js rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/src/config/index.js diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/src/main.js b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/src/main.js similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/src/main.js rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/src/main.js diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/video-with-control-vuejs-synchronized.html b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/video-with-control-vuejs-synchronized.html similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/video-with-control-vuejs-synchronized.html rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/video-with-control-vuejs-synchronized.html diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/video-with-control-vuejs-synchronized.js b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/video-with-control-vuejs-synchronized.js similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/video-with-control-vuejs-synchronized.js rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/video-with-control-vuejs-synchronized.js diff --git a/showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/webpack.config.js b/showcase/examples/consysapi-video-with-control-vuejs-synchronized/webpack.config.js similarity index 100% rename from showcase/examples/sensorwebapi-video-with-control-vuejs-synchronized/webpack.config.js rename to showcase/examples/consysapi-video-with-control-vuejs-synchronized/webpack.config.js diff --git a/showcase/examples/mqtt/mqtt.js b/showcase/examples/mqtt/mqtt.js index e7fd0c9a61..a11c67f40a 100644 --- a/showcase/examples/mqtt/mqtt.js +++ b/showcase/examples/mqtt/mqtt.js @@ -1,5 +1,5 @@ // create data source for Android phone GPS -import SweApiFetch from 'osh-js/core/datasource/sweapi/SweApi.datasource.js'; +import ConSysApi from 'osh-js/core/datasource/consysapi/ConSysApi.datasource.js'; import PointMarkerLayer from 'osh-js/core/ui/layer/PointMarkerLayer.js'; import LeafletView from 'osh-js/core/ui/view/map/LeafletView.js'; import ChartJsView from 'osh-js/core/ui/view/chart/ChartJsView'; @@ -16,7 +16,7 @@ const mqttProps = { password: 'WR6zlso9h#' }; -let gpsDataSource = new SweApiFetch("android-GPS", { +let gpsDataSource = new ConSysApi("android-GPS", { endpointUrl: 'api.georobotix.io/ogc/t18/api', resource: '/datastreams/rbnag2hrc04mm/observations', tls: true, @@ -25,7 +25,7 @@ let gpsDataSource = new SweApiFetch("android-GPS", { mode: Mode.REAL_TIME }); -const isaDataSource = new SweApiFetch("ISA-bio-sensor", { +const isaDataSource = new ConSysApi("ISA-bio-sensor", { endpointUrl: 'api.georobotix.io/ogc/t18/api', resource: '/datastreams/b4runsn23q66o/observations', tls: true, diff --git a/showcase/examples/tasking/tasking.js b/showcase/examples/tasking/tasking.js index 79453ab3db..f21d037123 100644 --- a/showcase/examples/tasking/tasking.js +++ b/showcase/examples/tasking/tasking.js @@ -1,10 +1,10 @@ -import Systems from "osh-js/core/sweapi/system/Systems"; +import Systems from "osh-js/core/consysapi/system/Systems"; import {EventType} from "osh-js/core/event/EventType"; -import ControlFilter from "osh-js/core/sweapi/control/ControlFilter"; -import SweApiFetch from "osh-js/core/datasource/sweapi/SweApi.datasource"; +import ConSysApi from "osh-js/core/datasource/consysapi/ConSysApi.datasource.js"; import PointMarkerLayer from "osh-js/core/ui/layer/PointMarkerLayer"; import LeafletView from "osh-js/core/ui/view/map/LeafletView"; import PolylineLayer from "osh-js/core/ui/layer/PolylineLayer"; +import ControlStreamFilter from "../../../source/core/consysapi/controlstream/ControlStreamFilter"; var prevTime = 0; @@ -22,7 +22,7 @@ const mqttProps = { password: password }; -let gpsDataSource = new SweApiFetch("supersonic drone GPS", { +let gpsDataSource = new ConSysApi("supersonic drone GPS", { resource: `/api/datastreams/${posDsId}/observations`, endpointUrl: 'api.georobotix.io/ogc/t18/api', protocol: 'ws', @@ -101,9 +101,9 @@ async function startListening() { gpsDataSource.connect(); const system = await systems.getSystemById(systemId); - const control = await system.getControlById(cmdStreamId); + const control = await system.getControlStreamById(cmdStreamId); - control.streamStatus(new ControlFilter({}), async (message) =>{ + control.streamStatus(new ControlStreamFilter({}), async (message) =>{ textCommandElt.innerHTML = ""; const status = message; textStatusElt.innerHTML = JSON.stringify(status, null, 2); diff --git a/showcase/index.html b/showcase/index.html index 72adfd3df4..90d1bae864 100644 --- a/showcase/index.html +++ b/showcase/index.html @@ -201,6 +201,14 @@ height: 64px; width: 64px; } + + span.badge { + background-color: red; + color: white; + padding: 4px 8px; + text-align: center; + border-radius: 0px; + } @@ -224,13 +232,13 @@