mobility-toolbox-js 2.0.0-beta.8 → 2.0.1-beta.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/api/RoutingAPI.js +15 -0
- package/api/RoutingAPI.test.js +25 -0
- package/api/StopsAPI.js +12 -0
- package/api/StopsAPI.test.js +22 -0
- package/api/TralisAPI.js +359 -0
- package/api/TralisAPI.test.js +67 -0
- package/{src/api/tralis → api}/TralisAPIUtils.js +2 -32
- package/api/index.js +3 -0
- package/{index.html → api/typedefs.js} +0 -0
- package/common/Tracker.js +93 -0
- package/common/api/HttpAPI.js +30 -0
- package/common/api/HttpAPI.test.js +50 -0
- package/common/api/WebSocketAPI.js +175 -0
- package/{src/api/tralis/WebSocketConnector.test.js → common/api/WebSocketAPI.test.js} +100 -145
- package/common/controls/Control.js +81 -0
- package/{src/common → common}/controls/Control.test.js +32 -43
- package/common/index.js +4 -0
- package/common/layers/Layer.js +213 -0
- package/{src/common → common}/layers/Layer.test.js +185 -244
- package/common/mixins/CopyrightMixin.js +24 -0
- package/common/mixins/SearchMixin.js +110 -0
- package/common/mixins/TralisLayerMixin.js +479 -0
- package/common/styles/index.js +4 -0
- package/{src/common → common}/styles/trackerDefaultStyle.js +39 -175
- package/common/styles/trackerDelayStyle.js +8 -0
- package/{src/common → common}/styles/trackerSimpleStyle.js +4 -8
- package/{src/common → common}/trackerConfig.js +61 -99
- package/common/trackerConfig.test.js +23 -0
- package/{src/doc/examples/ol-mapbox-layer.md → common/typedefs.js} +0 -0
- package/common/utils/createTrackerFilters.js +56 -0
- package/common/utils/createTrackerFilters.test.js +79 -0
- package/{src/common → common}/utils/getMapboxMapCopyrights.js +3 -16
- package/common/utils/getMapboxMapCopyrights.test.js +40 -0
- package/{src/common → common}/utils/getMapboxStyleUrl.js +3 -13
- package/{src/common → common}/utils/getVehiclePosition.js +3 -33
- package/common/utils/index.js +5 -0
- package/common/utils/removeDuplicate.js +8 -0
- package/common/utils/removeDuplicate.test.js +19 -0
- package/{src/common → common}/utils/sortByDelay.js +2 -7
- package/common/utils/timeUtils.js +20 -0
- package/common/utils/timeUtils.test.js +10 -0
- package/index.js +8 -0
- package/mapbox/controls/CopyrightControl.js +29 -0
- package/mapbox/controls/index.js +1 -0
- package/mapbox/index.js +4 -0
- package/mapbox/layers/Layer.js +57 -0
- package/mapbox/layers/Layer.test.js +182 -0
- package/mapbox/layers/TralisLayer.js +182 -0
- package/{src/mapbox → mapbox}/layers/TralisLayer.test.js +12 -14
- package/mapbox/layers/index.js +2 -0
- package/{src/mapbox → mapbox}/utils.js +7 -21
- package/mbt.js +50444 -0
- package/mbt.js.map +7 -0
- package/mbt.min.js +1005 -0
- package/mbt.min.js.map +7 -0
- package/ol/controls/CopyrightControl.js +42 -0
- package/ol/controls/CopyrightControl.test.js +165 -0
- package/ol/controls/RoutingControl.js +387 -0
- package/ol/controls/RoutingControl.test.js +151 -0
- package/ol/controls/StopFinderControl.js +10 -0
- package/ol/controls/StopFinderControl.test.js +48 -0
- package/ol/controls/index.js +3 -0
- package/ol/index.js +5 -0
- package/ol/layers/Layer.js +88 -0
- package/ol/layers/Layer.test.js +174 -0
- package/ol/layers/MapboxLayer.js +203 -0
- package/{src/ol → ol}/layers/MapboxLayer.test.js +58 -84
- package/ol/layers/MapboxStyleLayer.js +187 -0
- package/{src/ol → ol}/layers/MapboxStyleLayer.test.js +97 -128
- package/ol/layers/MaplibreLayer.js +139 -0
- package/ol/layers/RoutingLayer.js +61 -0
- package/{src/ol → ol}/layers/RoutingLayer.test.js +15 -24
- package/ol/layers/TralisLayer.js +185 -0
- package/ol/layers/TralisLayer.test.js +79 -0
- package/ol/layers/VectorLayer.js +22 -0
- package/{src/ol → ol}/layers/VectorLayer.test.js +34 -45
- package/ol/layers/WMSLayer.js +38 -0
- package/ol/layers/WMSLayer.test.js +76 -0
- package/ol/layers/index.js +8 -0
- package/{src/ol → ol}/styles/fullTrajectoryDelayStyle.js +11 -15
- package/ol/styles/fullTrajectoryStyle.js +43 -0
- package/ol/styles/index.js +2 -0
- package/package.json +34 -74
- package/.babelrc +0 -6
- package/.esdoc.json +0 -17
- package/.eslintignore +0 -1
- package/.github/workflows/conventional-pr-title.yml +0 -21
- package/.github/workflows/cypress.yml +0 -29
- package/.github/workflows/nodejs.yml +0 -28
- package/.husky/commit-msg +0 -4
- package/.husky/post-checkout +0 -4
- package/.husky/post-merge +0 -4
- package/.husky/post-rebase +0 -4
- package/.husky/pre-commit +0 -4
- package/.neutrinorc.js +0 -176
- package/.nvmrc +0 -1
- package/CHANGELOG.md +0 -10
- package/LICENSE +0 -21
- package/__mocks__/mapbox-gl.js +0 -81
- package/__mocks__/maplibre-gl.js +0 -81
- package/commitlint.config.js +0 -1
- package/cypress/fixtures/example.json +0 -5
- package/cypress/integration/examples/api.spec.js +0 -7
- package/cypress/integration/examples/examples.spec.js +0 -7
- package/cypress/integration/examples/navigation.spec.js +0 -29
- package/cypress/plugins/index.js +0 -21
- package/cypress/support/commands.js +0 -25
- package/cypress/support/index.js +0 -20
- package/cypress.json +0 -4
- package/data/fetchRoute.json +0 -292
- package/data/fetchTrajectories.json +0 -18
- package/data/fetchTrajectoryById.json +0 -3
- package/data/fetchTrajectoryStations.json +0 -18
- package/data/stopsSearch.json +0 -15
- package/documentation.yml +0 -4
- package/esdoc/README.md +0 -27
- package/esdoc/plugins/MyPlugin.js +0 -69
- package/esdoc/plugins/dynamic-property-plugin/Plugin.js +0 -50
- package/esdoc/plugins/externals-plugin/Plugin.js +0 -45
- package/esdoc/plugins/externals-plugin/externals.js +0 -96
- package/global-setup.js +0 -3
- package/indexweb.html +0 -49
- package/jest.config.js +0 -5
- package/pull_request_template.md +0 -17
- package/renovate.json +0 -4
- package/scripts/read-pkg-json.js +0 -22
- package/src/api/index.js +0 -3
- package/src/api/routing/RoutingAPI.js +0 -44
- package/src/api/routing/RoutingAPI.test.js +0 -41
- package/src/api/stops/StopsAPI.js +0 -41
- package/src/api/stops/StopsAPI.test.js +0 -34
- package/src/api/tralis/TralisAPI.js +0 -731
- package/src/api/tralis/TralisAPI.test.js +0 -75
- package/src/api/tralis/WebSocketConnector.js +0 -338
- package/src/api/tralis/typedefs.js +0 -81
- package/src/assets/Lato-Black.ttf +0 -0
- package/src/assets/Lato-BlackItalic.ttf +0 -0
- package/src/assets/Lato-Bold.ttf +0 -0
- package/src/assets/Lato-BoldItalic.ttf +0 -0
- package/src/assets/Lato-Italic.ttf +0 -0
- package/src/assets/Lato-Light.ttf +0 -0
- package/src/assets/Lato-LightItalic.ttf +0 -0
- package/src/assets/Lato-Regular.ttf +0 -0
- package/src/assets/Lato-Thin.ttf +0 -0
- package/src/assets/Lato-ThinItalic.ttf +0 -0
- package/src/assets/OFL.txt +0 -93
- package/src/common/Tracker.js +0 -197
- package/src/common/api/api.js +0 -64
- package/src/common/api/api.test.js +0 -68
- package/src/common/controls/Control.js +0 -146
- package/src/common/index.js +0 -5
- package/src/common/layers/Layer.js +0 -404
- package/src/common/mixins/CopyrightMixin.js +0 -48
- package/src/common/mixins/SearchMixin.js +0 -176
- package/src/common/mixins/TralisLayerMixin.js +0 -930
- package/src/common/styles/index.js +0 -4
- package/src/common/styles/trackerDelayStyle.js +0 -17
- package/src/common/trackerConfig.test.js +0 -25
- package/src/common/typedefs.js +0 -23
- package/src/common/utils/createTrackerFilters.js +0 -87
- package/src/common/utils/createTrackerFilters.test.js +0 -95
- package/src/common/utils/getMapboxMapCopyrights.test.js +0 -47
- package/src/common/utils/index.js +0 -5
- package/src/common/utils/removeDuplicate.js +0 -22
- package/src/common/utils/removeDuplicate.test.js +0 -22
- package/src/common/utils/timeUtils.js +0 -44
- package/src/common/utils/timeUtils.test.js +0 -16
- package/src/doc/App.js +0 -116
- package/src/doc/App.scss +0 -51
- package/src/doc/_redirects +0 -2
- package/src/doc/components/CodeSandboxButton.js +0 -103
- package/src/doc/components/Documentation.js +0 -40
- package/src/doc/components/Esdoc/Anchor.js +0 -57
- package/src/doc/components/Esdoc/ClassDoc.js +0 -272
- package/src/doc/components/Esdoc/DeprecatedHTML.js +0 -16
- package/src/doc/components/Esdoc/DetailDocs.js +0 -281
- package/src/doc/components/Esdoc/DetailHTML.js +0 -33
- package/src/doc/components/Esdoc/DirectSubclassHTML.js +0 -30
- package/src/doc/components/Esdoc/DocBuilderUtils.js +0 -694
- package/src/doc/components/Esdoc/DocLinkHTML.js +0 -62
- package/src/doc/components/Esdoc/DocsLinkHTML.js +0 -38
- package/src/doc/components/Esdoc/Esdoc.js +0 -63
- package/src/doc/components/Esdoc/EsdocContent.js +0 -51
- package/src/doc/components/Esdoc/EsdocNavigation.js +0 -13
- package/src/doc/components/Esdoc/EsdocSearch.js +0 -81
- package/src/doc/components/Esdoc/ExperimentalHTML.js +0 -17
- package/src/doc/components/Esdoc/ExtendsChainHTML.js +0 -32
- package/src/doc/components/Esdoc/FileDocLinkHTML.js +0 -60
- package/src/doc/components/Esdoc/IdentifiersDoc.js +0 -113
- package/src/doc/components/Esdoc/IndirectSubclassHTML.js +0 -30
- package/src/doc/components/Esdoc/InheritedSummaryDoc.js +0 -70
- package/src/doc/components/Esdoc/InheritedSummaryHTML.js +0 -38
- package/src/doc/components/Esdoc/MixinClassesHTML.js +0 -29
- package/src/doc/components/Esdoc/NavDoc.js +0 -112
- package/src/doc/components/Esdoc/OverrideMethod.js +0 -44
- package/src/doc/components/Esdoc/OverrideMethodDescription.js +0 -35
- package/src/doc/components/Esdoc/Properties.js +0 -89
- package/src/doc/components/Esdoc/README.md +0 -45
- package/src/doc/components/Esdoc/SignatureHTML.js +0 -123
- package/src/doc/components/Esdoc/SingleDoc.js +0 -31
- package/src/doc/components/Esdoc/SummaryDoc.js +0 -160
- package/src/doc/components/Esdoc/SummaryHTML.js +0 -96
- package/src/doc/components/Esdoc/TypeDocLinkHTML.js +0 -249
- package/src/doc/components/Esdoc/css/identifiers.css +0 -38
- package/src/doc/components/Esdoc/css/search.css +0 -76
- package/src/doc/components/Esdoc/css/style.css +0 -603
- package/src/doc/components/Esdoc/index.js +0 -7
- package/src/doc/components/Example.js +0 -153
- package/src/doc/components/Examples.js +0 -183
- package/src/doc/components/Home.js +0 -106
- package/src/doc/components/TrackerExample.js +0 -38
- package/src/doc/examples/assets/tralis-live-map/index.js +0 -11
- package/src/doc/examples/assets/tralis-live-map/s1kreis.svg +0 -105
- package/src/doc/examples/assets/tralis-live-map/s20kreis.svg +0 -101
- package/src/doc/examples/assets/tralis-live-map/s2kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s3kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s4kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s6kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s7kreis.svg +0 -95
- package/src/doc/examples/assets/tralis-live-map/s8kreis.svg +0 -93
- package/src/doc/examples/assets/tralis-live-map/unknown.svg +0 -107
- package/src/doc/examples/mb-copyright.html +0 -26
- package/src/doc/examples/mb-copyright.js +0 -37
- package/src/doc/examples/mb-tracker.html +0 -1
- package/src/doc/examples/mb-tracker.js +0 -39
- package/src/doc/examples/mb-tracker.md +0 -1
- package/src/doc/examples/mb-tralis.html +0 -1
- package/src/doc/examples/mb-tralis.js +0 -34
- package/src/doc/examples/ol-copyright.html +0 -26
- package/src/doc/examples/ol-copyright.js +0 -43
- package/src/doc/examples/ol-mapbox-layer.html +0 -1
- package/src/doc/examples/ol-mapbox-layer.js +0 -28
- package/src/doc/examples/ol-mapbox-style-layer.html +0 -12
- package/src/doc/examples/ol-mapbox-style-layer.js +0 -44
- package/src/doc/examples/ol-query.html +0 -32
- package/src/doc/examples/ol-query.js +0 -83
- package/src/doc/examples/ol-routing.html +0 -26
- package/src/doc/examples/ol-routing.js +0 -59
- package/src/doc/examples/ol-routing.md +0 -1
- package/src/doc/examples/ol-stop-finder.html +0 -15
- package/src/doc/examples/ol-stop-finder.js +0 -31
- package/src/doc/examples/ol-stop-finder.md +0 -1
- package/src/doc/examples/ol-tracker.html +0 -1
- package/src/doc/examples/ol-tracker.js +0 -44
- package/src/doc/examples/ol-tracker.md +0 -1
- package/src/doc/examples/ol-tralis.html +0 -5
- package/src/doc/examples/ol-tralis.js +0 -57
- package/src/doc/examples/tralis-live-map.html +0 -1
- package/src/doc/examples/tralis-live-map.js +0 -51
- package/src/doc/examples/tralis-live-map.md +0 -3
- package/src/doc/examples.js +0 -107
- package/src/doc/img/examples/live_tracker_mb.jpg +0 -0
- package/src/doc/img/examples/live_tracker_munich.jpg +0 -0
- package/src/doc/img/examples/live_tracker_ol.jpg +0 -0
- package/src/doc/img/examples/mapbox.jpg +0 -0
- package/src/doc/img/examples/mapbox_style.jpg +0 -0
- package/src/doc/img/examples/ol-copyright.png +0 -0
- package/src/doc/img/examples/query_objects.jpg +0 -0
- package/src/doc/img/examples/routing.jpg +0 -0
- package/src/doc/img/examples/simple_map.jpg +0 -0
- package/src/doc/img/examples/stops.jpg +0 -0
- package/src/doc/img/favico.ico +0 -0
- package/src/doc/index.js +0 -21
- package/src/iife.js +0 -7
- package/src/index.js +0 -10
- package/src/mapbox/controls/CopyrightControl.js +0 -58
- package/src/mapbox/controls/index.js +0 -2
- package/src/mapbox/index.js +0 -4
- package/src/mapbox/layers/Layer.js +0 -118
- package/src/mapbox/layers/Layer.test.js +0 -202
- package/src/mapbox/layers/TralisLayer.js +0 -329
- package/src/mapbox/layers/index.js +0 -2
- package/src/ol/README.md +0 -0
- package/src/ol/controls/CopyrightControl.js +0 -80
- package/src/ol/controls/CopyrightControl.test.js +0 -211
- package/src/ol/controls/RoutingControl.js +0 -752
- package/src/ol/controls/RoutingControl.test.js +0 -216
- package/src/ol/controls/StopFinderControl.js +0 -38
- package/src/ol/controls/StopFinderControl.test.js +0 -59
- package/src/ol/controls/index.js +0 -3
- package/src/ol/controls/snapshots/RoutingControlRouteGen10.json +0 -58
- package/src/ol/controls/snapshots/RoutingControlRouteGen100.json +0 -292
- package/src/ol/controls/snapshots/RoutingControlRouteGen30.json +0 -69
- package/src/ol/controls/snapshots/RoutingControlRouteGen5.json +0 -58
- package/src/ol/controls/snapshots/RoutingControlRouteOSM.json +0 -759
- package/src/ol/controls/snapshots/RoutingControlStation1.json +0 -60
- package/src/ol/controls/snapshots/RoutingControlStation2.json +0 -49
- package/src/ol/index.js +0 -5
- package/src/ol/layers/Layer.js +0 -193
- package/src/ol/layers/Layer.test.js +0 -197
- package/src/ol/layers/MapboxLayer.js +0 -378
- package/src/ol/layers/MapboxStyleLayer.js +0 -417
- package/src/ol/layers/MaplibreLayer.js +0 -280
- package/src/ol/layers/RoutingLayer.js +0 -91
- package/src/ol/layers/TralisLayer.js +0 -359
- package/src/ol/layers/TralisLayer.test.js +0 -97
- package/src/ol/layers/VectorLayer.js +0 -43
- package/src/ol/layers/WMSLayer.js +0 -80
- package/src/ol/layers/WMSLayer.test.js +0 -84
- package/src/ol/layers/index.js +0 -8
- package/src/ol/styles/fullTrajectoryStyle.js +0 -51
- package/src/ol/styles/index.js +0 -2
- package/src/setupTests.js +0 -15
- package/webpack.config.js +0 -6
|
@@ -1,75 +0,0 @@
|
|
|
1
|
-
import { TralisAPI, TralisModes } from '..';
|
|
2
|
-
|
|
3
|
-
describe('TralisAPI', () => {
|
|
4
|
-
let tralisAPI;
|
|
5
|
-
let get;
|
|
6
|
-
|
|
7
|
-
beforeEach(() => {
|
|
8
|
-
get = jest.fn((params, cb) => {
|
|
9
|
-
cb({ content: 'content' });
|
|
10
|
-
});
|
|
11
|
-
tralisAPI = new TralisAPI();
|
|
12
|
-
tralisAPI.conn = {
|
|
13
|
-
get,
|
|
14
|
-
};
|
|
15
|
-
});
|
|
16
|
-
|
|
17
|
-
describe('#getFullTrajectory() calls fullTrajectory channel', () => {
|
|
18
|
-
test('without parameters', (done) => {
|
|
19
|
-
tralisAPI.getFullTrajectory().then(() => {
|
|
20
|
-
expect(get.mock.calls.length).toBe(1);
|
|
21
|
-
expect(get.mock.calls[0][0]).toEqual({
|
|
22
|
-
channel: 'full_trajectory',
|
|
23
|
-
});
|
|
24
|
-
done();
|
|
25
|
-
});
|
|
26
|
-
});
|
|
27
|
-
|
|
28
|
-
[null, TralisModes.TOPOGRAPHIC].forEach((mode) => {
|
|
29
|
-
describe(`using mode ${mode}`, () => {
|
|
30
|
-
test('using id', (done) => {
|
|
31
|
-
tralisAPI.getFullTrajectory('foo', mode).then(() => {
|
|
32
|
-
expect(get.mock.calls.length).toBe(1);
|
|
33
|
-
expect(get.mock.calls[0][0]).toEqual({
|
|
34
|
-
channel: 'full_trajectory_foo',
|
|
35
|
-
});
|
|
36
|
-
done();
|
|
37
|
-
});
|
|
38
|
-
});
|
|
39
|
-
|
|
40
|
-
test('using id and generalizationLevel param', (done) => {
|
|
41
|
-
tralisAPI.getFullTrajectory('foo', mode, 5).then(() => {
|
|
42
|
-
expect(get.mock.calls.length).toBe(1);
|
|
43
|
-
expect(get.mock.calls[0][0]).toEqual({
|
|
44
|
-
channel: 'full_trajectory_foo_gen5',
|
|
45
|
-
});
|
|
46
|
-
done();
|
|
47
|
-
});
|
|
48
|
-
});
|
|
49
|
-
});
|
|
50
|
-
});
|
|
51
|
-
|
|
52
|
-
describe('using schematic mode ', () => {
|
|
53
|
-
test('using id', (done) => {
|
|
54
|
-
tralisAPI.getFullTrajectory('foo', TralisModes.SCHEMATIC).then(() => {
|
|
55
|
-
expect(get.mock.calls.length).toBe(1);
|
|
56
|
-
expect(get.mock.calls[0][0]).toEqual({
|
|
57
|
-
channel: 'full_trajectory_schematic_foo',
|
|
58
|
-
});
|
|
59
|
-
done();
|
|
60
|
-
});
|
|
61
|
-
});
|
|
62
|
-
test("doesn't use generalizationLevel param", (done) => {
|
|
63
|
-
tralisAPI
|
|
64
|
-
.getFullTrajectory('foo', TralisModes.SCHEMATIC, 10)
|
|
65
|
-
.then(() => {
|
|
66
|
-
expect(get.mock.calls.length).toBe(1);
|
|
67
|
-
expect(get.mock.calls[0][0]).toEqual({
|
|
68
|
-
channel: 'full_trajectory_schematic_foo',
|
|
69
|
-
});
|
|
70
|
-
done();
|
|
71
|
-
});
|
|
72
|
-
});
|
|
73
|
-
});
|
|
74
|
-
});
|
|
75
|
-
});
|
|
@@ -1,338 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Class used to facilitate connection to a WebSocket and
|
|
3
|
-
* also to manage properly messages send to the WebSocket.
|
|
4
|
-
* This class must not contain any specific implementation.
|
|
5
|
-
*
|
|
6
|
-
* @private
|
|
7
|
-
*/
|
|
8
|
-
class WebSocketConnector {
|
|
9
|
-
constructor() {
|
|
10
|
-
this.defineProperties();
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
defineProperties() {
|
|
14
|
-
Object.defineProperties(this, {
|
|
15
|
-
closed: {
|
|
16
|
-
get: () =>
|
|
17
|
-
!!(
|
|
18
|
-
this.websocket &&
|
|
19
|
-
this.websocket.readyState === this.websocket.CLOSED
|
|
20
|
-
),
|
|
21
|
-
},
|
|
22
|
-
closing: {
|
|
23
|
-
get: () =>
|
|
24
|
-
!!(
|
|
25
|
-
this.websocket &&
|
|
26
|
-
this.websocket.readyState === this.websocket.CLOSING
|
|
27
|
-
),
|
|
28
|
-
},
|
|
29
|
-
connecting: {
|
|
30
|
-
get: () =>
|
|
31
|
-
!!(
|
|
32
|
-
this.websocket &&
|
|
33
|
-
this.websocket.readyState === this.websocket.CONNECTING
|
|
34
|
-
),
|
|
35
|
-
},
|
|
36
|
-
open: {
|
|
37
|
-
get: () =>
|
|
38
|
-
!!(
|
|
39
|
-
this.websocket && this.websocket.readyState === this.websocket.OPEN
|
|
40
|
-
),
|
|
41
|
-
},
|
|
42
|
-
/**
|
|
43
|
-
* Array of message to send on open.
|
|
44
|
-
* @type {Array<string>}
|
|
45
|
-
* @private
|
|
46
|
-
*/
|
|
47
|
-
messagesOnOpen: {
|
|
48
|
-
value: [],
|
|
49
|
-
writable: true,
|
|
50
|
-
},
|
|
51
|
-
/**
|
|
52
|
-
* Array of subscriptions.
|
|
53
|
-
* @type {Array<subscription>}
|
|
54
|
-
* @private
|
|
55
|
-
*/
|
|
56
|
-
subscriptions: {
|
|
57
|
-
value: [],
|
|
58
|
-
writable: true,
|
|
59
|
-
},
|
|
60
|
-
|
|
61
|
-
/**
|
|
62
|
-
* List of channels subscribed.
|
|
63
|
-
* @type {Array<subscription>}
|
|
64
|
-
* @private
|
|
65
|
-
*/
|
|
66
|
-
subscribed: {
|
|
67
|
-
value: {},
|
|
68
|
-
writable: true,
|
|
69
|
-
},
|
|
70
|
-
});
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
/**
|
|
74
|
-
* Get the websocket request string.
|
|
75
|
-
*
|
|
76
|
-
* @param {string} method Request mehtod {GET, SUB}.
|
|
77
|
-
* @param {Object} params Request parameters.
|
|
78
|
-
* @param {string} params.channel Channel name
|
|
79
|
-
* @param {string} [params.args] Request arguments
|
|
80
|
-
* @param {Number} [params.id] Request identifier
|
|
81
|
-
* @return {string} request string
|
|
82
|
-
* @private
|
|
83
|
-
*/
|
|
84
|
-
static getRequestString(method, params) {
|
|
85
|
-
let reqStr = `${method} ${params.channel}`;
|
|
86
|
-
reqStr += params.args ? ` ${params.args}` : '';
|
|
87
|
-
reqStr += params.id ? ` ${params.id}` : '';
|
|
88
|
-
return reqStr.trim();
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
/**
|
|
92
|
-
* (Re)connect the websocket.
|
|
93
|
-
*
|
|
94
|
-
* @param {strin} url Websocket url.
|
|
95
|
-
* @param {function} onOpen Callback called when the websocket connection is opened and before subscriptions of previous subscriptions.
|
|
96
|
-
* @private
|
|
97
|
-
*/
|
|
98
|
-
connect(url, onOpen = () => {}) {
|
|
99
|
-
if (this.websocket && !this.closed) {
|
|
100
|
-
this.websocket.close();
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
/** @ignore */
|
|
104
|
-
this.websocket = new WebSocket(url);
|
|
105
|
-
|
|
106
|
-
if (!this.open) {
|
|
107
|
-
this.websocket.addEventListener('open', () => {
|
|
108
|
-
onOpen();
|
|
109
|
-
this.subscribePreviousSubscriptions();
|
|
110
|
-
});
|
|
111
|
-
} else {
|
|
112
|
-
onOpen();
|
|
113
|
-
this.subscribePreviousSubscriptions();
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
/**
|
|
118
|
-
* Close the websocket definitively.
|
|
119
|
-
*
|
|
120
|
-
* @private
|
|
121
|
-
*/
|
|
122
|
-
close() {
|
|
123
|
-
if (this.websocket) {
|
|
124
|
-
this.websocket.onclose = null;
|
|
125
|
-
this.websocket.close();
|
|
126
|
-
this.websocket = null;
|
|
127
|
-
this.messagesOnOpen = [];
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
/**
|
|
132
|
-
* Sends a message to the websocket.
|
|
133
|
-
*
|
|
134
|
-
* @param {message} message Message to send.
|
|
135
|
-
* @private
|
|
136
|
-
*/
|
|
137
|
-
send(message) {
|
|
138
|
-
if (!this.websocket) {
|
|
139
|
-
return;
|
|
140
|
-
}
|
|
141
|
-
const send = () => {
|
|
142
|
-
this.websocket.send(message);
|
|
143
|
-
};
|
|
144
|
-
if (!this.open) {
|
|
145
|
-
// This 'if' avoid sending 2 identical BBOX message on open,
|
|
146
|
-
if (!this.messagesOnOpen.includes(message)) {
|
|
147
|
-
this.messagesOnOpen.push(message);
|
|
148
|
-
this.websocket.addEventListener('open', () => {
|
|
149
|
-
this.messagesOnOpen = [];
|
|
150
|
-
send();
|
|
151
|
-
});
|
|
152
|
-
this.websocket.addEventListener('close', () => {
|
|
153
|
-
this.messagesOnOpen = [];
|
|
154
|
-
});
|
|
155
|
-
}
|
|
156
|
-
} else if (!this.messagesOnOpen.includes(message)) {
|
|
157
|
-
send();
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
/**
|
|
162
|
-
* Listen to websocket messages.
|
|
163
|
-
*
|
|
164
|
-
* @param {Object} params Parameters for the websocket get request
|
|
165
|
-
* @param {function} cb callback on listen
|
|
166
|
-
* @param {function} errorCb Callback on error
|
|
167
|
-
* @return {{onMessage: function, errorCb: function}} Object with onMessage and error callbacks
|
|
168
|
-
* @private
|
|
169
|
-
*/
|
|
170
|
-
listen(params, cb, errorCb) {
|
|
171
|
-
// Remove the previous identical callback
|
|
172
|
-
this.unlisten(params, cb);
|
|
173
|
-
|
|
174
|
-
const onMessage = (evt) => {
|
|
175
|
-
let data = {};
|
|
176
|
-
try {
|
|
177
|
-
data = JSON.parse(evt.data);
|
|
178
|
-
} catch (err) {
|
|
179
|
-
// eslint-disable-next-line no-console
|
|
180
|
-
console.error('WebSocket: unable to parse JSON data', err, evt.data);
|
|
181
|
-
}
|
|
182
|
-
let source = params.channel;
|
|
183
|
-
source += params.args ? ` ${params.args}` : '';
|
|
184
|
-
|
|
185
|
-
// Buffer channel message return a list of other channels to propagate to proper callbacks.
|
|
186
|
-
const contents = data.source === 'buffer' ? data.content : [data];
|
|
187
|
-
contents.forEach((content) => {
|
|
188
|
-
// Because of backend optimization, the last content is null.
|
|
189
|
-
if (
|
|
190
|
-
content?.source === source &&
|
|
191
|
-
(!params.id || params.id === data.client_reference)
|
|
192
|
-
) {
|
|
193
|
-
cb(content);
|
|
194
|
-
}
|
|
195
|
-
});
|
|
196
|
-
};
|
|
197
|
-
|
|
198
|
-
if (this.websocket) {
|
|
199
|
-
this.websocket.addEventListener('message', onMessage);
|
|
200
|
-
|
|
201
|
-
if (errorCb) {
|
|
202
|
-
this.websocket.addEventListener('error', errorCb);
|
|
203
|
-
this.websocket.addEventListener('close', errorCb);
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
|
|
207
|
-
return { onMessageCb: onMessage, onErrorCb: errorCb };
|
|
208
|
-
}
|
|
209
|
-
|
|
210
|
-
/**
|
|
211
|
-
* Unlisten websocket messages.
|
|
212
|
-
*
|
|
213
|
-
* @param {Object} params Parameters for the websocket get request.
|
|
214
|
-
* @param {function} cb Callback used when listen.
|
|
215
|
-
* @private
|
|
216
|
-
*/
|
|
217
|
-
unlisten(params, cb) {
|
|
218
|
-
if (!this.websocket) {
|
|
219
|
-
return;
|
|
220
|
-
}
|
|
221
|
-
this.subscriptions
|
|
222
|
-
.filter(
|
|
223
|
-
(s) => s.params.channel === params.channel && (!cb || s.cb === cb),
|
|
224
|
-
)
|
|
225
|
-
.forEach(({ onMessageCb, onErrorCb }) => {
|
|
226
|
-
if (this.websocket) {
|
|
227
|
-
this.websocket.removeEventListener('message', onMessageCb);
|
|
228
|
-
if (onErrorCb) {
|
|
229
|
-
this.websocket.removeEventListener('error', onErrorCb);
|
|
230
|
-
this.websocket.removeEventListener('close', onErrorCb);
|
|
231
|
-
}
|
|
232
|
-
}
|
|
233
|
-
});
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
/**
|
|
237
|
-
* Sends a get request to the websocket.
|
|
238
|
-
*
|
|
239
|
-
* @param {Object} params Parameters for the websocket get request
|
|
240
|
-
* @param {function} cb callback on listen
|
|
241
|
-
* @param {function} errorCb Callback on error
|
|
242
|
-
* @private
|
|
243
|
-
*/
|
|
244
|
-
get(params, cb, errorCb) {
|
|
245
|
-
const reqStr = WebSocketConnector.getRequestString('GET', params);
|
|
246
|
-
this.send(reqStr);
|
|
247
|
-
this.listen(params, cb, errorCb);
|
|
248
|
-
}
|
|
249
|
-
|
|
250
|
-
/**
|
|
251
|
-
* Subscribe to a given channel.
|
|
252
|
-
*
|
|
253
|
-
* @param {Object} params Parameters for the websocket get request
|
|
254
|
-
* @param {function} cb callback on listen
|
|
255
|
-
* @param {function} errorCb Callback on error
|
|
256
|
-
* @param {boolean} quiet if false, no GET or SUB requests are send, only the callback is registered.
|
|
257
|
-
* @private
|
|
258
|
-
*/
|
|
259
|
-
subscribe(params, cb, errorCb, quiet = false) {
|
|
260
|
-
const { onMessageCb, onErrorCb } = this.listen(params, cb, errorCb);
|
|
261
|
-
const reqStr = WebSocketConnector.getRequestString('', params);
|
|
262
|
-
|
|
263
|
-
const index = this.subscriptions.findIndex(
|
|
264
|
-
(subcr) => params.channel === subcr.params.channel && cb === subcr.cb,
|
|
265
|
-
);
|
|
266
|
-
const newSubscr = { params, cb, errorCb, onMessageCb, onErrorCb, quiet };
|
|
267
|
-
if (index > -1) {
|
|
268
|
-
this.subscriptions[index] = newSubscr;
|
|
269
|
-
} else {
|
|
270
|
-
this.subscriptions.push(newSubscr);
|
|
271
|
-
}
|
|
272
|
-
|
|
273
|
-
if (!this.subscribed[reqStr]) {
|
|
274
|
-
if (!newSubscr.quiet) {
|
|
275
|
-
this.send(`GET ${reqStr}`);
|
|
276
|
-
this.send(`SUB ${reqStr}`);
|
|
277
|
-
}
|
|
278
|
-
this.subscribed[reqStr] = true;
|
|
279
|
-
}
|
|
280
|
-
}
|
|
281
|
-
|
|
282
|
-
/**
|
|
283
|
-
* Unsubscribe from a channel.
|
|
284
|
-
* @param {string} source source to unsubscribe from
|
|
285
|
-
* @param {function} cb Callback function to unsubscribe. If null all subscriptions for the channel will be unsubscribed.
|
|
286
|
-
* @private
|
|
287
|
-
*/
|
|
288
|
-
unsubscribe(source, cb) {
|
|
289
|
-
const toRemove = this.subscriptions.filter(
|
|
290
|
-
(s) => s.params.channel === source && (!cb || s.cb === cb),
|
|
291
|
-
);
|
|
292
|
-
|
|
293
|
-
toRemove.forEach(({ onMessageCb, onErrorCb }) => {
|
|
294
|
-
if (this.websocket) {
|
|
295
|
-
this.websocket.removeEventListener('message', onMessageCb);
|
|
296
|
-
if (onErrorCb) {
|
|
297
|
-
this.websocket.removeEventListener('error', onErrorCb);
|
|
298
|
-
this.websocket.removeEventListener('close', onErrorCb);
|
|
299
|
-
}
|
|
300
|
-
}
|
|
301
|
-
});
|
|
302
|
-
|
|
303
|
-
this.subscriptions = this.subscriptions.filter(
|
|
304
|
-
(s) => s.params.channel !== source || (cb && s.cb !== cb),
|
|
305
|
-
);
|
|
306
|
-
|
|
307
|
-
// If there is no more subscriptions to this channel, and the removed subscriptions didn't register quietly,
|
|
308
|
-
// we DEL it.
|
|
309
|
-
if (
|
|
310
|
-
source &&
|
|
311
|
-
this.subscribed[source] &&
|
|
312
|
-
!this.subscriptions.find((s) => s.params.channel === source) &&
|
|
313
|
-
toRemove.find((subscr) => !subscr.quiet)
|
|
314
|
-
) {
|
|
315
|
-
this.send(`DEL ${source}`);
|
|
316
|
-
this.subscribed[source] = false;
|
|
317
|
-
}
|
|
318
|
-
}
|
|
319
|
-
|
|
320
|
-
/**
|
|
321
|
-
* After an auto reconnection we need to re-subscribe to the channels.
|
|
322
|
-
*/
|
|
323
|
-
subscribePreviousSubscriptions() {
|
|
324
|
-
// Before to subscribe previous subscriptions we make sure they
|
|
325
|
-
// are all defined as unsubscribed, because this code is asynchrone
|
|
326
|
-
// and a subscription could have been added in between.
|
|
327
|
-
Object.keys(this.subscribed).forEach((key) => {
|
|
328
|
-
this.subscribed[key] = false;
|
|
329
|
-
});
|
|
330
|
-
|
|
331
|
-
// Subscribe all previous subscriptions.
|
|
332
|
-
[...this.subscriptions].forEach((s) => {
|
|
333
|
-
this.subscribe(s.params, s.cb, s.errorCb, s.quiet);
|
|
334
|
-
});
|
|
335
|
-
}
|
|
336
|
-
}
|
|
337
|
-
|
|
338
|
-
export default WebSocketConnector;
|
|
@@ -1,81 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @typedef {Object} Departure
|
|
3
|
-
* @property {number} time Timestamp in ms.
|
|
4
|
-
* @property {boolean} no_stop_between
|
|
5
|
-
* @property {number} train_number
|
|
6
|
-
* @property {string[]} to
|
|
7
|
-
* @property {number} ris_aimed_time Timestamp in ms.
|
|
8
|
-
* @property {number} updated_at Timestamp in ms.
|
|
9
|
-
* @property {boolean} new_to
|
|
10
|
-
* @property {number} min_arrival_time Timestamp in ms.
|
|
11
|
-
* @property {string[]} next_stoppoints List of next stops. Like value in at_station_ds100.
|
|
12
|
-
* @property {number} ris_estimated_time Timestamp in ms.
|
|
13
|
-
* @property {NetworkLine} line
|
|
14
|
-
* @property {boolean} has_fzo if true this departure has realtime data.
|
|
15
|
-
* @property {number} train_id
|
|
16
|
-
* @property {string} platform
|
|
17
|
-
* @property {?*} state
|
|
18
|
-
* @property {number} fzo_estimated_time Timestamp in ms.
|
|
19
|
-
* @property {?*} formation
|
|
20
|
-
* @property {?*} no_stop_till
|
|
21
|
-
* @property {number} train_type
|
|
22
|
-
* @property {number} call_id
|
|
23
|
-
* @property {string} created_at Timestamp in ms.
|
|
24
|
-
* @property {string} at_station_ds100
|
|
25
|
-
* @property {number} timediff Timestamp in ms.
|
|
26
|
-
*
|
|
27
|
-
*/
|
|
28
|
-
|
|
29
|
-
/**
|
|
30
|
-
* @typedef {GeoJSONFeature} Station
|
|
31
|
-
* @property {StationProperties} properties Returns the station's properties.
|
|
32
|
-
* @property {GeoJSONPoint} geometry Returns a point.
|
|
33
|
-
*/
|
|
34
|
-
|
|
35
|
-
/**
|
|
36
|
-
* @typedef {Object} StationProperties
|
|
37
|
-
* @property {Transfer[]} transfers
|
|
38
|
-
* @property {boolean} elevatorOutOfOrder
|
|
39
|
-
* @property {number} uic
|
|
40
|
-
* @property {string} name
|
|
41
|
-
* @property {NetworkLine[]} networkLines
|
|
42
|
-
* @property {boolean} hasElevator
|
|
43
|
-
* @property {boolean} hasZOB
|
|
44
|
-
* @property {boolean} hasAccessibility
|
|
45
|
-
* @property {string} type
|
|
46
|
-
*/
|
|
47
|
-
|
|
48
|
-
/**
|
|
49
|
-
* @typedef {Object} NetworkLine
|
|
50
|
-
* @property {number} id Identifier of the line.
|
|
51
|
-
* @property {string} color Color of the line (CSS color string).
|
|
52
|
-
* @property {string} stroke Stroke color of the line (CSS color string).
|
|
53
|
-
* @property {string} name Name of the line.
|
|
54
|
-
* @property {string} text_color Text color of the line (CSS color string).
|
|
55
|
-
*/
|
|
56
|
-
|
|
57
|
-
/**
|
|
58
|
-
* @typedef {Object} Transfer
|
|
59
|
-
* @property {string} mot Mode of transportation (ex: U-Bahn).
|
|
60
|
-
* @property {string[]} lines Array of lines name (ex: ["U4", "U5"]).
|
|
61
|
-
*/
|
|
62
|
-
|
|
63
|
-
/**
|
|
64
|
-
* @typedef {GeoJSONFeature} StopSequence
|
|
65
|
-
*/
|
|
66
|
-
|
|
67
|
-
/**
|
|
68
|
-
* @typedef {GeoJSONFeature} TralisTrajectory
|
|
69
|
-
*/
|
|
70
|
-
|
|
71
|
-
/**
|
|
72
|
-
* @typedef {GeoJSONFeature} FullTrajectory
|
|
73
|
-
*/
|
|
74
|
-
|
|
75
|
-
/**
|
|
76
|
-
* @typedef {GeoJSONFeature} Vehicle
|
|
77
|
-
*/
|
|
78
|
-
|
|
79
|
-
/**
|
|
80
|
-
* @typedef {GeoJSONFeature} ExtraGeom
|
|
81
|
-
*/
|
|
Binary file
|
|
Binary file
|
package/src/assets/Lato-Bold.ttf
DELETED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/src/assets/Lato-Thin.ttf
DELETED
|
Binary file
|
|
Binary file
|
package/src/assets/OFL.txt
DELETED
|
@@ -1,93 +0,0 @@
|
|
|
1
|
-
Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
|
|
2
|
-
|
|
3
|
-
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
|
4
|
-
This license is copied below, and is also available with a FAQ at:
|
|
5
|
-
http://scripts.sil.org/OFL
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
-----------------------------------------------------------
|
|
9
|
-
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
|
10
|
-
-----------------------------------------------------------
|
|
11
|
-
|
|
12
|
-
PREAMBLE
|
|
13
|
-
The goals of the Open Font License (OFL) are to stimulate worldwide
|
|
14
|
-
development of collaborative font projects, to support the font creation
|
|
15
|
-
efforts of academic and linguistic communities, and to provide a free and
|
|
16
|
-
open framework in which fonts may be shared and improved in partnership
|
|
17
|
-
with others.
|
|
18
|
-
|
|
19
|
-
The OFL allows the licensed fonts to be used, studied, modified and
|
|
20
|
-
redistributed freely as long as they are not sold by themselves. The
|
|
21
|
-
fonts, including any derivative works, can be bundled, embedded,
|
|
22
|
-
redistributed and/or sold with any software provided that any reserved
|
|
23
|
-
names are not used by derivative works. The fonts and derivatives,
|
|
24
|
-
however, cannot be released under any other type of license. The
|
|
25
|
-
requirement for fonts to remain under this license does not apply
|
|
26
|
-
to any document created using the fonts or their derivatives.
|
|
27
|
-
|
|
28
|
-
DEFINITIONS
|
|
29
|
-
"Font Software" refers to the set of files released by the Copyright
|
|
30
|
-
Holder(s) under this license and clearly marked as such. This may
|
|
31
|
-
include source files, build scripts and documentation.
|
|
32
|
-
|
|
33
|
-
"Reserved Font Name" refers to any names specified as such after the
|
|
34
|
-
copyright statement(s).
|
|
35
|
-
|
|
36
|
-
"Original Version" refers to the collection of Font Software components as
|
|
37
|
-
distributed by the Copyright Holder(s).
|
|
38
|
-
|
|
39
|
-
"Modified Version" refers to any derivative made by adding to, deleting,
|
|
40
|
-
or substituting -- in part or in whole -- any of the components of the
|
|
41
|
-
Original Version, by changing formats or by porting the Font Software to a
|
|
42
|
-
new environment.
|
|
43
|
-
|
|
44
|
-
"Author" refers to any designer, engineer, programmer, technical
|
|
45
|
-
writer or other person who contributed to the Font Software.
|
|
46
|
-
|
|
47
|
-
PERMISSION & CONDITIONS
|
|
48
|
-
Permission is hereby granted, free of charge, to any person obtaining
|
|
49
|
-
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
|
50
|
-
redistribute, and sell modified and unmodified copies of the Font
|
|
51
|
-
Software, subject to the following conditions:
|
|
52
|
-
|
|
53
|
-
1) Neither the Font Software nor any of its individual components,
|
|
54
|
-
in Original or Modified Versions, may be sold by itself.
|
|
55
|
-
|
|
56
|
-
2) Original or Modified Versions of the Font Software may be bundled,
|
|
57
|
-
redistributed and/or sold with any software, provided that each copy
|
|
58
|
-
contains the above copyright notice and this license. These can be
|
|
59
|
-
included either as stand-alone text files, human-readable headers or
|
|
60
|
-
in the appropriate machine-readable metadata fields within text or
|
|
61
|
-
binary files as long as those fields can be easily viewed by the user.
|
|
62
|
-
|
|
63
|
-
3) No Modified Version of the Font Software may use the Reserved Font
|
|
64
|
-
Name(s) unless explicit written permission is granted by the corresponding
|
|
65
|
-
Copyright Holder. This restriction only applies to the primary font name as
|
|
66
|
-
presented to the users.
|
|
67
|
-
|
|
68
|
-
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
|
69
|
-
Software shall not be used to promote, endorse or advertise any
|
|
70
|
-
Modified Version, except to acknowledge the contribution(s) of the
|
|
71
|
-
Copyright Holder(s) and the Author(s) or with their explicit written
|
|
72
|
-
permission.
|
|
73
|
-
|
|
74
|
-
5) The Font Software, modified or unmodified, in part or in whole,
|
|
75
|
-
must be distributed entirely under this license, and must not be
|
|
76
|
-
distributed under any other license. The requirement for fonts to
|
|
77
|
-
remain under this license does not apply to any document created
|
|
78
|
-
using the Font Software.
|
|
79
|
-
|
|
80
|
-
TERMINATION
|
|
81
|
-
This license becomes null and void if any of the above conditions are
|
|
82
|
-
not met.
|
|
83
|
-
|
|
84
|
-
DISCLAIMER
|
|
85
|
-
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
86
|
-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
|
87
|
-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
|
88
|
-
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
|
89
|
-
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
90
|
-
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
|
91
|
-
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
92
|
-
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
|
93
|
-
OTHER DEALINGS IN THE FONT SOFTWARE.
|