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.
Files changed (304) hide show
  1. package/api/RoutingAPI.js +15 -0
  2. package/api/RoutingAPI.test.js +25 -0
  3. package/api/StopsAPI.js +12 -0
  4. package/api/StopsAPI.test.js +22 -0
  5. package/api/TralisAPI.js +359 -0
  6. package/api/TralisAPI.test.js +67 -0
  7. package/{src/api/tralis → api}/TralisAPIUtils.js +2 -32
  8. package/api/index.js +3 -0
  9. package/{index.html → api/typedefs.js} +0 -0
  10. package/common/Tracker.js +93 -0
  11. package/common/api/HttpAPI.js +30 -0
  12. package/common/api/HttpAPI.test.js +50 -0
  13. package/common/api/WebSocketAPI.js +175 -0
  14. package/{src/api/tralis/WebSocketConnector.test.js → common/api/WebSocketAPI.test.js} +100 -145
  15. package/common/controls/Control.js +81 -0
  16. package/{src/common → common}/controls/Control.test.js +32 -43
  17. package/common/index.js +4 -0
  18. package/common/layers/Layer.js +213 -0
  19. package/{src/common → common}/layers/Layer.test.js +185 -244
  20. package/common/mixins/CopyrightMixin.js +24 -0
  21. package/common/mixins/SearchMixin.js +110 -0
  22. package/common/mixins/TralisLayerMixin.js +479 -0
  23. package/common/styles/index.js +4 -0
  24. package/{src/common → common}/styles/trackerDefaultStyle.js +39 -175
  25. package/common/styles/trackerDelayStyle.js +8 -0
  26. package/{src/common → common}/styles/trackerSimpleStyle.js +4 -8
  27. package/{src/common → common}/trackerConfig.js +61 -99
  28. package/common/trackerConfig.test.js +23 -0
  29. package/{src/doc/examples/ol-mapbox-layer.md → common/typedefs.js} +0 -0
  30. package/common/utils/createTrackerFilters.js +56 -0
  31. package/common/utils/createTrackerFilters.test.js +79 -0
  32. package/{src/common → common}/utils/getMapboxMapCopyrights.js +3 -16
  33. package/common/utils/getMapboxMapCopyrights.test.js +40 -0
  34. package/{src/common → common}/utils/getMapboxStyleUrl.js +3 -13
  35. package/{src/common → common}/utils/getVehiclePosition.js +3 -33
  36. package/common/utils/index.js +5 -0
  37. package/common/utils/removeDuplicate.js +8 -0
  38. package/common/utils/removeDuplicate.test.js +19 -0
  39. package/{src/common → common}/utils/sortByDelay.js +2 -7
  40. package/common/utils/timeUtils.js +20 -0
  41. package/common/utils/timeUtils.test.js +10 -0
  42. package/index.js +8 -0
  43. package/mapbox/controls/CopyrightControl.js +29 -0
  44. package/mapbox/controls/index.js +1 -0
  45. package/mapbox/index.js +4 -0
  46. package/mapbox/layers/Layer.js +57 -0
  47. package/mapbox/layers/Layer.test.js +182 -0
  48. package/mapbox/layers/TralisLayer.js +182 -0
  49. package/{src/mapbox → mapbox}/layers/TralisLayer.test.js +12 -14
  50. package/mapbox/layers/index.js +2 -0
  51. package/{src/mapbox → mapbox}/utils.js +7 -21
  52. package/mbt.js +50444 -0
  53. package/mbt.js.map +7 -0
  54. package/mbt.min.js +1005 -0
  55. package/mbt.min.js.map +7 -0
  56. package/ol/controls/CopyrightControl.js +42 -0
  57. package/ol/controls/CopyrightControl.test.js +165 -0
  58. package/ol/controls/RoutingControl.js +387 -0
  59. package/ol/controls/RoutingControl.test.js +151 -0
  60. package/ol/controls/StopFinderControl.js +10 -0
  61. package/ol/controls/StopFinderControl.test.js +48 -0
  62. package/ol/controls/index.js +3 -0
  63. package/ol/index.js +5 -0
  64. package/ol/layers/Layer.js +88 -0
  65. package/ol/layers/Layer.test.js +174 -0
  66. package/ol/layers/MapboxLayer.js +203 -0
  67. package/{src/ol → ol}/layers/MapboxLayer.test.js +58 -84
  68. package/ol/layers/MapboxStyleLayer.js +187 -0
  69. package/{src/ol → ol}/layers/MapboxStyleLayer.test.js +97 -128
  70. package/ol/layers/MaplibreLayer.js +139 -0
  71. package/ol/layers/RoutingLayer.js +61 -0
  72. package/{src/ol → ol}/layers/RoutingLayer.test.js +15 -24
  73. package/ol/layers/TralisLayer.js +185 -0
  74. package/ol/layers/TralisLayer.test.js +79 -0
  75. package/ol/layers/VectorLayer.js +22 -0
  76. package/{src/ol → ol}/layers/VectorLayer.test.js +34 -45
  77. package/ol/layers/WMSLayer.js +38 -0
  78. package/ol/layers/WMSLayer.test.js +76 -0
  79. package/ol/layers/index.js +8 -0
  80. package/{src/ol → ol}/styles/fullTrajectoryDelayStyle.js +11 -15
  81. package/ol/styles/fullTrajectoryStyle.js +43 -0
  82. package/ol/styles/index.js +2 -0
  83. package/package.json +34 -74
  84. package/.babelrc +0 -6
  85. package/.esdoc.json +0 -17
  86. package/.eslintignore +0 -1
  87. package/.github/workflows/conventional-pr-title.yml +0 -21
  88. package/.github/workflows/cypress.yml +0 -29
  89. package/.github/workflows/nodejs.yml +0 -28
  90. package/.husky/commit-msg +0 -4
  91. package/.husky/post-checkout +0 -4
  92. package/.husky/post-merge +0 -4
  93. package/.husky/post-rebase +0 -4
  94. package/.husky/pre-commit +0 -4
  95. package/.neutrinorc.js +0 -176
  96. package/.nvmrc +0 -1
  97. package/CHANGELOG.md +0 -10
  98. package/LICENSE +0 -21
  99. package/__mocks__/mapbox-gl.js +0 -81
  100. package/__mocks__/maplibre-gl.js +0 -81
  101. package/commitlint.config.js +0 -1
  102. package/cypress/fixtures/example.json +0 -5
  103. package/cypress/integration/examples/api.spec.js +0 -7
  104. package/cypress/integration/examples/examples.spec.js +0 -7
  105. package/cypress/integration/examples/navigation.spec.js +0 -29
  106. package/cypress/plugins/index.js +0 -21
  107. package/cypress/support/commands.js +0 -25
  108. package/cypress/support/index.js +0 -20
  109. package/cypress.json +0 -4
  110. package/data/fetchRoute.json +0 -292
  111. package/data/fetchTrajectories.json +0 -18
  112. package/data/fetchTrajectoryById.json +0 -3
  113. package/data/fetchTrajectoryStations.json +0 -18
  114. package/data/stopsSearch.json +0 -15
  115. package/documentation.yml +0 -4
  116. package/esdoc/README.md +0 -27
  117. package/esdoc/plugins/MyPlugin.js +0 -69
  118. package/esdoc/plugins/dynamic-property-plugin/Plugin.js +0 -50
  119. package/esdoc/plugins/externals-plugin/Plugin.js +0 -45
  120. package/esdoc/plugins/externals-plugin/externals.js +0 -96
  121. package/global-setup.js +0 -3
  122. package/indexweb.html +0 -49
  123. package/jest.config.js +0 -5
  124. package/pull_request_template.md +0 -17
  125. package/renovate.json +0 -4
  126. package/scripts/read-pkg-json.js +0 -22
  127. package/src/api/index.js +0 -3
  128. package/src/api/routing/RoutingAPI.js +0 -44
  129. package/src/api/routing/RoutingAPI.test.js +0 -41
  130. package/src/api/stops/StopsAPI.js +0 -41
  131. package/src/api/stops/StopsAPI.test.js +0 -34
  132. package/src/api/tralis/TralisAPI.js +0 -731
  133. package/src/api/tralis/TralisAPI.test.js +0 -75
  134. package/src/api/tralis/WebSocketConnector.js +0 -338
  135. package/src/api/tralis/typedefs.js +0 -81
  136. package/src/assets/Lato-Black.ttf +0 -0
  137. package/src/assets/Lato-BlackItalic.ttf +0 -0
  138. package/src/assets/Lato-Bold.ttf +0 -0
  139. package/src/assets/Lato-BoldItalic.ttf +0 -0
  140. package/src/assets/Lato-Italic.ttf +0 -0
  141. package/src/assets/Lato-Light.ttf +0 -0
  142. package/src/assets/Lato-LightItalic.ttf +0 -0
  143. package/src/assets/Lato-Regular.ttf +0 -0
  144. package/src/assets/Lato-Thin.ttf +0 -0
  145. package/src/assets/Lato-ThinItalic.ttf +0 -0
  146. package/src/assets/OFL.txt +0 -93
  147. package/src/common/Tracker.js +0 -197
  148. package/src/common/api/api.js +0 -64
  149. package/src/common/api/api.test.js +0 -68
  150. package/src/common/controls/Control.js +0 -146
  151. package/src/common/index.js +0 -5
  152. package/src/common/layers/Layer.js +0 -404
  153. package/src/common/mixins/CopyrightMixin.js +0 -48
  154. package/src/common/mixins/SearchMixin.js +0 -176
  155. package/src/common/mixins/TralisLayerMixin.js +0 -930
  156. package/src/common/styles/index.js +0 -4
  157. package/src/common/styles/trackerDelayStyle.js +0 -17
  158. package/src/common/trackerConfig.test.js +0 -25
  159. package/src/common/typedefs.js +0 -23
  160. package/src/common/utils/createTrackerFilters.js +0 -87
  161. package/src/common/utils/createTrackerFilters.test.js +0 -95
  162. package/src/common/utils/getMapboxMapCopyrights.test.js +0 -47
  163. package/src/common/utils/index.js +0 -5
  164. package/src/common/utils/removeDuplicate.js +0 -22
  165. package/src/common/utils/removeDuplicate.test.js +0 -22
  166. package/src/common/utils/timeUtils.js +0 -44
  167. package/src/common/utils/timeUtils.test.js +0 -16
  168. package/src/doc/App.js +0 -116
  169. package/src/doc/App.scss +0 -51
  170. package/src/doc/_redirects +0 -2
  171. package/src/doc/components/CodeSandboxButton.js +0 -103
  172. package/src/doc/components/Documentation.js +0 -40
  173. package/src/doc/components/Esdoc/Anchor.js +0 -57
  174. package/src/doc/components/Esdoc/ClassDoc.js +0 -272
  175. package/src/doc/components/Esdoc/DeprecatedHTML.js +0 -16
  176. package/src/doc/components/Esdoc/DetailDocs.js +0 -281
  177. package/src/doc/components/Esdoc/DetailHTML.js +0 -33
  178. package/src/doc/components/Esdoc/DirectSubclassHTML.js +0 -30
  179. package/src/doc/components/Esdoc/DocBuilderUtils.js +0 -694
  180. package/src/doc/components/Esdoc/DocLinkHTML.js +0 -62
  181. package/src/doc/components/Esdoc/DocsLinkHTML.js +0 -38
  182. package/src/doc/components/Esdoc/Esdoc.js +0 -63
  183. package/src/doc/components/Esdoc/EsdocContent.js +0 -51
  184. package/src/doc/components/Esdoc/EsdocNavigation.js +0 -13
  185. package/src/doc/components/Esdoc/EsdocSearch.js +0 -81
  186. package/src/doc/components/Esdoc/ExperimentalHTML.js +0 -17
  187. package/src/doc/components/Esdoc/ExtendsChainHTML.js +0 -32
  188. package/src/doc/components/Esdoc/FileDocLinkHTML.js +0 -60
  189. package/src/doc/components/Esdoc/IdentifiersDoc.js +0 -113
  190. package/src/doc/components/Esdoc/IndirectSubclassHTML.js +0 -30
  191. package/src/doc/components/Esdoc/InheritedSummaryDoc.js +0 -70
  192. package/src/doc/components/Esdoc/InheritedSummaryHTML.js +0 -38
  193. package/src/doc/components/Esdoc/MixinClassesHTML.js +0 -29
  194. package/src/doc/components/Esdoc/NavDoc.js +0 -112
  195. package/src/doc/components/Esdoc/OverrideMethod.js +0 -44
  196. package/src/doc/components/Esdoc/OverrideMethodDescription.js +0 -35
  197. package/src/doc/components/Esdoc/Properties.js +0 -89
  198. package/src/doc/components/Esdoc/README.md +0 -45
  199. package/src/doc/components/Esdoc/SignatureHTML.js +0 -123
  200. package/src/doc/components/Esdoc/SingleDoc.js +0 -31
  201. package/src/doc/components/Esdoc/SummaryDoc.js +0 -160
  202. package/src/doc/components/Esdoc/SummaryHTML.js +0 -96
  203. package/src/doc/components/Esdoc/TypeDocLinkHTML.js +0 -249
  204. package/src/doc/components/Esdoc/css/identifiers.css +0 -38
  205. package/src/doc/components/Esdoc/css/search.css +0 -76
  206. package/src/doc/components/Esdoc/css/style.css +0 -603
  207. package/src/doc/components/Esdoc/index.js +0 -7
  208. package/src/doc/components/Example.js +0 -153
  209. package/src/doc/components/Examples.js +0 -183
  210. package/src/doc/components/Home.js +0 -106
  211. package/src/doc/components/TrackerExample.js +0 -38
  212. package/src/doc/examples/assets/tralis-live-map/index.js +0 -11
  213. package/src/doc/examples/assets/tralis-live-map/s1kreis.svg +0 -105
  214. package/src/doc/examples/assets/tralis-live-map/s20kreis.svg +0 -101
  215. package/src/doc/examples/assets/tralis-live-map/s2kreis.svg +0 -95
  216. package/src/doc/examples/assets/tralis-live-map/s3kreis.svg +0 -95
  217. package/src/doc/examples/assets/tralis-live-map/s4kreis.svg +0 -95
  218. package/src/doc/examples/assets/tralis-live-map/s6kreis.svg +0 -95
  219. package/src/doc/examples/assets/tralis-live-map/s7kreis.svg +0 -95
  220. package/src/doc/examples/assets/tralis-live-map/s8kreis.svg +0 -93
  221. package/src/doc/examples/assets/tralis-live-map/unknown.svg +0 -107
  222. package/src/doc/examples/mb-copyright.html +0 -26
  223. package/src/doc/examples/mb-copyright.js +0 -37
  224. package/src/doc/examples/mb-tracker.html +0 -1
  225. package/src/doc/examples/mb-tracker.js +0 -39
  226. package/src/doc/examples/mb-tracker.md +0 -1
  227. package/src/doc/examples/mb-tralis.html +0 -1
  228. package/src/doc/examples/mb-tralis.js +0 -34
  229. package/src/doc/examples/ol-copyright.html +0 -26
  230. package/src/doc/examples/ol-copyright.js +0 -43
  231. package/src/doc/examples/ol-mapbox-layer.html +0 -1
  232. package/src/doc/examples/ol-mapbox-layer.js +0 -28
  233. package/src/doc/examples/ol-mapbox-style-layer.html +0 -12
  234. package/src/doc/examples/ol-mapbox-style-layer.js +0 -44
  235. package/src/doc/examples/ol-query.html +0 -32
  236. package/src/doc/examples/ol-query.js +0 -83
  237. package/src/doc/examples/ol-routing.html +0 -26
  238. package/src/doc/examples/ol-routing.js +0 -59
  239. package/src/doc/examples/ol-routing.md +0 -1
  240. package/src/doc/examples/ol-stop-finder.html +0 -15
  241. package/src/doc/examples/ol-stop-finder.js +0 -31
  242. package/src/doc/examples/ol-stop-finder.md +0 -1
  243. package/src/doc/examples/ol-tracker.html +0 -1
  244. package/src/doc/examples/ol-tracker.js +0 -44
  245. package/src/doc/examples/ol-tracker.md +0 -1
  246. package/src/doc/examples/ol-tralis.html +0 -5
  247. package/src/doc/examples/ol-tralis.js +0 -57
  248. package/src/doc/examples/tralis-live-map.html +0 -1
  249. package/src/doc/examples/tralis-live-map.js +0 -51
  250. package/src/doc/examples/tralis-live-map.md +0 -3
  251. package/src/doc/examples.js +0 -107
  252. package/src/doc/img/examples/live_tracker_mb.jpg +0 -0
  253. package/src/doc/img/examples/live_tracker_munich.jpg +0 -0
  254. package/src/doc/img/examples/live_tracker_ol.jpg +0 -0
  255. package/src/doc/img/examples/mapbox.jpg +0 -0
  256. package/src/doc/img/examples/mapbox_style.jpg +0 -0
  257. package/src/doc/img/examples/ol-copyright.png +0 -0
  258. package/src/doc/img/examples/query_objects.jpg +0 -0
  259. package/src/doc/img/examples/routing.jpg +0 -0
  260. package/src/doc/img/examples/simple_map.jpg +0 -0
  261. package/src/doc/img/examples/stops.jpg +0 -0
  262. package/src/doc/img/favico.ico +0 -0
  263. package/src/doc/index.js +0 -21
  264. package/src/iife.js +0 -7
  265. package/src/index.js +0 -10
  266. package/src/mapbox/controls/CopyrightControl.js +0 -58
  267. package/src/mapbox/controls/index.js +0 -2
  268. package/src/mapbox/index.js +0 -4
  269. package/src/mapbox/layers/Layer.js +0 -118
  270. package/src/mapbox/layers/Layer.test.js +0 -202
  271. package/src/mapbox/layers/TralisLayer.js +0 -329
  272. package/src/mapbox/layers/index.js +0 -2
  273. package/src/ol/README.md +0 -0
  274. package/src/ol/controls/CopyrightControl.js +0 -80
  275. package/src/ol/controls/CopyrightControl.test.js +0 -211
  276. package/src/ol/controls/RoutingControl.js +0 -752
  277. package/src/ol/controls/RoutingControl.test.js +0 -216
  278. package/src/ol/controls/StopFinderControl.js +0 -38
  279. package/src/ol/controls/StopFinderControl.test.js +0 -59
  280. package/src/ol/controls/index.js +0 -3
  281. package/src/ol/controls/snapshots/RoutingControlRouteGen10.json +0 -58
  282. package/src/ol/controls/snapshots/RoutingControlRouteGen100.json +0 -292
  283. package/src/ol/controls/snapshots/RoutingControlRouteGen30.json +0 -69
  284. package/src/ol/controls/snapshots/RoutingControlRouteGen5.json +0 -58
  285. package/src/ol/controls/snapshots/RoutingControlRouteOSM.json +0 -759
  286. package/src/ol/controls/snapshots/RoutingControlStation1.json +0 -60
  287. package/src/ol/controls/snapshots/RoutingControlStation2.json +0 -49
  288. package/src/ol/index.js +0 -5
  289. package/src/ol/layers/Layer.js +0 -193
  290. package/src/ol/layers/Layer.test.js +0 -197
  291. package/src/ol/layers/MapboxLayer.js +0 -378
  292. package/src/ol/layers/MapboxStyleLayer.js +0 -417
  293. package/src/ol/layers/MaplibreLayer.js +0 -280
  294. package/src/ol/layers/RoutingLayer.js +0 -91
  295. package/src/ol/layers/TralisLayer.js +0 -359
  296. package/src/ol/layers/TralisLayer.test.js +0 -97
  297. package/src/ol/layers/VectorLayer.js +0 -43
  298. package/src/ol/layers/WMSLayer.js +0 -80
  299. package/src/ol/layers/WMSLayer.test.js +0 -84
  300. package/src/ol/layers/index.js +0 -8
  301. package/src/ol/styles/fullTrajectoryStyle.js +0 -51
  302. package/src/ol/styles/index.js +0 -2
  303. package/src/setupTests.js +0 -15
  304. package/webpack.config.js +0 -6
