modified birds app to use Locations.location, eliminated birdinglocation and added point field to bird sighting model

2 files changed, 12 insertions, 3 deletions

diff --git a/app/birds/admin.py b/app/birds/admin.py
index a67b358..a9d60b0 100644
--- a/app/birds/admin.py
+++ b/app/birds/admin.py
@@ -13,7 +13,15 @@ class BirdAdmin(admin.ModelAdmin):
 class BirdSightingAdmin(OSMGeoAdmin):
     list_display = ('bird', 'location',)
     list_filter = ('location',)
-
+    #options for OSM map Using custom ESRI topo map
+    default_lon = -9285175
+    default_lat = 4025046
+    default_zoom = 6
+    units = True
+    scrollable = False
+    map_width = 700
+    map_height = 425
+    map_template = 'gis/admin/osm.html'
 admin.site.register(BirdSighting, BirdSightingAdmin)
 admin.site.register(BirdClass, BirdClassAdmin)
 admin.site.register(Bird, BirdAdmin)
diff --git a/app/birds/models.py b/app/birds/models.py
index 4f7ae51..3dd0add 100644
--- a/app/birds/models.py
+++ b/app/birds/models.py
@@ -1,6 +1,6 @@
 import datetime
 from django.contrib.gis.db import models
-from locations.models import BirdingLocation
+from locations.models import Location
 
 def get_upload_path(self, filename):
     return "images/bird-images/%s/%s" %(datetime.datetime.today().strftime("%Y"), filename)
@@ -37,7 +37,8 @@ class Bird(models.Model):
     
 class BirdSighting(models.Model):
     bird = models.ForeignKey(Bird)
-    location = models.ForeignKey(BirdingLocation)
+    point = models.PointField()
+    location = models.ForeignKey(Location)
     date = models.DateTimeField('Date')
     image = models.FileField(upload_to=get_upload_path, null=True,blank=True)