fix: slight refactor to handle data processing better

Author: NickAnderegg

index.js

@@ -32,22 +32,7 @@ api.get('/', (req, res) => {
         // If the geolocation is successful, format the name of the returned location,
         // then call the weather API with the coordinates and timezone.
 
-        if ("regionName" in coords && "city" in coords && "country" in coords) {
-            renderValues.locationName = `${coords.city}, ${coords.regionName}, ${coords.country}`
-        } else if ("country" in coords) {
-            if ("city" in coords) {
-                renderValues.locationName = `${coords.city}, ${coords.country}`
-            } else if ("regionName" in coords) {
-                renderValues.locationName = `${coords.regionName}, ${coords.country}`
-            } else {
-                renderValues.locationName = coords.country
-            }
-        } else if ("city" in coords) {
-            renderValues.locationName = coords.city
-        } else {
-            renderValues.locationName = coords.regionName
-        }
-
+        renderValues.locationName = coords.locationName
         return weather(coords.lat, coords.lon, coords.timezone)
     }).catch(() => {
         // If the geolocation fails, default to Toronto, Ontario, Canada, then call
@@ -92,11 +77,9 @@ api.get('/geolocate', (req, res) => {
     // will send a request to `/geolocate` to get the estimated coordinates
     // of the client's IP address. This will then return the coordinates to the
     // client, which will use them to call the weather API as it normally would.
-    geolocateFromIP(req.ip).then((coords) => {
-        res.json(coords)
-    }).catch((e) => {
-        res.json({status: 'error', code: 500, message: e.message})
-    })
+    geolocateFromIP(req.ip)
+        .then(coords => res.json(coords))
+        .catch(e => res.json({status: 'error', code: 500, message: e.message}))
 })
 
 api.get('/weather', (req, res) => {

src/geoipAPI.js

@@ -61,6 +61,25 @@ function apiRequest(url) {
                     coordsResponse = JSON.parse(responseData)
                     // console.log("coordsResponse: ", coordsResponse)
 
+                    let locationName = ''
+                    if ("regionName" in coordsResponse && "city" in coordsResponse && "country" in coordsResponse) {
+                        locationName = `${coordsResponse.city}, ${coordsResponse.regionName}, ${coordsResponse.country}`
+                    } else if ("country" in coordsResponse) {
+                        if ("city" in coordsResponse) {
+                            locationName = `${coordsResponse.city}, ${coordsResponse.country}`
+                        } else if ("regionName" in coordsResponse) {
+                            locationName = `${coordsResponse.regionName}, ${coordsResponse.country}`
+                        } else {
+                            locationName = coordsResponse.country
+                        }
+                    } else if ("city" in coordsResponse) {
+                        locationName = coordsResponse.city
+                    } else {
+                        locationName = coordsResponse.regionName
+                    }
+
+                    coordsResponse.locationName = locationName
+
                     // Because this sample app is used in live demos, we want to
                     // anonymize the coordinates returned to the client side.
                     if ("lat" in coordsResponse && "lon" in coordsResponse) {