4 files changed, 13 insertions, 41 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)
  
diff --git a/app/locations/admin.py b/app/locations/admin.py
index c61d9de..5e6106b 100644
--- a/app/locations/admin.py
+++ b/app/locations/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.gis.admin import OSMGeoAdmin
-from locations.models import Region,Country,Location,State,Route,BirdingLocation
+from locations.models import Region,Country,Location,State,Route
 
 from django.contrib.gis.maps.google import GoogleMap
 from django.conf import settings
@@ -295,25 +295,3 @@ admin.site.register(Route,RouteAdmin)
 
 
 
-class BirdingLocationAdmin(OSMGeoAdmin):
-    list_display = ('name','slug',)
-    prepopulated_fields = {'slug': ('name',)}
-    search_fields = ('name',)
-    ordering = ('name',)
-    save_as = True
-    search_fields = ['name',]
-    list_select_related = True
-    fieldsets = (
-      ('Location', {'fields': ('name','point', 'slug','location'), 'classes': ('show','extrapretty')}),
-    )
-    #options for OSM map Using custom ESRI topo map
-    default_lon = -10909310
-    default_lat = 4650301
-    default_zoom = 4
-    units = True
-    scrollable = False
-    map_width = 700
-    map_height = 425
-    map_template = 'gis/admin/osm.html'
-
-admin.site.register(BirdingLocation,BirdingLocationAdmin)
diff --git a/app/locations/models.py b/app/locations/models.py
index bbeb2e0..e088697 100755
--- a/app/locations/models.py
+++ b/app/locations/models.py
@@ -159,21 +159,6 @@ class Location(models.Model):
         
     def __unicode__(self): return self.name
 
-class BirdingLocation(models.Model):
-    location = models.ForeignKey(Location)
-    name = models.CharField(max_length=50)
-    slug = models.SlugField()
-    date_visited = models.DateTimeField('Date visited',null=True)
-    point = models.PointField()
-    # GeoManager, a subclass that adds a rich set of geospatial queryset methods
-    objects = models.GeoManager()
-        
-    def get_absolute_url(self):
-        return "/birdinglocations/%s/%s/%s/" % (self.state.country.slug, self.state.slug, self.slug)
-
-        
-    def __unicode__(self): return self.name
-
 class Route(models.Model):
     name = models.CharField(max_length=200)
     slug = models.SlugField()