-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19 from reedu-reengineering-education/feat/data-p…
…rocessing feat: optimize data processing
- Loading branch information
Showing
15 changed files
with
482 additions
and
303 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| 'use client' | ||
|
|
||
| import { animated, useSpring } from '@react-spring/web' | ||
|
|
||
| type AnimatedNumberProps = React.HTMLAttributes<HTMLSpanElement> & { | ||
| children: number | ||
| decimals?: number | ||
| } | ||
|
|
||
| export default function AnimatedNumber({ | ||
| children, | ||
| decimals, | ||
| ...props | ||
| }: AnimatedNumberProps) { | ||
| const springProps = useSpring({ val: children, from: { val: 0 } }) | ||
|
|
||
| return ( | ||
| <animated.span {...props}> | ||
| {springProps.val.to(val => | ||
| new Intl.NumberFormat('de-DE', { | ||
| maximumFractionDigits: decimals || 0, | ||
| }).format(val), | ||
| )} | ||
| </animated.span> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| import { registerPlugin } from '@capacitor/core' | ||
| import { | ||
| senseBoxDataRecord, | ||
| useSenseBoxValuesStore, | ||
| } from './store/useSenseBoxValuesStore' | ||
| import { BackgroundGeolocationPlugin } from '@felixerdy/background-geolocation' | ||
|
|
||
| const BackgroundGeolocation = registerPlugin<BackgroundGeolocationPlugin>( | ||
| 'BackgroundGeolocation', | ||
| ) | ||
|
|
||
| export class SenseBoxDataParser { | ||
| private static instance: SenseBoxDataParser | ||
|
|
||
| private dataBuffer: senseBoxDataRecord[] = [] | ||
| private timestampInterval: number | ||
|
|
||
| constructor(interval: number) { | ||
| this.timestampInterval = interval | ||
| } | ||
|
|
||
| // Singleton | ||
| static getInstance(interval: number) { | ||
| if (!SenseBoxDataParser.instance) { | ||
| SenseBoxDataParser.instance = new SenseBoxDataParser(interval) | ||
| } | ||
|
|
||
| const instance = SenseBoxDataParser.instance | ||
| instance.setTimestampInterval(interval) | ||
| return instance | ||
| } | ||
|
|
||
| getTimestampInterval() { | ||
| return this.timestampInterval | ||
| } | ||
|
|
||
| setTimestampInterval(interval: number) { | ||
| this.timestampInterval = interval | ||
| } | ||
|
|
||
| async checkCompleteData() { | ||
| if (this.dataBuffer.length < 5) return | ||
|
|
||
| // merge the data by timestamp | ||
| const buckets = this.dataBuffer | ||
| .reduce((acc, record) => { | ||
| const { timestamp, ...data } = record | ||
|
|
||
| // check if there is already a record with similar timestamp | ||
| const existingTimestamp = acc.find( | ||
| e => | ||
| Math.abs(new Date(e.timestamp).getTime() - timestamp.getTime()) < | ||
| this.timestampInterval, | ||
| ) // 5 seconds | ||
|
|
||
| // add new record or update existing one | ||
| if (!existingTimestamp) { | ||
| acc.push({ timestamp, ...data }) | ||
| } else { | ||
| const existingIndex = acc.indexOf(existingTimestamp) | ||
| acc[existingIndex] = { | ||
| ...existingTimestamp, | ||
| ...data, | ||
| } | ||
| } | ||
|
|
||
| return acc | ||
| }, [] as senseBoxDataRecord[]) | ||
| .filter( | ||
| b => | ||
| b.temperature !== undefined && | ||
| b.humidity !== undefined && | ||
| b.pm1 !== undefined && | ||
| b.pm2_5 !== undefined && | ||
| b.pm4 !== undefined && | ||
| b.pm10 !== undefined && | ||
| b.acceleration_x !== undefined && | ||
| b.acceleration_y !== undefined && | ||
| b.acceleration_z !== undefined && | ||
| b.gps_lat !== undefined && | ||
| b.gps_lng !== undefined && | ||
| b.gps_spd !== undefined && | ||
| b.distance_l !== undefined, | ||
| ) | ||
|
|
||
| const bucketsProcessedLocation = await Promise.all( | ||
| buckets.map(async b => { | ||
| const processedLocation = await BackgroundGeolocation.processLocation({ | ||
| location: { | ||
| latitude: b.gps_lat!, | ||
| longitude: b.gps_lng!, | ||
| speed: b.gps_spd!, | ||
| accuracy: 0, | ||
| simulated: false, | ||
| altitude: null, | ||
| bearing: null, | ||
| altitudeAccuracy: null, | ||
| time: b.timestamp.getTime(), | ||
| }, | ||
| }) | ||
| return { | ||
| ...b, | ||
| gps_lat: processedLocation.latitude, | ||
| gps_lng: processedLocation.longitude, | ||
| gps_spd: processedLocation.speed, | ||
| } as senseBoxDataRecord | ||
| }), | ||
| ) | ||
|
|
||
| useSenseBoxValuesStore.getState().addValues(bucketsProcessedLocation) | ||
|
|
||
| const completeTimestamps = buckets.map(b => b.timestamp) | ||
|
|
||
| // remove all data that is already complete | ||
| this.dataBuffer = this.dataBuffer.filter( | ||
| d => | ||
| !completeTimestamps.some( | ||
| t => | ||
| Math.abs(t.getTime() - d.timestamp.getTime()) < | ||
| this.timestampInterval, | ||
| ), | ||
| ) | ||
|
|
||
| console.log(this.dataBuffer.length) | ||
| } | ||
|
|
||
| pushData(data: Omit<senseBoxDataRecord, 'timestamp'>) { | ||
| this.dataBuffer.push({ | ||
| ...data, | ||
| timestamp: new Date(), | ||
| }) | ||
|
|
||
| this.checkCompleteData() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.