Testing points in file

tkrajina · tkrajina · commit 023031493e68 · 2013-05-31T08:08:45.000+02:00
diff --git a/srtm/data.py b/srtm/data.py
@@ -220,17 +220,16 @@ def __init__(self, file_name, data):
         self.square_side = int(square_side)
 
     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)))
-        column = int(mod_math.floor((longitude - start_longitude) * float(self.square_side - 1)))
+        pdb.set_trace()
+        row = int(mod_math.floor((self.latitude + 1 - latitude) * float(self.square_side - 1)))
+        column = int(mod_math.floor((longitude - self.longitude) * float(self.square_side - 1)))
 
         return self.get_elevation_from_row_and_column(row, column)
 
diff --git a/test.py b/test.py
@@ -87,3 +87,13 @@ def test_invalit_file(self):
         geo_elevation_data = mod_srtm.get_data()
         geo_file = geo_elevation_data.get_file(-47.0, -13.99)
         self.assertEquals(None, geo_file)
+
+    def test_coordinates_in_file(self):
+        geo_elevation_data = mod_srtm.get_data()
+        geo_file = geo_elevation_data.get_file(47.0, 13.99)
+
+        print 'file:', geo_file
+
+        self.assertEquals(geo_file.get_elevation(47, 13),
+                          geo_file.get_elevation(47, 13))
+
