Changed average_latlon
This commit is contained in:
		@@ -84,12 +84,20 @@ class PlaceTestCase(SubmittableTestCase, TestCase):
 | 
			
		||||
            place_list.append(place)
 | 
			
		||||
 | 
			
		||||
        avg_latlon = Place.average_latlon(place_list)
 | 
			
		||||
        self.assertEqual(avg_latlon[0], 5.5,
 | 
			
		||||
        
 | 
			
		||||
        self.assertTrue('latitude' in avg_latlon,
 | 
			
		||||
            msg='Expecting avg_latlon dict to have an \'latitude\' key'
 | 
			
		||||
        )
 | 
			
		||||
        self.assertTrue('longitude' in avg_latlon,
 | 
			
		||||
            msg='Expecting avg_latlon dict to have an \'longitude\' key'
 | 
			
		||||
        )
 | 
			
		||||
        
 | 
			
		||||
        self.assertEqual(avg_latlon['latitude'], 5.5,
 | 
			
		||||
            msg='%s: average latitude missmatch' % (
 | 
			
		||||
                self.model_name
 | 
			
		||||
            )
 | 
			
		||||
        )
 | 
			
		||||
        self.assertEqual(avg_latlon[1], 14.5,
 | 
			
		||||
        self.assertEqual(avg_latlon['longitude'], 14.5,
 | 
			
		||||
            msg='%s: average longitude missmatch' % (
 | 
			
		||||
                self.model_name
 | 
			
		||||
            )
 | 
			
		||||
@@ -102,12 +110,12 @@ class PlaceTestCase(SubmittableTestCase, TestCase):
 | 
			
		||||
        '''
 | 
			
		||||
        place = Place.objects.get(id=1)
 | 
			
		||||
        avg_latlon = Place.average_latlon([place])
 | 
			
		||||
        self.assertEqual(avg_latlon[0], place.latitude,
 | 
			
		||||
        self.assertEqual(avg_latlon['latitude'], place.latitude,
 | 
			
		||||
            msg='%s:(one place) average latitude missmatch' % (
 | 
			
		||||
                self.model_name
 | 
			
		||||
            )
 | 
			
		||||
        )
 | 
			
		||||
        self.assertEqual(avg_latlon[1], place.longitude,
 | 
			
		||||
        self.assertEqual(avg_latlon['longitude'], place.longitude,
 | 
			
		||||
            msg='%s: (one place) average longitude missmatch' % (
 | 
			
		||||
                self.model_name
 | 
			
		||||
            )
 | 
			
		||||
@@ -119,12 +127,12 @@ class PlaceTestCase(SubmittableTestCase, TestCase):
 | 
			
		||||
        an empty list
 | 
			
		||||
        '''
 | 
			
		||||
        avg_latlon = Place.average_latlon([])
 | 
			
		||||
        self.assertEqual(avg_latlon[0], 0,
 | 
			
		||||
        self.assertEqual(avg_latlon['latitude'], 0,
 | 
			
		||||
            msg='%s: (no places) average latitude missmatch' % (
 | 
			
		||||
                self.model_name
 | 
			
		||||
            )
 | 
			
		||||
        )
 | 
			
		||||
        self.assertEqual(avg_latlon[1], 0,
 | 
			
		||||
        self.assertEqual(avg_latlon['longitude'], 0,
 | 
			
		||||
            msg='%s: a(no places) verage longitude missmatch' % (
 | 
			
		||||
                self.model_name
 | 
			
		||||
            )
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user