@@ -0,0 +1,15 @@
1
+ import HttpAPI from "../common/api/HttpAPI";
2
+ class RoutingAPI extends HttpAPI {
3
+ constructor(options = {}) {
4
+ super({
5
+ url: "https://api.geops.io/routing/v1/",
6
+ ...options
7
+ });
8
+ }
9
+ route(params, abortController = new AbortController()) {
10
+ return this.fetch("", params, {
11
+ signal: abortController.signal
12
+ });
13
+ }
14
+ }
15
+ export default RoutingAPI;
@@ -0,0 +1,25 @@
1
+ import fetch from "jest-fetch-mock";
2
+ import RoutingAPI from "./RoutingAPI";
3
+ let api;
4
+ describe("RoutingAPI", () => {
5
+ beforeEach(() => {
6
+ global.fetch = fetch;
7
+ fetch.resetMocks();
8
+ api = new RoutingAPI({ apiKey: "apiKey" });
9
+ });
10
+ describe("#route", () => {
11
+ test("should success", (done) => {
12
+ fetch.mockResponseOnce(JSON.stringify(global.fetchRouteResponse));
13
+ return api.route({
14
+ mot: "bus",
15
+ via: "47.3739194713294,8.538274823394632|47.37595378493421,8.537490375951839"
16
+ }).then((featureCollection) => {
17
+ expect(fetch.mock.calls[0][0]).toEqual("https://api.geops.io/routing/v1/?key=apiKey&mot=bus&via=47.3739194713294%2C8.538274823394632%7C47.37595378493421%2C8.537490375951839");
18
+ expect(featureCollection.features[0].geometry.type).toEqual("LineString");
19
+ expect(featureCollection.features[0].properties.lines).toBeDefined();
20
+ expect(featureCollection.features[0].properties.station_to).toBeDefined();
21
+ done();
22
+ });
23
+ });
24
+ });
25
+ });
@@ -0,0 +1,12 @@
1
+ import HttpAPI from "../common/api/HttpAPI";
2
+ class StopsAPI extends HttpAPI {
3
+ constructor(options = {}) {
4
+ super({ url: "https://api.geops.io/stops/v1/", ...options });
5
+ }
6
+ search(params, abortController = {}) {
7
+ return this.fetch("", params, {
8
+ signal: abortController.signal
9
+ });
10
+ }
11
+ }
12
+ export default StopsAPI;
@@ -0,0 +1,22 @@
1
+ import fetch from "jest-fetch-mock";
2
+ import StopsAPI from "./StopsAPI";
3
+ let api;
4
+ describe("StopsAPI", () => {
5
+ beforeEach(() => {
6
+ global.fetch = fetch;
7
+ fetch.resetMocks();
8
+ api = new StopsAPI({ apiKey: "apiKey" });
9
+ });
10
+ describe("#search", () => {
11
+ test("should success", (done) => {
12
+ fetch.mockResponseOnce(JSON.stringify(global.stopsSearchResponse));
13
+ return api.search({
14
+ q: "Bern"
15
+ }).then((featureCollection) => {
16
+ expect(fetch.mock.calls[0][0]).toEqual("https://api.geops.io/stops/v1/?key=apiKey&q=Bern");
17
+ expect(featureCollection.features[0].properties.name).toEqual("Bern");
18
+ done();
19
+ });
20
+ });
21
+ });
22
+ });
@@ -0,0 +1,359 @@
1
+ import WebSocketAPI from "../common/api/WebSocketAPI";
2
+ import {
3
+ getModeSuffix,
4
+ cleanStopTime,
5
+ compareDepartures
6
+ } from "./TralisAPIUtils";
7
+ export const TralisModes = {
8
+ RAW: "raw",
9
+ TOPOGRAPHIC: "topographic",
10
+ SCHEMATIC: "schematic"
11
+ };
12
+ class TralisAPI {
13
+ constructor(options = {}) {
14
+ this.defineProperties(options);
15
+ this.subscribedStationUic = null;
16
+ this.departureUpdateTimeout = null;
17
+ this.maxDepartureAge = 30;
18
+ this.extraGeoms = {};
19
+ this.prefix = options.prefix || "";
20
+ this.onOpen = this.onOpen.bind(this);
21
+ }
22
+ defineProperties(options) {
23
+ let opt = options;
24
+ if (typeof options === "string") {
25
+ opt = { url: options };
26
+ }
27
+ const { apiKey } = opt;
28
+ let { url, projection, bbox, buffer = [100, 100] } = opt;
29
+ const wsApi = new WebSocketAPI();
30
+ if (apiKey) {
31
+ url = `${url || "wss://api.geops.io/tracker-ws/v1/"}?key=${apiKey}`;
32
+ }
33
+ Object.defineProperties(this, {
34
+ url: {
35
+ get: () => url,
36
+ set: (newUrl) => {
37
+ url = newUrl;
38
+ this.open();
39
+ }
40
+ },
41
+ projection: {
42
+ get: () => projection,
43
+ set: (newProjection) => {
44
+ if (newProjection !== projection) {
45
+ projection = newProjection;
46
+ if (this.wsApi) {
47
+ this.wsApi.send(`PROJECTION ${projection}`);
48
+ }
49
+ }
50
+ }
51
+ },
52
+ bbox: {
53
+ get: () => bbox,
54
+ set: (newBbox) => {
55
+ if (JSON.stringify(newBbox) !== JSON.stringify(bbox)) {
56
+ bbox = newBbox;
57
+ if (this.wsApi) {
58
+ this.wsApi.send(`BBOX ${bbox.join(" ")}`);
59
+ }
60
+ }
61
+ }
62
+ },
63
+ buffer: {
64
+ get: () => buffer,
65
+ set: (newBuffer) => {
66
+ if (JSON.stringify(newBuffer) !== JSON.stringify(buffer)) {
67
+ buffer = newBuffer;
68
+ if (this.wsApi) {
69
+ this.wsApi.send(`BUFFER ${buffer.join(" ")}`);
70
+ }
71
+ }
72
+ }
73
+ },
74
+ wsApi: {
75
+ value: wsApi,
76
+ writable: true
77
+ },
78
+ pingIntervalMs: {
79
+ value: options.pingIntervalMs || 1e4,
80
+ writable: true
81
+ },
82
+ reconnectTimeoutMs: {
83
+ value: options.pingIntervalMs || 100,
84
+ writable: true
85
+ }
86
+ });
87
+ }
88
+ open() {
89
+ this.close();
90
+ this.wsApi.connect(this.url, this.onOpen);
91
+ this.wsApi.websocket.onclose = () => {
92
+ this.onClose();
93
+ };
94
+ }
95
+ close() {
96
+ this.wsApi.close();
97
+ }
98
+ reset() {
99
+ this.wsApi.send("RESET");
100
+ }
101
+ onOpen() {
102
+ if (this.projection) {
103
+ this.wsApi.send(`PROJECTION ${this.projection}`);
104
+ }
105
+ if (this.bbox) {
106
+ this.wsApi.send(`BBOX ${this.bbox.join(" ")}`);
107
+ }
108
+ if (this.buffer) {
109
+ this.wsApi.send(`BUFFER ${this.buffer.join(" ")}`);
110
+ }
111
+ if (this.pingIntervalMs) {
112
+ window.clearInterval(this.pingInterval);
113
+ this.pingInterval = setInterval(() => {
114
+ this.wsApi.send("PING");
115
+ }, this.pingIntervalMs);
116
+ }
117
+ }
118
+ onClose() {
119
+ window.clearTimeout(this.pingInterval);
120
+ window.clearTimeout(this.reconnectTimeout);
121
+ if (this.reconnectTimeoutMs) {
122
+ this.reconnectTimeout = window.setTimeout(() => this.open(), this.reconnectTimeoutMs);
123
+ }
124
+ }
125
+ subscribe(channel, onSuccess, onError, quiet = false) {
126
+ this.wsApi.subscribe({ channel }, onSuccess, onError, quiet);
127
+ }
128
+ unsubscribe(channel, suffix, cb) {
129
+ this.wsApi.unsubscribe(`${channel}${getModeSuffix(TralisModes.SCHEMATIC, TralisModes)}${suffix}`, cb);
130
+ this.wsApi.unsubscribe(`${channel}${getModeSuffix(TralisModes.TOPOGRAPHIC, TralisModes)}${suffix || ""}`, cb);
131
+ }
132
+ filterDepartures(depObject, sortByMinArrivalTime = false) {
133
+ const departures = Object.keys(depObject).map((k) => depObject[k]);
134
+ departures.sort((a, b) => compareDepartures(a, b, sortByMinArrivalTime));
135
+ let future = new Date();
136
+ future.setMinutes(future.getMinutes() + this.maxDepartureAge);
137
+ future = future.getTime();
138
+ let past = new Date();
139
+ past.setMinutes(past.getMinutes() - this.maxDepartureAge);
140
+ past = past.getTime();
141
+ const departureArray = [];
142
+ const platformsBoarding = [];
143
+ let previousDeparture = null;
144
+ for (let i = departures.length - 1; i >= 0; i -= 1) {
145
+ const d = departures[i];
146
+ const t = new Date(d.time).getTime();
147
+ if (t > past && t < future) {
148
+ if (d.state === "BOARDING") {
149
+ if (platformsBoarding.indexOf(d.platform) === -1) {
150
+ platformsBoarding.push(d.platform);
151
+ } else {
152
+ d.state = "HIDDEN";
153
+ }
154
+ }
155
+ if (previousDeparture && d.to[0] === previousDeparture.to[0] && Math.abs(t - previousDeparture.time) < 1e3 && d.line.name === previousDeparture.line.name) {
156
+ d.state = "HIDDEN";
157
+ }
158
+ if (/(STOP_CANCELLED|JOURNEY_CANCELLED)/.test(d.state)) {
159
+ d.cancelled = true;
160
+ }
161
+ previousDeparture = d;
162
+ previousDeparture.time = t;
163
+ departureArray.unshift(d);
164
+ }
165
+ }
166
+ return departureArray;
167
+ }
168
+ subscribeDepartures(stationId, sortByMinArrivalTime, onMessage) {
169
+ window.clearTimeout(this.departureUpdateTimeout);
170
+ this.unsubscribeDepartures();
171
+ this.subscribedStationUic = stationId;
172
+ const channel = stationId ? `timetable_${stationId}` : null;
173
+ const departureObject = {};
174
+ this.subscribe(channel, (data) => {
175
+ if (data.source === channel) {
176
+ const content = data.content || {};
177
+ const tDiff = new Date(content.timestamp).getTime() - Date.now();
178
+ content.timediff = tDiff;
179
+ departureObject[content.call_id] = content;
180
+ window.clearTimeout(this.departureUpdateTimeout);
181
+ this.departureUpdateTimeout = window.setTimeout(() => {
182
+ const departures = this.filterDepartures(departureObject, sortByMinArrivalTime || false);
183
+ onMessage(departures);
184
+ }, 100);
185
+ }
186
+ }, () => {
187
+ onMessage([]);
188
+ });
189
+ }
190
+ unsubscribeDepartures(cb) {
191
+ if (this.subscribedStationUic) {
192
+ this.unsubscribe(`timetable_${this.subscribedStationUic}`, "", cb);
193
+ this.subscribedStationUic = null;
194
+ }
195
+ }
196
+ subscribeDisruptions(onMessage) {
197
+ this.subscribe(`${this.prefix}newsticker`, (data) => {
198
+ onMessage(data.content);
199
+ });
200
+ }
201
+ unsubscribeDisruptions(cb) {
202
+ this.unsubscribe(`${this.prefix}newsticker`, "", cb);
203
+ }
204
+ getStation(uic, mode) {
205
+ const params = {
206
+ channel: `station${getModeSuffix(mode, TralisModes)}`,
207
+ args: uic
208
+ };
209
+ return new Promise((resolve, reject) => {
210
+ this.wsApi.get(params, (data) => {
211
+ if (data.content) {
212
+ resolve(data.content);
213
+ } else {
214
+ reject();
215
+ }
216
+ });
217
+ });
218
+ }
219
+ getStations(mode) {
220
+ const stations = [];
221
+ const params = {
222
+ channel: `station${getModeSuffix(mode, TralisModes)}`
223
+ };
224
+ window.clearTimeout(this.stationUpdateTimeout);
225
+ return new Promise((resolve, reject) => {
226
+ this.wsApi.get(params, (data) => {
227
+ if (data.content) {
228
+ stations.push(data.content);
229
+ window.clearTimeout(this.stationUpdateTimeout);
230
+ this.stationUpdateTimeout = window.setTimeout(() => {
231
+ resolve(stations);
232
+ }, 50);
233
+ } else {
234
+ reject(data.content);
235
+ }
236
+ });
237
+ });
238
+ }
239
+ subscribeStations(mode, onMessage) {
240
+ this.unsubscribeStations();
241
+ this.subscribe(`station${getModeSuffix(mode, TralisModes)}`, (data) => {
242
+ if (data.content) {
243
+ onMessage(data.content);
244
+ }
245
+ });
246
+ }
247
+ unsubscribeStations(cb) {
248
+ window.clearTimeout(this.stationUpdateTimeout);
249
+ this.unsubscribe("station", "", cb);
250
+ }
251
+ subscribeExtraGeoms(onMessage) {
252
+ this.subscribe("extra_geoms", (data) => {
253
+ const extraGeom = data.content;
254
+ if (extraGeom) {
255
+ const { ref } = extraGeom.properties;
256
+ if (extraGeom.type === "Feature") {
257
+ this.extraGeoms[ref] = extraGeom;
258
+ } else {
259
+ delete this.extraGeoms[ref];
260
+ }
261
+ onMessage(Object.keys(this.extraGeoms).map((key) => this.extraGeoms[key]));
262
+ }
263
+ });
264
+ }
265
+ unsubscribeExtraGeoms(cb) {
266
+ this.unsubscribe("extra_geoms", "", cb);
267
+ }
268
+ subscribeTrajectory(mode, onMessage, quiet = false) {
269
+ this.unsubscribeTrajectory(onMessage);
270
+ this.subscribe(`trajectory${getModeSuffix(mode, TralisModes)}`, onMessage, null, quiet);
271
+ }
272
+ unsubscribeTrajectory(cb) {
273
+ this.unsubscribe(`trajectory`, "", cb);
274
+ }
275
+ subscribeDeletedVehicles(mode, onMessage, quiet = false) {
276
+ this.unsubscribeDeletedVehicles(onMessage);
277
+ this.subscribe(`deleted_vehicles${getModeSuffix(mode, TralisModes)}`, onMessage, null, quiet);
278
+ }
279
+ unsubscribeDeletedVehicles(cb) {
280
+ this.unsubscribe("deleted_vehicles", "", cb);
281
+ }
282
+ getFullTrajectory(id, mode, generalizationLevel) {
283
+ const channel = [`full_trajectory${getModeSuffix(mode, TralisModes)}`];
284
+ if (id) {
285
+ channel.push(id);
286
+ }
287
+ if ((!mode || mode === TralisModes.TOPOGRAPHIC) && generalizationLevel) {
288
+ channel.push(`gen${generalizationLevel}`);
289
+ }
290
+ const params = {
291
+ channel: channel.join("_")
292
+ };
293
+ return new Promise((resolve) => {
294
+ this.wsApi.get(params, (data) => {
295
+ if (data.content) {
296
+ resolve(data.content);
297
+ }
298
+ });
299
+ });
300
+ }
301
+ getFullTrajectories(ids, mode, generalizationLevel) {
302
+ const promises = ids.map((id) => this.getFullTrajectory(id, mode, generalizationLevel));
303
+ return Promise.all(promises);
304
+ }
305
+ subscribeFullTrajectory(id, mode) {
306
+ this.unsubscribeFullTrajectory(id);
307
+ this.subscribe(`full_trajectory${getModeSuffix(mode, TralisModes)}_${id}`, (data) => {
308
+ console.log("subscribe full_trajectory", data);
309
+ }, (err) => {
310
+ console.log("subscribe full_trajectory error", err);
311
+ });
312
+ }
313
+ unsubscribeFullTrajectory(id, cb) {
314
+ this.unsubscribe("full_trajectory", `_${id}`, cb);
315
+ }
316
+ getStopSequence(id) {
317
+ const params = {
318
+ channel: `stopsequence_${id}`
319
+ };
320
+ return new Promise((resolve, reject) => {
321
+ this.wsApi.get(params, (data) => {
322
+ if (data.content && data.content.length) {
323
+ const content = data.content.map((stopSequence) => cleanStopTime(stopSequence));
324
+ resolve(content);
325
+ }
326
+ resolve([]);
327
+ }, (err) => {
328
+ reject(err);
329
+ });
330
+ });
331
+ }
332
+ getStopSequences(ids) {
333
+ const promises = ids.map((id) => this.getStopSequence(id));
334
+ return Promise.all(promises);
335
+ }
336
+ subscribeStopSequence(id, onMessage) {
337
+ window.clearTimeout(this.fullTrajectoryUpdateTimeout);
338
+ this.unsubscribeStopSequence(id);
339
+ this.subscribe(`stopsequence_${id}`, (data) => {
340
+ if (data.content && data.content.length) {
341
+ const content = data.content.map((stopSequence) => cleanStopTime(stopSequence));
342
+ onMessage(content);
343
+ }
344
+ }, (err) => {
345
+ console.log("subscribe stopsequence error", err);
346
+ });
347
+ }
348
+ unsubscribeStopSequence(id, cb) {
349
+ this.unsubscribe(`stopsequence`, `_${id}`, cb);
350
+ }
351
+ subscribeHealthCheck(onMessage) {
352
+ this.unsubscribeHealthCheck();
353
+ this.subscribe("healthcheck", onMessage);
354
+ }
355
+ unsubscribeHealthCheck() {
356
+ this.unsubscribe("healthcheck");
357
+ }
358
+ }
359
+ export default TralisAPI;
@@ -0,0 +1,67 @@
1
+ import { TralisAPI, TralisModes } from ".";
2
+ describe("TralisAPI", () => {
3
+ let tralisAPI;
4
+ let get;
5
+ beforeEach(() => {
6
+ get = jest.fn((params, cb) => {
7
+ cb({ content: "content" });
8
+ });
9
+ tralisAPI = new TralisAPI();
10
+ tralisAPI.wsApi = {
11
+ get
12
+ };
13
+ });
14
+ describe("#getFullTrajectory() calls fullTrajectory channel", () => {
15
+ test("without parameters", (done) => {
16
+ tralisAPI.getFullTrajectory().then(() => {
17
+ expect(get.mock.calls.length).toBe(1);
18
+ expect(get.mock.calls[0][0]).toEqual({
19
+ channel: "full_trajectory"
20
+ });
21
+ done();
22
+ });
23
+ });
24
+ [null, TralisModes.TOPOGRAPHIC].forEach((mode) => {
25
+ describe(`using mode ${mode}`, () => {
26
+ test("using id", (done) => {
27
+ tralisAPI.getFullTrajectory("foo", mode).then(() => {
28
+ expect(get.mock.calls.length).toBe(1);
29
+ expect(get.mock.calls[0][0]).toEqual({
30
+ channel: "full_trajectory_foo"
31
+ });
32
+ done();
33
+ });
34
+ });
35
+ test("using id and generalizationLevel param", (done) => {
36
+ tralisAPI.getFullTrajectory("foo", mode, 5).then(() => {
37
+ expect(get.mock.calls.length).toBe(1);
38
+ expect(get.mock.calls[0][0]).toEqual({
39
+ channel: "full_trajectory_foo_gen5"
40
+ });
41
+ done();
42
+ });
43
+ });
44
+ });
45
+ });
46
+ describe("using schematic mode ", () => {
47
+ test("using id", (done) => {
48
+ tralisAPI.getFullTrajectory("foo", TralisModes.SCHEMATIC).then(() => {
49
+ expect(get.mock.calls.length).toBe(1);
50
+ expect(get.mock.calls[0][0]).toEqual({
51
+ channel: "full_trajectory_schematic_foo"
52
+ });
53
+ done();
54
+ });
55
+ });
56
+ test("doesn't use generalizationLevel param", (done) => {
57
+ tralisAPI.getFullTrajectory("foo", TralisModes.SCHEMATIC, 10).then(() => {
58
+ expect(get.mock.calls.length).toBe(1);
59
+ expect(get.mock.calls[0][0]).toEqual({
60
+ channel: "full_trajectory_schematic_foo"
61
+ });
62
+ done();
63
+ });
64
+ });
65
+ });
66
+ });
67
+ });
@@ -1,38 +1,19 @@
1
- /**
2
- * Get the websocket channel suffix, depending on the current mode.
3
- * @param {String} mode Mode 'topographic' ou 'schematic'.
4
- * @private
5
- */
6
- export const getModeSuffix = (mode, modes) =>
7
- mode === modes.SCHEMATIC ? '_schematic' : '';
8
-
9
- /**
10
- * Compare two given departures for sort alogithm,
11
- * @param {Object} a First departure.
12
- * @param {Object} b Second departure.
13
- * @private
14
- */
1
+ export const getModeSuffix = (mode, modes) => mode === modes.SCHEMATIC ? "_schematic" : "";
15
2
  export const compareDepartures = (a, b, sortByMinArrivalTime = false) => {
16
- // First LEAVING and HIDDEN, then BOARDING and then sorted by time.
17
- const topStates = ['HIDDEN', 'LEAVING', 'BOARDING'];
3
+ const topStates = ["HIDDEN", "LEAVING", "BOARDING"];
18
4
  const aTop = a.has_fzo && topStates.indexOf(a.state) > -1;
19
5
  const bTop = b.has_fzo && topStates.indexOf(b.state) > -1;
20
-
21
6
  if (aTop || bTop) {
22
7
  if (aTop !== bTop) {
23
8
  return aTop ? -1 : 1;
24
9
  }
25
-
26
10
  if (a.state !== b.state) {
27
- // one is leaving
28
11
  return topStates.indexOf(a.state) - topStates.indexOf(b.state);
29
12
  }
30
13
  }
31
-
32
14
  let aDuration = null;
33
15
  let bDuration = null;
34
16
  const now = Date.now();
35
-
36
17
  if (sortByMinArrivalTime) {
37
18
  aDuration = new Date(a.min_arrival_time || a.time).getTime() - now;
38
19
  bDuration = new Date(b.min_arrival_time || b.time).getTime() - now;
@@ -40,34 +21,23 @@ export const compareDepartures = (a, b, sortByMinArrivalTime = false) => {
40
21
  aDuration = new Date(a.time).getTime() - now;
41
22
  bDuration = new Date(b.time).getTime() - now;
42
23
  }
43
-
44
24
  return aDuration - bDuration;
45
25
  };
46
-
47
- /**
48
- * Remove the delay from arrivalTime and departureTime
49
- * @private
50
- */
51
26
  export const cleanStopTime = (content) => {
52
27
  if (!content) {
53
28
  return;
54
29
  }
55
30
  content.stations.forEach((station) => {
56
- // eslint-disable-next-line no-param-reassign
57
31
  station.arrivalTimeWithDelay = station.arrivalTime;
58
32
  if (station.departureTime) {
59
- // eslint-disable-next-line no-param-reassign
60
33
  station.departureTimeWithDelay = station.departureTime;
61
34
  }
62
35
  if (station.arrivalDelay) {
63
- // eslint-disable-next-line no-param-reassign
64
36
  station.arrivalTime -= station.arrivalDelay;
65
37
  if (station.departureTime) {
66
- // eslint-disable-next-line no-param-reassign
67
38
  station.departureTime -= station.arrivalDelay;
68
39
  }
69
40
  }
70
41
  });
71
- // eslint-disable-next-line consistent-return
72
42
  return content;
73
43
  };
package/api/index.js ADDED
@@ -0,0 +1,3 @@
1
+ export { default as RoutingAPI } from "./RoutingAPI";
2
+ export { default as StopsAPI } from "./StopsAPI";
3
+ export { default as TralisAPI, TralisModes } from "./TralisAPI";
File without changes
@@ -0,0 +1,93 @@
1
+ import { compose, apply, create } from "ol/transform";
2
+ import getVehiclePosition from "./utils/getVehiclePosition";
3
+ export default class Tracker {
4
+ constructor(options) {
5
+ this.style = options.style;
6
+ this.canvas = options.canvas || document.createElement("canvas");
7
+ }
8
+ renderTrajectories(trajectories, viewState, options) {
9
+ const {
10
+ time = Date.now(),
11
+ size = [],
12
+ center,
13
+ resolution,
14
+ rotation = 0,
15
+ pixelRatio
16
+ } = viewState;
17
+ const {
18
+ noInterpolate = false,
19
+ hoverVehicleId,
20
+ selectedVehicleId
21
+ } = options;
22
+ const { canvas } = this;
23
+ const context = canvas.getContext("2d");
24
+ context.clearRect(0, 0, canvas.width, canvas.height);
25
+ const [width, height] = size;
26
+ if (width && height && (canvas.width !== width || canvas.height !== height)) {
27
+ [canvas.width, canvas.height] = [width * pixelRatio, height * pixelRatio];
28
+ }
29
+ const coordinateToPixelTransform = compose(create(), size[0] / 2, size[1] / 2, 1 / resolution, -1 / resolution, -rotation, -center[0], -center[1]);
30
+ if (canvas.style) {
31
+ canvas.style.width = `${canvas.width / pixelRatio}px`;
32
+ canvas.style.height = `${canvas.height / pixelRatio}px`;
33
+ }
34
+ let hoverVehicleImg;
35
+ let hoverVehiclePx;
36
+ let hoverVehicleWidth;
37
+ let hoverVehicleHeight;
38
+ let selectedVehicleImg;
39
+ let selectedVehiclePx;
40
+ let selectedVehicleWidth;
41
+ let selectedVehicleHeight;
42
+ let nbRendered = 0;
43
+ for (let i = trajectories.length - 1; i >= 0; i -= 1) {
44
+ const trajectory = trajectories[i];
45
+ const { train_id: id, timeOffset } = trajectory.properties;
46
+ const { coord, rotation: rotationIcon } = getVehiclePosition(time - (timeOffset || 0), trajectory, noInterpolate);
47
+ trajectories[i].properties.coordinate = coord;
48
+ trajectories[i].properties.rotation = rotationIcon;
49
+ if (!coord) {
50
+ continue;
51
+ }
52
+ let px = apply(coordinateToPixelTransform, [...coord]);
53
+ if (!px) {
54
+ continue;
55
+ }
56
+ px = px.map((p) => p * pixelRatio);
57
+ if (px[0] < 0 || px[0] > canvas.width || px[1] < 0 || px[1] > canvas.height) {
58
+ continue;
59
+ }
60
+ const vehicleImg = this.style(trajectory, viewState, options);
61
+ if (!vehicleImg) {
62
+ continue;
63
+ }
64
+ nbRendered += 1;
65
+ const imgWidth = vehicleImg.width;
66
+ const imgHeight = vehicleImg.height;
67
+ if (hoverVehicleId !== id && selectedVehicleId !== id) {
68
+ context.drawImage(vehicleImg, px[0] - imgWidth / 2, px[1] - imgHeight / 2, imgWidth, imgHeight);
69
+ }
70
+ if (hoverVehicleId && hoverVehicleId === id) {
71
+ hoverVehicleImg = vehicleImg;
72
+ hoverVehiclePx = px;
73
+ hoverVehicleWidth = imgWidth;
74
+ hoverVehicleHeight = imgHeight;
75
+ }
76
+ if (selectedVehicleId && selectedVehicleId === id) {
77
+ selectedVehicleImg = vehicleImg;
78
+ selectedVehiclePx = px;
79
+ selectedVehicleWidth = imgWidth;
80
+ selectedVehicleHeight = imgHeight;
81
+ }
82
+ }
83
+ if (selectedVehicleImg) {
84
+ context.drawImage(selectedVehicleImg, selectedVehiclePx[0] - selectedVehicleWidth / 2, selectedVehiclePx[1] - selectedVehicleHeight / 2, selectedVehicleWidth, selectedVehicleHeight);
85
+ }
86
+ if (hoverVehicleImg) {
87
+ context.drawImage(hoverVehicleImg, hoverVehiclePx[0] - hoverVehicleWidth / 2, hoverVehiclePx[1] - hoverVehicleHeight / 2, hoverVehicleWidth, hoverVehicleHeight);
88
+ }
89
+ return {
90
+ nbTrajectoriesRendered: nbRendered
91
+ };
92
+ }
93
+ }