Refactoring: renaming Area to Map

1 files changed, 15 insertions, 15 deletions

diff --git a/chimere/admin.py b/chimere/admin.py
index d492a4c..f30c00b 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -36,14 +36,14 @@ try:
 except ImportError:
     pass
 
-from chimere.forms import MarkerAdminForm, RouteAdminForm, AreaAdminForm,\
+from chimere.forms import MarkerAdminForm, RouteAdminForm, MapAdminForm,\
      NewsAdminForm, CategoryAdminForm, ImporterAdminForm, OSMForm, \
      PageAdminForm, PictureFileAdminForm, MultimediaFileAdminForm
 from chimere.models import Category, Icon, SubCategory, Marker, \
-     PropertyModel, News, Route, Area, ColorTheme, Color, \
-     MultimediaFile, PictureFile, Importer, Layer, AreaLayers,\
+     PropertyModel, News, Route, Map, ColorTheme, Color, \
+     MultimediaFile, PictureFile, Importer, Layer, MapLayers,\
      PropertyModelChoice, MultimediaExtension, Page,\
-     get_areas_for_user, get_users_by_area
+     get_maps_for_user, get_users_by_map
 from chimere.utils import unicode_normalize, ShapefileManager, KMLManager,\
                           CSVManager
 
@@ -232,10 +232,10 @@ class MarkerAdmin(admin.ModelAdmin):
     def queryset(self, request):
         qs = self.model._default_manager.get_query_set()
         if not request.user.is_superuser:
-            areas = get_areas_for_user(request.user)
+            maps = get_maps_for_user(request.user)
             contained = Q()
-            for area in areas:
-                contained = contained | area.getIncludeMarker()
+            for map in maps:
+                contained = contained | map.getIncludeMarker()
             qs = qs.filter(contained)
         ordering = self.ordering or ()
         if ordering:
@@ -296,10 +296,10 @@ class RouteAdmin(MarkerAdmin):
     def queryset(self, request):
         qs = self.model._default_manager.get_query_set()
         if not request.user.is_superuser:
-            areas = get_areas_for_user(request.user)
+            maps = get_maps_for_user(request.user)
             contained = Q()
-            for area in areas:
-                contained = contained | area.getIncludeRoute()
+            for map in maps:
+                contained = contained | map.getIncludeRoute()
             qs = qs.filter(contained)
         ordering = self.ordering or ()
         if ordering:
@@ -314,14 +314,14 @@ class RouteAdmin(MarkerAdmin):
                                 Route.objects.filter(pk=item_id))
 
 class LayerInline(admin.TabularInline):
-    model = AreaLayers
+    model = MapLayers
     extra = 1
 
-class AreaAdmin(admin.ModelAdmin):
+class MapAdmin(admin.ModelAdmin):
     """
-    Specialized the area field.
+    Specialized the map field.
     """
-    form = AreaAdminForm
+    form = MapAdminForm
     exclude = ['upper_left_corner', 'lower_right_corner']
     inlines = [LayerInline]
     list_display = ['name', 'order', 'available', 'default']
@@ -447,6 +447,6 @@ admin.site.register(Marker, MarkerAdmin)
 admin.site.register(Route, RouteAdmin)
 if not settings.CHIMERE_HIDE_PROPERTYMODEL:
     admin.site.register(PropertyModel, PropertyModelAdmin)
-admin.site.register(Area, AreaAdmin)
+admin.site.register(Map, MapAdmin)
 admin.site.register(ColorTheme, ColorThemeAdmin)
 admin.site.register(Layer)