test invalid lat/lon for file

tkrajina · tkrajina · commit 5ffb674e012b · 2013-05-31T07:53:56.000+02:00
diff --git a/srtm/data.py b/srtm/data.py
@@ -222,6 +222,11 @@ def __init__(self, file_name, data):
     def get_elevation(self, latitude, longitude):
         start_latitude, start_longitude = self.latitude, self.longitude
 
+        if not (self.latitude <= latitude < self.latitude + 1):
+            raise Exception('Invalid latitude %s for file %s' % (latitude, self.file_name))
+        if not (self.longitude <= longitude < self.longitude + 1):
+            raise Exception('Invalid longitude %s for file %s' % (longitude, self.file_name))
+
         points = self.square_side ** 2
 
         row = int(mod_math.floor((start_latitude + 1 - latitude) * float(self.square_side - 1)))
@@ -231,6 +236,7 @@ def get_elevation(self, latitude, longitude):
 
     def get_elevation_from_row_and_column(self, row, column):
         i = row * (self.square_side) + column
+        assert i < len(self.data) - 1
 
         mod_logging.debug('{0}, {1} -> {2}'.format(row, column, i))
 
diff --git a/test.py b/test.py
@@ -66,3 +66,19 @@ def test_files_equality(self):
                           geo_elevation_data.get_file(47.0, -13.0))
         self.assertEquals(geo_elevation_data.get_file(47.99, -13.99),
                           geo_elevation_data.get_file(47.0, -13.0))
+
+    def test_invalit_coordinates_for_file(self):
+        geo_elevation_data = mod_srtm.get_data()
+        geo_file = geo_elevation_data.get_file(47.0, 13.99)
+
+        try:
+            self.assertFalse(geo_file.get_elevation(1, 1))
+        except Exception as e:
+            message = str(e)
+            self.assertEquals('Invalid latitude 1 for file N47E013.hgt', message)
+
+        try:
+            self.assertFalse(geo_file.get_elevation(47, 1))
+        except Exception as e:
+            message = str(e)
+            self.assertEquals('Invalid longitude 1 for file N47E013.hgt', message)
