fixed getTweetByDate

Author: Yicong-Huang

frontend/src/app/map/layers/FireTweetLayer.ts

@@ -26,7 +26,7 @@ export class FireTweetLayer {
 
     constructor(private mainControl, private mapService: MapService, private map, private timeService: TimeService) {
         // This is the overlay controller defined in constructor
-        //rewrite
+        // rewrite
         this.mapService.getFireTweetData().subscribe(this.tweetDataHandler);
 
         this.map.on('overlayadd', (event) => {
@@ -170,7 +170,7 @@ export class FireTweetLayer {
 
         this.tweetData.forEach(tweet => {
                 tempData.push([tweet.lat, tweet.long]);
-        }
+            }
         );
 
         this.tweetLayer.setData(tempData);
@@ -187,12 +187,17 @@ export class FireTweetLayer {
          */
         this.tempDataWithID = [];
         const [startDateInMs, endDateInMs] = this.timeService.getRangeDate();
-        this.timeService.getTweetByDate(startDateInMs, endDateInMs).subscribe((data) => {
-                console.log(data);
-                this.tweetLayer.setData(data);
-            });
-        //console.log(startDateInMs);
-        //console.log(this.timeService.getTweetByDate(startDateInMs, endDateInMs));
+        this.timeService.getTweetByDate(startDateInMs, endDateInMs).subscribe(tweets => {
+                const tempData = [];
+                tweets.forEach(tweet => {
+                        tempData.push([tweet.lat, tweet.long]);
+                    }
+                );
+                this.tweetLayer.setData(tempData);
+            }
+        );
+        // console.log(startDateInMs);
+        // console.log(this.timeService.getTweetByDate(startDateInMs, endDateInMs));
 
         // this.tweetData.forEach(tweet => {
         //     const time = new Date(tweet.create_at).getTime();
@@ -201,8 +206,8 @@ export class FireTweetLayer {
         //         this.tempDataWithID.push([tweet.lat, tweet.long, tweet.id]);
         //     }
         // });
-        //console.log(tempData);
-        //this.tweetLayer.setData(tempData); //draw on twittermap
+        // console.log(tempData);
+        // this.tweetLayer.setData(tempData); //draw on twittermap
     }
 
     idOverPoint(x, y) {

frontend/src/app/map/layers/fire.tweet.layer.ts

@@ -12,6 +12,7 @@ import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 import {environment} from '../../../environments/environment';
 import {HttpClient, HttpParams} from '@angular/common/http';
+import {Tweet} from "../../models/tweet.model";
 
 // import {Observable, Subject, BehaviorSubject} from 'rxjs';
 // import {HttpClient, HttpParams} from '@angular/common/http';
@@ -52,9 +53,9 @@ export class TimeService {
         return [this.rangeStartDateInMS, this.rangeEndDateInMS];
     }
 
-    getTweetByDate(startDate, endDate): Observable<object> {
-        return this.http.get<object>(`http://${environment.host}:${environment.port}/tweet/tweet-by-date`,
-            {params: new HttpParams().set('start-date', startDate ).set('end-date', endDate)});
+    getTweetByDate(startDate, endDate): Observable<Tweet[]> {
+        return this.http.get<Tweet[]>(`http://${environment.host}:${environment.port}/tweet/tweet-by-date`,
+            {params: new HttpParams().set('start-date', startDate).set('end-date', endDate)});
     }
 }