a/OpenWeather-gRPC-API
1
0
Fork 0
mirror of https://codeberg.org/andyscott/OpenWeather-gRPC-API.git synced 2024-12-21 12:13:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Refactor/better handling of unspecified location type

Browse source
This commit is contained in:
Andrew Scott 2022-09-02 22:52:53 -04:00
parent 1eb36697f0
commit 18666014b6
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
server/location.go
View file

@ -7,6 +7,7 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
"strconv"
pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto" pb "codeberg.org/andcscott/OpenWeather-gRPC-API/proto"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
@ -18,7 +19,7 @@ type Coordinates struct {
Longitude float32 `json:"lon"` Longitude float32 `json:"lon"`
} }
// Receives a gRPC request for Location // Receives a RequestLocation message
// Returns a SendLocation message with the Latitude and Longitude // Returns a SendLocation message with the Latitude and Longitude
func (s *Server) Location(ctx context.Context, in *pb.RequestLocation) (*pb.SendLocation, error) { func (s *Server) Location(ctx context.Context, in *pb.RequestLocation) (*pb.SendLocation, error) {
log.Printf("'Location' called, location: %v\n", in.Location) log.Printf("'Location' called, location: %v\n", in.Location)
@ -28,11 +29,16 @@ func (s *Server) Location(ctx context.Context, in *pb.RequestLocation) (*pb.Send
switch in.LocationType { switch in.LocationType {
case pb.LocationType_LOCATION_TYPE_CITY: case pb.LocationType_LOCATION_TYPE_CITY:
lat, lon, err = getLocation(in.Location.GetCity(), s.ApiKey) lat, lon, err = fetchCityCoords(in.Location.GetCity(), s.ApiKey)
case pb.LocationType_LOCATION_TYPE_ZIP_CODE: case pb.LocationType_LOCATION_TYPE_ZIP_CODE:
lat, lon, err = getZipLocation(in.Location.GetZipCode(), s.ApiKey) lat, lon, err = fetchZipCoords(in.Location.GetZipCode(), s.ApiKey)
default: default:
lat, lon, err = getLocation(in.Location.String(), s.ApiKey) _, err = strconv.Atoi(in.Location.GetZipCode())
if err != nil {
lat, lon, err = fetchCityCoords(in.Location.GetCity(), s.ApiKey)
} else {
lat, lon, err = fetchZipCoords(in.Location.GetZipCode(), s.ApiKey)
}
} }
if err != nil { if err != nil {
return nil, status.Errorf( return nil, status.Errorf(
@ -42,7 +48,6 @@ func (s *Server) Location(ctx context.Context, in *pb.RequestLocation) (*pb.Send
in.LocationType.String()), in.LocationType.String()),
) )
} }
return &pb.SendLocation{ return &pb.SendLocation{
Latitude: lat, Latitude: lat,
Longitude: lon, Longitude: lon,
@ -50,15 +55,14 @@ func (s *Server) Location(ctx context.Context, in *pb.RequestLocation) (*pb.Send
} }
// Used internally to fetch precise locations // Used internally to fetch precise locations
// Receives the city name and the server's API key // Receives a city and the OpenWeather API key
// Returns the latitude and longitude for the given location // Returns the latitude and longitude for the given location, otherwise an error
func getLocation(location string, key string) (float32, float32, error) { func fetchCityCoords(city string, key string) (float32, float32, error) {
log.Printf("'getLocation' called, location: %v\n", location) log.Printf("'fetchCityCoords' called, location: %v\n", city)
url := "http://api.openweathermap.org/geo/1.0/direct?q=" url := "http://api.openweathermap.org/geo/1.0/direct?q="
token := "&appid=" + key token := "&appid=" + key
url += city + token
url = url + location + token
res, err := http.Get(url) res, err := http.Get(url)
if err != nil { if err != nil {
@ -84,13 +88,15 @@ func getLocation(location string, key string) (float32, float32, error) {
return coords[0].Latitude, coords[0].Longitude, nil return coords[0].Latitude, coords[0].Longitude, nil
} }
func getZipLocation(zip string, key string) (float32, float32, error) { // Used internally to fetch precise locations
log.Printf("'getZipLocation' called, zip code: %v\n", zip) // Receives a zip code and the OpenWeather API key
// Returns the latitude and longitude for the given location, otherwise an error
func fetchZipCoords(zip string, key string) (float32, float32, error) {
log.Printf("'fetchZipCoords' called, zip code: %v\n", zip)
url := "https://api.openweathermap.org/geo/1.0/zip?zip=" url := "https://api.openweathermap.org/geo/1.0/zip?zip="
token := "&appid=" + key token := "&appid=" + key
url += zip + token
url = url + zip + token
res, err := http.Get(url) res, err := http.Get(url)
if err != nil { if err != nil {