Merge pull request #140 from leahgibson/mesowest-points-from-geometry-bug

Fix: Handle empty Mesowest point responses in points_from_geometry

Author: micah-prime

metloom/pointdata/mesowest.py

@@ -335,13 +335,18 @@ def points_from_geometry(
         points = []
         if resp:
             jdata = resp.json()
-            data = jdata['STATION']
 
-            points = []
-            for sta in data:
-                points.append(MesowestPointData(station_id=sta['STID'],
-                                                name=sta['NAME'],
-                                                token_json=kwargs['token_json']))
+            if jdata["SUMMARY"]["NUMBER_OF_OBJECTS"] > 0:
+                data = jdata['STATION']
+
+                points = []
+                for sta in data:
+                    points.append(MesowestPointData(station_id=sta['STID'],
+                                                    name=sta['NAME'],
+                                                    token_json=kwargs['token_json']))
+            else:
+                points = []
+
         # build the result geodataframe
         result_df = gpd.GeoDataFrame.from_dict({'STID': [p.id for p in points],
                                                 'NAME': [p.name for p in points]},

tests/test_mesowest.py

@@ -53,49 +53,58 @@ def _meta_response(self, *args, **kwargs):
         if 'stid' in params.keys():
             stid = params['stid']
             if stid == 'KMYL':
-                response = {'STATION': [{'ELEVATION': '5020',
-                                         'NAME': 'McCall Airport',
-                                         'STID': 'KMYL',
-                                         'ELEV_DEM': '5006.6',
-                                         'LONGITUDE': '-116.09978',
-                                         'LATITUDE': '44.89425',
-                                         'TIMEZONE': 'America/Boise'}]}
+                response = {
+                    'SUMMARY': {'NUMBER_OF_OBJECTS': 1},
+                    'STATION': [{'ELEVATION': '5020',
+                                 'NAME': 'McCall Airport',
+                                 'STID': 'KMYL',
+                                 'ELEV_DEM': '5006.6',
+                                 'LONGITUDE': '-116.09978',
+                                 'LATITUDE': '44.89425',
+                                 'TIMEZONE': 'America/Boise'}]
+                }
 
             elif stid == 'INTRI':
-                response = {'STATION': [{'ELEVATION': '9409',
-                                         'NAME': 'IN TRIANGLE',
-                                         'STID': 'INTRI',
-                                         'LONGITUDE': '-119.5',
-                                         'LATITUDE': '38.0',
-                                         'TIMEZONE': 'America/Los_Angeles',
-                                         }]}
+                response = {
+                    'SUMMARY': {'NUMBER_OF_OBJECTS': 1},
+                    'STATION': [{'ELEVATION': '9409',
+                                 'NAME': 'IN TRIANGLE',
+                                 'STID': 'INTRI',
+                                 'LONGITUDE': '-119.5',
+                                 'LATITUDE': '38.0',
+                                 'TIMEZONE': 'America/Los_Angeles'}]
+                }
 
             elif stid == 'OUTTRI':
-                response = {'STATION': [
-                    {'ELEVATION': '7201',
-                     'NAME': 'OUT TRIANGLE W/IN BOUNDS',
-                     'STID': 'OUTTRI',
-                     'TIMEZONE': 'America/Los_Angeles',
-                     'LONGITUDE': '-119.7',
-                     'LATITUDE': '38.0',
-                     }]}
+                response = {
+                    'SUMMARY': {'NUMBER_OF_OBJECTS': 1},
+                    'STATION': [{'ELEVATION': '7201',
+                                 'NAME': 'OUT TRIANGLE W/IN BOUNDS',
+                                 'STID': 'OUTTRI',
+                                 'TIMEZONE': 'America/Los_Angeles',
+                                 'LONGITUDE': '-119.7',
+                                 'LATITUDE': '38.0'}]
+                }
 
         elif 'bbox' in params.keys():
-            response = {'STATION': [{'ELEVATION': '9409',
-                                     'NAME': 'IN TRIANGLE',
-                                     'STID': 'INTRI',
-                                     'LONGITUDE': '-119.5',
-                                     'LATITUDE': '38.0',
-                                     'TIMEZONE': 'America/Los_Angeles',
-                                     },
-                                    {'ELEVATION': '7201',
-                                     'NAME': 'OUT TRIANGLE W/IN BOUNDS',
-                                     'STID': 'OUTTRI',
-                                     'TIMEZONE': 'America/Los_Angeles',
-                                     'LONGITUDE': '-119.7',
-                                     'LATITUDE': '38.0',
-                                     }
-                                    ]}
+            response = {
+                'SUMMARY': {'NUMBER_OF_OBJECTS': 2},
+                'STATION': [{'ELEVATION': '9409',
+                             'NAME': 'IN TRIANGLE',
+                             'STID': 'INTRI',
+                             'LONGITUDE': '-119.5',
+                             'LATITUDE': '38.0',
+                             'TIMEZONE': 'America/Los_Angeles',
+                             },
+                            {'ELEVATION': '7201',
+                             'NAME': 'OUT TRIANGLE W/IN BOUNDS',
+                             'STID': 'OUTTRI',
+                             'TIMEZONE': 'America/Los_Angeles',
+                             'LONGITUDE': '-119.7',
+                             'LATITUDE': '38.0',
+                             }]
+            }
+
         else:
             raise ValueError('Invalid test STID provided')
 
@@ -272,6 +281,29 @@ def test_points_from_geometry(self, token_file, shape_obj, w_geom, expected_sid)
         df = pnts.to_dataframe()
         assert df['id'].values == pytest.approx(expected_sid)
 
+    def test_points_from_geometry_no_points(self, token_file, shape_obj):
+        """
+        Tests behavior when there are no points within the given geometry
+        """
+
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            'SUMMARY': {'NUMBER_OF_OBJECTS': 0}
+        }
+
+        with patch(
+            "metloom.pointdata.mesowest.requests.get",
+            return_value=mock_response
+        ):
+            points = MesowestPointData.points_from_geometry(
+                shape_obj,
+                [MesowestVariables.TEMP],
+                within_geometry=True,
+                token_json=token_file,
+            )
+
+        assert len(points) == 0
+
     def test_points_from_geometry_buffer(self, token_file, shape_obj):
 
         with patch("metloom.pointdata.mesowest.requests") as mock_requests: