diff --git a/components/control_center/src/app/component/landing/landing.component.html b/components/control_center/src/app/component/landing/landing.component.html index 0d3266e..b82b0b2 100644 --- a/components/control_center/src/app/component/landing/landing.component.html +++ b/components/control_center/src/app/component/landing/landing.component.html @@ -1,4 +1,5 @@ + @@ -13,14 +14,16 @@

NCE: {{m.value.carEvent.near_crash_event}}

 - + + -

Id: {{m.value.id}}

-

Switching Time: {{m.value.switchingTime}}

-

Range: {{m.value.range}}

-

Color: {{m.value.color}}

-

Last Switch: {{m.value.last_switch}}

+

Id: {{m.value.trafficLightEntity.id}}

+

Switching Time: {{m.value.trafficLightEntity.switchingTime}}

+

Range: {{m.value.trafficLightEntity.range}}

+

Color: {{m.value.trafficLightEvent.color}}

+

Last Switch: {{m.value.trafficLightEvent.last_switch}}

 + diff --git a/components/control_center/src/app/component/landing/landing.component.ts b/components/control_center/src/app/component/landing/landing.component.ts index cd17973..b54abce 100644 --- a/components/control_center/src/app/component/landing/landing.component.ts +++ b/components/control_center/src/app/component/landing/landing.component.ts @@ -4,7 +4,13 @@ import {RestService} from '../../services/rest.service'; import {NGXLogger} from 'ngx-logger'; import {interval, Subscription} from 'rxjs'; import {startWith, switchMap} from 'rxjs/operators'; -import {Car, CarEntity, CarEvent, GeoCoordinates} from '../../interfaces/interface'; +import { + Car, + CarEntity, + CarEvent, + GeoCoordinates, TrafficLight, + TrafficLightEntity, TrafficLightEvent +} from '../../interfaces/interface'; @Component({ selector: 'app-landing', @@ -70,13 +76,10 @@ export class LandingComponent implements OnInit { switchMap(() => this.restService.getTrafficLightEvents(tlid)) ).subscribe( (data: any) => { - const traffic_light_event = data.body['cursor']; - const traffic_light = this.traffic_light_markers.get(traffic_light_event['tlid']); - traffic_light['color'] = traffic_light_event['color']; - traffic_light['last_switch'] = traffic_light_event['last_switch']; - traffic_light['iconUrl'] = this.trafficLightToImage(traffic_light['color']); - - this.traffic_light_markers.set(traffic_light_event['tlid'], traffic_light); + const trafficLightEvent = data.body as TrafficLightEvent; + const trafficLight = this.traffic_light_markers.get(tlid) as TrafficLight; + trafficLight.trafficLightEvent = trafficLightEvent; + this.traffic_light_markers.set(tlid, trafficLight); }, err => this.logger.error(err), () => { @@ -87,19 +90,21 @@ export class LandingComponent implements OnInit { getTrafficLights() { this.restService.getTrafficLights().subscribe( - (data: any) => { - for (const traffic_light of data['cursor']) { - traffic_light['iconUrl'] = this.trafficLightToImage(traffic_light['color']); - traffic_light['lat'] = traffic_light['location'][1]; - traffic_light['lng'] = traffic_light['location'][0]; - this.traffic_light_markers.set(traffic_light['id'], traffic_light); + (data: TrafficLightEntity[]) => { + for (const trafficLightEntity of data) { + + const trafficLight: TrafficLight = { + trafficLightEntity: trafficLightEntity, + trafficLightEvent: this.getEmptyTrafficLightEvent() + }; + this.traffic_light_markers.set(trafficLightEntity['id'], trafficLight); } }, err => this.logger.error(err), () => { this.logger.debug('loaded traffic lights'); for (const value of this.traffic_light_markers.values()) { - this.getTrafficLightEvents(value['id']); + this.getTrafficLightEvents(value.trafficLightEntity['id']); } } ); @@ -109,12 +114,10 @@ export class LandingComponent implements OnInit { this.restService.getCars().subscribe( (data: CarEntity[]) => { for (const carEntity of data) { - const car: Car = { carEntity: carEntity, carEvent: this.getEmptyCarEvent() }; - car.carEntity = carEntity; this.car_markers.set(carEntity['vin'], car); } }, @@ -129,7 +132,7 @@ export class LandingComponent implements OnInit { } - private trafficLightToImage(trafficLight) { + trafficLightToImage(trafficLight) { return (trafficLight === 'RED') ? this.TL_RED_IMAGE : this.TL_GREEN_IMAGE; } @@ -161,18 +164,26 @@ export class LandingComponent implements OnInit { audio.play(); } - private getEmptyCarEvent() { - const geoCoordinates = { + private getEmptyGeoCoordinates(): GeoCoordinates { + return { latitude: 0, longitude: 0 }; + } - const carEvent = { + private getEmptyCarEvent(): CarEvent { + return { near_crash_event: false, - gps_location: geoCoordinates, + gps_location: this.getEmptyGeoCoordinates(), timestamp: '' }; + } - return carEvent; + private getEmptyTrafficLightEvent(): TrafficLightEvent { + return { + last_switch: 0, + color: '', + tlid: 0 + }; } } diff --git a/components/control_center/src/app/interfaces/interface.ts b/components/control_center/src/app/interfaces/interface.ts index ffc761d..c401a56 100644 --- a/components/control_center/src/app/interfaces/interface.ts +++ b/components/control_center/src/app/interfaces/interface.ts @@ -27,3 +27,22 @@ export interface Car { carEntity: CarEntity; carEvent: CarEvent; } + +export interface TrafficLightEntity { + id: Number; + location: Number[]; + range: Number; + switchingTime: Number; + color: String; +} + +export interface TrafficLightEvent { + last_switch: Number; + color: String; + tlid: Number; +} + +export interface TrafficLight { + trafficLightEntity: TrafficLightEntity; + trafficLightEvent: TrafficLightEvent; +} diff --git a/components/x_way/x_way_server.py b/components/x_way/x_way_server.py index 847bf79..8a9bee1 100644 --- a/components/x_way/x_way_server.py +++ b/components/x_way/x_way_server.py @@ -39,7 +39,7 @@ def get_traffic_light_events(): print("Is the EVENT_STORE_URL running and reachable?") raise e - return json_util.dumps({'cursor': traffic_lights}) + return json_util.dumps(traffic_lights) @app.route('/api/v1/resources/cars', methods=['GET']) @@ -65,7 +65,7 @@ def get_traffic_lights(): print("Is the entity_ident_server running and reachable?") raise e - return json_util.dumps({'cursor': traffic_lights}) + return json_util.dumps(traffic_lights) if __name__ == '__main__':