raul
/
aemet
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Main project #1

Merged
raul merged 33 commits from testing into main 2024-06-14 07:49:34 +02:00
Conversation 0 Commits 33 Files Changed 14 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6468294478 - Show all commits

12
cmd/serverFunc.go
View File

@ -48,18 +48,18 @@ func returnProvince(c *gin.Context) {
// TODO: Return prettified HTML representation of the weather based on url parameter // TODO: Return prettified HTML representation of the weather based on url parameter
} }
func pullWeatherInfo(codPostal string) (root, error) { func pullWeatherInfo(codPostal string) (root, string, error) {
jsonData, err := getJSON(localidades[codPostal]) jsonData, err := getJSON(localidades[codPostal])
if err != nil { if err != nil {
return root{}, err return root{}, jsonData, err
} }
textBytes := []byte(jsonData) textBytes := []byte(jsonData)
aemetRequest := root{} aemetRequest := root{}
err = json.Unmarshal(textBytes, &aemetRequest) err = json.Unmarshal(textBytes, &aemetRequest)
if err != nil { if err != nil {
return root{}, err return root{}, jsonData, err
} }
return aemetRequest, nil return aemetRequest, jsonData, nil
} }
func localityIsAvailable(codPostal string) bool { func localityIsAvailable(codPostal string) bool {
@ -87,10 +87,11 @@ func returnAPIWeather(c *gin.Context) {
return return
} }
aemetRequest, err := pullWeatherInfo(codPostal) aemetRequest, _, err := pullWeatherInfo(codPostal)
if err != nil { if err != nil {
e := fmt.Sprint(err) e := fmt.Sprint(err)
c.String(http.StatusInternalServerError, e) c.String(http.StatusInternalServerError, e)
//c.String(500, jsonData)
return return
} }
@ -108,5 +109,4 @@ func returnAPIWeather(c *gin.Context) {
c.IndentedJSON(http.StatusOK, aemetRequest) c.IndentedJSON(http.StatusOK, aemetRequest)
} }
//c.JSON(http.StatusOK, aemetRequest) //c.JSON(http.StatusOK, aemetRequest)
//c.String(http.StatusOK, jsonData)
} }