Use coordinates instead of geo

akiomik · Aug 9, 2022 · b508baf · b508baf
1 parent ab680f2
commit b508baf
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ get-old-tweets --from 'barackobama' --top
 - `favorite_count` (int)
 - `reply_count` (int)
 - `quote_count` (int)
-- `geo` (str)
+- `coordinates` (str)
 - `lang` (str)
 - `source` (str)
 

diff --git a/export/csv.go b/export/csv.go
@@ -28,17 +28,17 @@ func ExportCsv(f *os.File, ch <-chan []Record) <-chan struct{} {
 		defer close(done)
 
 		w := csv.NewWriter(f)
-		err := w.Write([]string{"id", "username", "created_at", "full_text", "retweet_count", "favorite_count", "reply_count", "quote_count", "geo", "lang", "source"})
+		err := w.Write([]string{"id", "username", "created_at", "full_text", "retweet_count", "favorite_count", "reply_count", "quote_count", "coordinates", "lang", "source"})
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 			panic(err)
 		}
 
 		for records := range ch {
 			for _, record := range records {
-				geo := ""
-				if record.Geo != nil {
-					geo = record.Geo.String()
+				coordinates := ""
+				if record.Coordinates != nil {
+					coordinates = record.Coordinates.String()
 				}
 
 				row := []string{
@@ -50,7 +50,7 @@ func ExportCsv(f *os.File, ch <-chan []Record) <-chan struct{} {
 					strconv.FormatUint(record.FavoriteCount, 10),
 					strconv.FormatUint(record.ReplyCount, 10),
 					strconv.FormatUint(record.QuoteCount, 10),
-					geo,
+					coordinates,
 					record.Lang,
 					record.Source,
 				}

diff --git a/export/csv_test.go b/export/csv_test.go
@@ -84,7 +84,7 @@ func TestExportCsvNonEmpty(t *testing.T) {
 				FavoriteCount: 400,
 				ReplyCount:    500,
 				QuoteCount:    600,
-				Geo:           &json.LatLong{40.74118764, -73.9998279},
+				Coordinates:   &json.LongLat{-73.9998279, 40.74118764},
 				Lang:          "en",
 			},
 		}
@@ -126,15 +126,15 @@ func TestExportCsvNonEmpty(t *testing.T) {
 		return
 	}
 
-	expectedHeader := []string{"id", "username", "created_at", "full_text", "retweet_count", "favorite_count", "reply_count", "quote_count", "geo", "lang", "source"}
+	expectedHeader := []string{"id", "username", "created_at", "full_text", "retweet_count", "favorite_count", "reply_count", "quote_count", "coordinates", "lang", "source"}
 	if !reflect.DeepEqual(actualHeader, expectedHeader) {
 		t.Errorf("Expect to write %v as a header, got %v", expectedHeader, actualHeader)
 		return
 	}
 
 	expectedRecords := [][]string{
 		[]string{"1000", "watson1", "2020-09-06T00:01:02+00:00", "To Sherlock Holmes she is always the woman.", "3000", "4000", "5000", "6000", "", "en", ""},
-		[]string{"100", "watson2", "2020-09-06T00:01:02+00:00", "To Sherlock Holmes she is always the woman.", "300", "400", "500", "600", "40.74118764,-73.9998279", "en", ""},
+		[]string{"100", "watson2", "2020-09-06T00:01:02+00:00", "To Sherlock Holmes she is always the woman.", "300", "400", "500", "600", "-73.9998279,40.74118764", "en", ""},
 		[]string{"10", "watson3", "2020-09-06T00:01:02+00:00", "To Sherlock Holmes she is always the woman.", "30", "40", "50", "60", "", "en", ""},
 		[]string{"1", "watson4", "2020-09-06T00:01:02+00:00", "To Sherlock Holmes she is always the woman.", "3", "4", "5", "6", "", "en", ""},
 	}

diff --git a/export/record.go b/export/record.go
@@ -32,7 +32,7 @@ type Record struct {
 	FavoriteCount uint64
 	ReplyCount    uint64
 	QuoteCount    uint64
-	Geo           *json.LatLong
+	Coordinates   *json.LongLat
 	Lang          string
 	Source        string
 }
@@ -63,9 +63,9 @@ func NewRecordsFromAdaptive(j *json.Adaptive) []Record {
 		t := j.GlobalObjects.Tweets[id]
 		u := j.GlobalObjects.Users[strconv.FormatUint(t.UserId, 10)]
 
-		var geo *json.LatLong
-		if t.Geo != nil {
-			geo = &t.Geo.Coordinates
+		var coordinates *json.LongLat
+		if t.Coordinates != nil {
+			coordinates = &t.Coordinates.Coordinates
 		}
 
 		return Record{
@@ -77,7 +77,7 @@ func NewRecordsFromAdaptive(j *json.Adaptive) []Record {
 			FavoriteCount: t.FavoriteCount,
 			ReplyCount:    t.ReplyCount,
 			QuoteCount:    t.QuoteCount,
-			Geo:           geo,
+			Coordinates:   coordinates,
 			Lang:          t.Lang,
 			Source:        t.Source,
 		}

diff --git a/export/record_test.go b/export/record_test.go
@@ -147,9 +147,9 @@ func TestNewRecordsFromAdaptive(t *testing.T) {
 					FavoriteCount: 400,
 					ReplyCount:    500,
 					QuoteCount:    600,
-					Geo: &json.Geo{
+					Coordinates: &json.Coordinates{
 						Type:        "Point",
-						Coordinates: [2]float64{40.74118764, -73.9998279},
+						Coordinates: json.LongLat{-73.9998279, 40.74118764},
 					},
 					Lang: "en",
 				},
@@ -217,7 +217,7 @@ func TestNewRecordsFromAdaptive(t *testing.T) {
 			FavoriteCount: 4000,
 			ReplyCount:    5000,
 			QuoteCount:    6000,
-			Geo:           nil,
+			Coordinates:   nil,
 			Lang:          "en",
 		},
 		Record{
@@ -229,7 +229,7 @@ func TestNewRecordsFromAdaptive(t *testing.T) {
 			FavoriteCount: 400,
 			ReplyCount:    500,
 			QuoteCount:    600,
-			Geo:           &json.LatLong{40.74118764, -73.9998279},
+			Coordinates:   &json.LongLat{-73.9998279, 40.74118764},
 			Lang:          "en",
 		},
 	}

diff --git a/twitter/json/tweet.go b/twitter/json/tweet.go
@@ -14,6 +14,8 @@
 
 package json
 
+// https://developer.twitter.com/en/docs/twitter-api/v1/data-dictionary/object-model/tweet
+
 type Tweet struct {
 	Id            uint64       `json:"id"`
 	UserId        uint64       `json:"user_id"`
@@ -22,7 +24,7 @@ type Tweet struct {
 	FavoriteCount uint64       `json:"favorite_count"`
 	ReplyCount    uint64       `json:"reply_count"`
 	QuoteCount    uint64       `json:"quote_count"`
-	Geo           *Geo         `json:"geo"`
+	Geo           *Geo         `json:"geo"` // deprecated
 	Coordinates   *Coordinates `json:"coordinates"`
 	Place         *Place       `json:"place"`
 	Lang          string       `json:"lang"`