@@ -1,10 +1,10 @@ [ {"pk": 1, "model": "monitor.moniton", "fields": { "email": "kegan@example.com", - "north": "90", - "east": "180", - "south": "-90", - "west": "-180", + "top": "90", + "right": "180", + "bottom": "-90", + "left": "-180", "zoom": "9", "uuid": "03619ac2453211de8c651fabc0151a16", "created_at": "2009-04-04 00:00:00", @@ -12,10 +12,10 @@ {"pk": 2, "model": "monitor.moniton", "fields": { "email": "zul@example.com", - "north": "90", - "east": "180", - "south": "-90", - "west": "-10", + "top": "90", + "right": "180", + "bottom": "-90", + "left": "0", "zoom": "9", "uuid": "4ad2302c454311de8b3387c74347e6f7", "created_at": "2009-04-04 00:00:00", @@ -23,10 +23,10 @@ {"pk": 3, "model": "monitor.moniton", "fields": { "email": "leremy@example.com", - "north": "90", - "east": "10", - "south": "-90", - "west": "-180", + "top": "90", + "right": "0", + "bottom": "-90", + "left": "-180", "zoom": "9", "uuid": "5432a3fc49ff11de854c1730b0756f01", "created_at": "2009-04-04 00:00:00", monitor/fixtures/monitons.json @@ -4,12 +4,12 @@ class Moniton(models.Model): """ A monitoring unit. Consist of the monitored area and email. """ - email = models.EmailField() - north = models.FloatField() - east = models.FloatField() - south = models.FloatField() - west = models.FloatField() - zoom = models.IntegerField() + email = models.EmailField() + top = models.FloatField() + right = models.FloatField() + bottom = models.FloatField() + left = models.FloatField() + zoom = models.IntegerField() uuid = models.CharField(max_length=32, default='', blank=True) created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) monitor/models.py @@ -13,7 +13,7 @@ class MonitonTestCase(TestCase): Test operations for crime areas monitoring. """ urls = 'monitor.urls' - fixtures = ['monitor/fixtures/monitons.json'] + fixtures = ['monitor/fixtures/monitons.json', 'monitor/fixtures/crimes.json'] def setUp(self): pass @@ -31,10 +31,10 @@ class MonitonTestCase(TestCase): """ inputs = { 'email': 'kegan@kegan.info', - 'north': 1.1234, - 'east': 1.1234, - 'south': 1.1234, - 'west': 1.1234, + 'top': 1.1234, + 'right': 1.1234, + 'bottom': 1.1234, + 'left': 1.1234, 'zoom': 9, } response = self.client.post('/subscribe/', inputs) @@ -50,10 +50,10 @@ class MonitonTestCase(TestCase): """ inputs = { 'email': 'xxx', - 'north': 1.1234, - 'east': 1.1234, - 'south': 1.1234, - 'west': 1.1234, + 'top': 1.1234, + 'right': 1.1234, + 'bottom': 1.1234, + 'left': 1.1234, 'zoom': 9, } response = self.client.post('/subscribe/', inputs, follow=True) monitor/tests.py 67d65b74865949b780626305652f17c050dbfa64 Kegan Gan kegan@kebook.local http://github.com/kegan/malaysiacrime/commit/308c3537ef3c62b032e7dfa13c26a46199d2fe7d 308c3537ef3c62b032e7dfa13c26a46199d2fe7d 2009-10-30T20:33:26-07:00 2009-10-30T20:33:26-07:00 Updated models and corresponding fixtures, tests. 9df52f3bd3882e91027c9fe01a38ed59358fdb22 Kegan Gan kegan@kebook.local