Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test loading tracks with tiles #2627

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions libs/api-client/src/utils/thinning.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ export const THINNING_LEVELS: Record<ThinningLevels, ThinningConfig> = {
'min-accuracy-transit': 100,
},
[ThinningLevels.Default]: {
'distance-fishing': 0.5,
'bearing-val-fishing': 1,
'change-speed-fishing': 200,
'min-accuracy-fishing': 30,
'distance-transit': 0.5,
'bearing-val-transit': 1,
'change-speed-transit': 200,
'min-accuracy-transit': 30,
'distance-fishing': 0,
'bearing-val-fishing': 0,
'change-speed-fishing': 0,
'min-accuracy-fishing': 0,
'distance-transit': 0,
'bearing-val-transit': 0,
'change-speed-transit': 0,
'min-accuracy-transit': 0,
},
}
94 changes: 64 additions & 30 deletions libs/deck-layers/src/layers/vessel/VesselLayer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { DataFilterExtension } from '@deck.gl/extensions'
import { ClipExtension, DataFilterExtension } from '@deck.gl/extensions'
import { CompositeLayer, Layer, LayersList, LayerProps, Color, PickingInfo } from '@deck.gl/core'
import { TileLayer, TileLayerProps } from '@deck.gl/geo-layers'
import { load } from '@loaders.gl/core'
import {
ApiEvent,
DataviewCategory,
Expand All @@ -12,6 +14,7 @@ import {
VesselEventsLoader,
VesselTrackLoader,
} from '@globalfishingwatch/deck-loaders'
import { GFWAPI } from '@globalfishingwatch/api-client'
import { deckToHexColor } from '../../utils/colors'
import { getLayerGroupOffset, LayerGroup } from '../../utils'
import { BaseLayerProps } from '../../types'
Expand Down Expand Up @@ -84,7 +87,24 @@ export class VesselLayer extends CompositeLayer<VesselLayerProps & LayerProps> {
warnLogged = true
}
trackUrlObject.searchParams.set('format', 'DECKGL')
return trackUrlObject.toString()
return trackUrlObject
}

_getTrackTileData: TileLayerProps['getTileData'] = async (tile) => {
const tracksURL = new URL(tile.url as string)
tracksURL.searchParams.set('z', tile.index.z.toString())
tracksURL.searchParams.set('x', tile.index.x.toString())
tracksURL.searchParams.set('y', tile.index.y.toString())
tracksURL.searchParams.set('cache', 'false')
const arrayBuffer = await GFWAPI.fetch<Response>(tracksURL.toString(), {
signal: tile.signal,
responseType: 'arrayBuffer',
})

const data = await load(arrayBuffer, VesselTrackLoader, {
worker: false,
})
return data
}

_getVesselTrackLayers() {
Expand All @@ -111,33 +131,47 @@ export class VesselLayer extends CompositeLayer<VesselLayerProps & LayerProps> {
return []
}
const chunkId = `${TRACK_LAYER_TYPE}-${start}-${end}`
return new VesselTrackLayer<any, { type: VesselDataType }>(
this.getSubLayerProps({
id: chunkId,
visible,
data: this._getTracksUrl({ start, end, trackUrl }),
type: TRACK_LAYER_TYPE,
loaders: [VesselTrackLoader],
_pathType: 'open',
widthUnits: 'pixels',
getWidth: 1,
widthScale: 1,
wrapLongitude: true,
jointRounded: true,
capRounded: true,
getColor: color,
startTime,
endTime,
highlightStartTime,
highlightEndTime,
minSpeedFilter,
maxSpeedFilter,
minElevationFilter,
maxElevationFilter,
getPolygonOffset: (params: any) => getLayerGroupOffset(LayerGroup.Track, params),
onError: this.onSublayerError,
})
)
const tracksURL = this._getTracksUrl({ start, end, trackUrl })
return new TileLayer({
id: chunkId,
visible,
tileSize: 512,
data: tracksURL.toString(),
getTileData: this._getTrackTileData,
minZoom: 0,
maxZoom: 12,
opacity: 1,
renderSubLayers: (props: any) => {
const tileBbox = props.tile.bbox as any
const { west, south, east, north } = tileBbox
return new VesselTrackLayer<any, { type: VesselDataType }>(
props,
this.getSubLayerProps({
id: `${props.id}`,
_pathType: 'open',
widthUnits: 'pixels',
getWidth: 1,
widthScale: 1,
wrapLongitude: true,
jointRounded: true,
capRounded: true,
getColor: color,
startTime,
endTime,
highlightStartTime,
highlightEndTime,
minSpeedFilter,
maxSpeedFilter,
minElevationFilter,
maxElevationFilter,
getPolygonOffset: (params: any) => getLayerGroupOffset(LayerGroup.Track, params),
onError: this.onSublayerError,
extensions: [...(props.extensions || []), new ClipExtension()],
clipBounds: [west, south, east, north],
})
)
},
})
})
}

Expand Down Expand Up @@ -251,7 +285,7 @@ export class VesselLayer extends CompositeLayer<VesselLayerProps & LayerProps> {
}

getVesselTrackSegments() {
return this.getTrackLayers()?.flatMap((l) => l.getSegments())
return this.getTrackLayers()?.flatMap((l) => l?.getSegments?.() || [])
}

getVesselEventsLayersLoaded() {
Expand Down
Loading