places

pandora/place/models.py

@@ -6,6 +6,7 @@ from django.db import models
 
 import ox
 from ox.django import fields
+from django.contrib.auth.models import User, Group
 
 import managers
 
@@ -14,24 +15,26 @@ class Place(models.Model):
     '''
         Places are named locations, they should have geographical information attached to them.
     '''
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(auto_now=True)
+    user = models.ForeignKey(User, null=True, related_name='items')
 
-    name = models.CharField(max_length=200, unique=True)
+    name = fields.TupleField(default=[])
     name_sort = models.CharField(max_length=200)
     name_find = models.TextField(default='', editable=False)
 
     geoname = models.CharField(max_length=1024, unique=True)
-    geoname_reverse = models.CharField(max_length=1024, unique=True)
+    geoname_sort = models.CharField(max_length=1024, unique=True)
 
     wikipediaId = models.CharField(max_length=1000, blank=True)
-    aliases = fields.TupleField(default=[])
 
-    sw_lat = models.FloatField(default=0)
-    sw_lng = models.FloatField(default=0)
-    ne_lat = models.FloatField(default=0)
-    ne_lng = models.FloatField(default=0)
-    center_lat = models.FloatField(default=0)
-    center_lng = models.FloatField(default=0)
-    area = models.FloatField(default=-1)
+    south = models.FloatField(default=0)
+    west = models.FloatField(default=0)
+    north = models.FloatField(default=0)
+    east = models.FloatField(default=0)
+    lat = models.FloatField(default=0)
+    lng = models.FloatField(default=0)
+    size = models.FloatField(default=-1)
 
     objects = managers.PlaceManager()
 
@@ -41,25 +44,38 @@ class Place(models.Model):
     def __unicode__(self):
         return self.name
 
+    def editable(self, user):
+        if user.is_staff or self.user == user:
+            return True
+        return False
+
+    def get_id(self):
+        return ox.to32(self.id)
+
     def json(self):
-        j = {}
-        for key in ('name', 'name_sort', 'aliases', 'geoname', 'geoname_reversed',
-                    'sw_lat', 'sw_lng', 'ne_lat', 'ne_lng',
-                    'center_lat', 'center_lng'):
+        j = {
+            'id': self.get_id(),
+            'user': self.user.username,
+        }
+        for key in ('created', 'modified',
+                    'name', 'geoname',
+                    'south', 'west', 'north', 'east',
+                    'lat', 'lng', 'size'):
             j[key] = getattr(self, key)
+        return j
 
     def save(self, *args, **kwargs):
         if not self.name_sort:
-            self.name_sort = self.name
-        self.geoname_reverse = ', '.join(reversed(self.geoname.split(', ')))
+            self.name_sort = ', '.join(self.name)
+        self.geoname_sort = ', '.join(reversed(self.geoname.split(', ')))
 
-        self.name_find = '|%s|'%'|'.join([self.name] + self.aliases)
+        self.name_find = '|%s|'%'|'.join(self.name)
 
         #update center
-        self.lat_center = ox.location.center(self.lat_sw, self.lat_ne)
-        self.lng_center = ox.location.center(self.lng_sw, self.lng_ne)
+        #self.lat = ox.location.center(self.south, self.north)
+        #self.lng = ox.location.center(self.east, self.west)
 
         #update area
-        self.area = ox.location.area(self.lat_sw, self.lng_sw, self.lat_ne, self.lng_ne)
+        #self.size = ox.location.area(self.south, self.west, self.north, self.east)
 
         super(Place, self).save(*args, **kwargs)