Skip to content

Commit 072848e

Browse files
committed
fix: update automatically the graph used when lnp layer is present
1 parent d4b9e51 commit 072848e

2 files changed

Lines changed: 25 additions & 12 deletions

File tree

dev.js

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import LineString from 'ol/geom/LineString';
77
import Modify from 'ol/interaction/Modify';
88
import {
99
MaplibreLayer,
10+
MaplibreStyleLayer,
1011
MapsetAPI,
1112
MapsetLayer,
1213
MocoLayer,
@@ -36,29 +37,38 @@ const mapsetLayer = new MapsetLayer({
3637
tenants: ['geopsmarketing'],
3738
});
3839

40+
const lnpLayer = new MaplibreStyleLayer({
41+
isQueryable: true,
42+
// hideInLegend: true,
43+
layersFilter: (l) => {
44+
return l.source === 'network_plans';
45+
},
46+
maplibreLayer: baseLayer,
47+
});
48+
3949
const realtimeLayer = new RealtimeLayer({
4050
apiKey: window.apiKey,
4151
// apiKey: '5cc87b12d7c5370001c1d655112ec5c21e0f441792cfc2fafe3e7a1e', // sbm
4252
// url: 'wss://api.geops.io/tracker-ws/v1/', // prod
4353
// url: 'wss://api.geops.io/realtime-ws/v1/', // sbm
54+
url: 'https://api.geops.io/tracker-http/v1/', // rvf
4455
styleOptions: {
4556
// useHeadingStyle: true,
4657
// useDelayStyle: true,
4758
},
4859
// style: realtimeByMotStyle,
4960
// tenant: 'sbm',
50-
// tenant: 'trenord',
51-
// bboxParameters: {
52-
// line_tags: 'RVF',
53-
// },
54-
visible: false,
61+
bboxParameters: {
62+
line_tags: 'RVF',
63+
},
64+
visible: true,
5565
});
5666

5767
const mocoLayer = new MocoLayer({
5868
apiKey: window.apiKey,
5969
tenant: 'rvf',
6070
maplibreLayer: baseLayer,
61-
lnpLayer: realtimeLayer,
71+
lnpLayer: lnpLayer,
6272
loadByZoom: true,
6373
// publicAt: new Date(),
6474
// url: mocoUrl,
@@ -67,9 +77,10 @@ const mocoLayer = new MocoLayer({
6777
const map = new Map({
6878
layers: [
6979
baseLayer,
70-
realtimeLayer,
80+
lnpLayer,
7181
mocoLayer,
7282
// mapsetLayer,
83+
realtimeLayer,
7384
],
7485
target: 'map',
7586
view: new View({
@@ -118,12 +129,12 @@ const toggleLayerVisibilityButton = document?.getElementById(
118129
'toggle-visiblity-button',
119130
);
120131
toggleLayerVisibilityButton.addEventListener('click', () => {
121-
if (realtimeLayer.getVisible()) {
122-
realtimeLayer.setVisible(false);
123-
toggleLayerVisibilityButton.textContent = 'Show Realtime Layer';
132+
if (lnpLayer.getVisible()) {
133+
lnpLayer.setVisible(false);
134+
toggleLayerVisibilityButton.textContent = 'Show LNP Layer';
124135
} else {
125-
realtimeLayer.setVisible(true);
126-
toggleLayerVisibilityButton.textContent = 'Hide Realtime Layer';
136+
lnpLayer.setVisible(true);
137+
toggleLayerVisibilityButton.textContent = 'Hide LNP Layer';
127138
}
128139
});
129140
// const urlInput = document?.getElementById('url-input');

src/ol/layers/RealtimeLayer.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import { fullTrajectoryStyle } from '../styles';
2323
import defineDeprecatedProperties from '../utils/defineDeprecatedProperties';
2424
import getGraphByZoomFromStyleMetadata from '../utils/getGraphByZoomFromStyleMetadata';
2525

26+
import { deprecated } from './MaplibreLayer';
27+
2628
import type { DebouncedFunc } from 'lodash';
2729
import type { Map, MapEvent } from 'ol';
2830
import type { EventsKey } from 'ol/events';

0 commit comments

Comments
 (0)