From c3a86f17e09367dd254ec3512b64001c918471bc Mon Sep 17 00:00:00 2001 From: Sanj Date: Thu, 18 Aug 2011 22:44:56 +0530 Subject: [PATCH] added places app --- gazetteer/__init__.py | 0 gazetteer/manage.py | 11 ++++ gazetteer/places/__init__.py | 0 gazetteer/places/admin.py | 73 +++++++++++++++++++++++++ gazetteer/places/imports.py | 29 ++++++++++ gazetteer/places/models.py | 28 ++++++++++ gazetteer/places/tests.py | 23 ++++++++ gazetteer/places/views.py | 1 + gazetteer/settings.py | 100 +++++++++++++++++++++++++++++++++++ gazetteer/urls.py | 16 ++++++ 10 files changed, 281 insertions(+) create mode 100644 gazetteer/__init__.py create mode 100644 gazetteer/manage.py create mode 100644 gazetteer/places/__init__.py create mode 100644 gazetteer/places/admin.py create mode 100644 gazetteer/places/imports.py create mode 100644 gazetteer/places/models.py create mode 100644 gazetteer/places/tests.py create mode 100644 gazetteer/places/views.py create mode 100644 gazetteer/settings.py create mode 100644 gazetteer/urls.py diff --git a/gazetteer/__init__.py b/gazetteer/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gazetteer/manage.py b/gazetteer/manage.py new file mode 100644 index 0000000..5e78ea9 --- /dev/null +++ b/gazetteer/manage.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python +from django.core.management import execute_manager +try: + import settings # Assumed to be in the same directory. +except ImportError: + import sys + sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) + sys.exit(1) + +if __name__ == "__main__": + execute_manager(settings) diff --git a/gazetteer/places/__init__.py b/gazetteer/places/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gazetteer/places/admin.py b/gazetteer/places/admin.py new file mode 100644 index 0000000..d3d05c8 --- /dev/null +++ b/gazetteer/places/admin.py @@ -0,0 +1,73 @@ +from django.contrib import admin +from models import * + +class PlaceAdmin(admin.ModelAdmin): + pass +# admin.site.register(Occupation, OccupationAdmin) +# admin.site.register(Relation, RelationAdmin) +admin.site.register(Place, PlaceAdmin) + +''' +#class NicknameInline(admin.StackedInline): +# model = Nickname +# extra = 3 + +#class LinkInlineModelAdmin(admin.InlineModelAdmin): +# pass + +#class LinkInline(LinkInlineModelAdmin): +# model = Link +# extra = 3 + +class ProfileInline(admin.StackedInline): + model = Person + extra = 1 + +class PerformanceAdmin(admin.ModelAdmin): + filter_horizontal = ('links', 'images') + +class EventAdmin(admin.ModelAdmin): + filter_horizontal = ('links',) + +class ProfileAdmin(admin.ModelAdmin): + filter_horizontal = ('links', 'files', 'images',) +# inlines = [NicknameInline] +# inlines = [LinkInline] + +class VenueAdmin(admin.ModelAdmin): + ordering = ('name',) + prepopulated_fields = {'slug': ('name',)} + filter_horizontal = ('links', 'images') + +class TheatreGroupAdmin(admin.ModelAdmin): + prepopulated_fields = {'slug': ('name',)} + filter_horizontal = ('links', 'files', 'images') + +class ProductionAdmin(admin.ModelAdmin): + prepopulated_fields = {'slug': ('title',)} + filter_horizontal = ('links', 'files', 'images',) + inlines = [ProfileInline] + +class ScriptAdmin(admin.ModelAdmin): + filter_horizontal = ('links', 'downloads') + + +#admin.site.register(Nickname3) +#admin.site.register(Nickname2) +admin.site.register(Performance, PerformanceAdmin) +admin.site.register(Event, EventAdmin) +admin.site.register(Location) +admin.site.register(ProfileProfile) +admin.site.register(ProfileGroup) +admin.site.register(Script, ScriptAdmin) +admin.site.register(Production, ProductionAdmin) +admin.site.register(Image) +admin.site.register(File) +admin.site.register(Link) +admin.site.register(RandomQuote) +admin.site.register(ProfileProduction) +admin.site.register(Nickname) +admin.site.register(TheatreGroup, TheatreGroupAdmin) +admin.site.register(Venue, VenueAdmin) +admin.site.register(Profile, ProfileAdmin) +''' diff --git a/gazetteer/places/imports.py b/gazetteer/places/imports.py new file mode 100644 index 0000000..078fecc --- /dev/null +++ b/gazetteer/places/imports.py @@ -0,0 +1,29 @@ +import csv +from settings import DATA_DIR +from os.path import join +from places.models import Place, FeatureCode +from django.contrib.gis.geos import Point + +def import_gazetteer(): + f = open(join(DATA_DIR, "gazetteer.txt")) + t = csv.reader(f, delimiter="\t") + for row in t: + p = Place() + if Place.objects.filter(url=row[0]).count() > 0: + print "duplicate row " + row[0] + else: + p.url = row[0] + p.name = row[1] + try: + fcode = FeatureCode.objects.get(pk=row[2]) + except: + print row[2] + continue + p.fcode = fcode + p.country = row[3] + p.admin1 = row[4] + p.point = Point(float(row[6]), float(row[5])) + p.save() + print "saved " + p.name + + diff --git a/gazetteer/places/models.py b/gazetteer/places/models.py new file mode 100644 index 0000000..ef9b675 --- /dev/null +++ b/gazetteer/places/models.py @@ -0,0 +1,28 @@ +from django.db import models +from django.contrib.gis.db import models + +# Create your models here. + +class Place(models.Model): + url = models.CharField(max_length=255, primary_key=True, unique=True) + name = models.CharField(max_length=255) + fcode = models.ForeignKey("FeatureCode") + country = models.CharField(max_length=2) + admin1 = models.CharField(max_length=2) + point = models.PointField() + + def __unicode__(self): + return self.name + + +class FeatureCode(models.Model): + fcode = models.CharField(max_length=10, primary_key=True, unique=True) + letter = models.CharField(max_length=2) + short_name = models.CharField(max_length=100) + description = models.TextField() + + def __unicode__(self): + return self.fcode + ": " + self.short_name + + + diff --git a/gazetteer/places/tests.py b/gazetteer/places/tests.py new file mode 100644 index 0000000..2247054 --- /dev/null +++ b/gazetteer/places/tests.py @@ -0,0 +1,23 @@ +""" +This file demonstrates two different styles of tests (one doctest and one +unittest). These will both pass when you run "manage.py test". + +Replace these with more appropriate tests for your application. +""" + +from django.test import TestCase + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.failUnlessEqual(1 + 1, 2) + +__test__ = {"doctest": """ +Another way to test that 1 + 1 is equal to 2. + +>>> 1 + 1 == 2 +True +"""} + diff --git a/gazetteer/places/views.py b/gazetteer/places/views.py new file mode 100644 index 0000000..60f00ef --- /dev/null +++ b/gazetteer/places/views.py @@ -0,0 +1 @@ +# Create your views here. diff --git a/gazetteer/settings.py b/gazetteer/settings.py new file mode 100644 index 0000000..6bee380 --- /dev/null +++ b/gazetteer/settings.py @@ -0,0 +1,100 @@ +# Django settings for gazetteer project. +import os +from os.path import join + +DEBUG = True +TEMPLATE_DEBUG = DEBUG +DATA_DIR = '/home/sanj/c/gazetteer/data' +ADMINS = ( + # ('Your Name', 'your_email@domain.com'), +) + +MANAGERS = ADMINS + +DATABASES = { + 'default': { + 'ENGINE': 'django.contrib.gis.db.backends.postgis', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': 'gazetteer', # Or path to database file if using sqlite3. + 'USER': 'sanj', # Not used with sqlite3. + 'PASSWORD': '', # Not used with sqlite3. + 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. + 'PORT': '', # Set to empty string for default. Not used with sqlite3. + } +} + +# Local time zone for this installation. Choices can be found here: +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name +# although not all choices may be available on all operating systems. +# On Unix systems, a value of None will cause Django to use the same +# timezone as the operating system. +# If running in a Windows environment this must be set to the same as your +# system time zone. +TIME_ZONE = 'America/Chicago' + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = 'en-us' + +SITE_ID = 1 + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = True + +# If you set this to False, Django will not format dates, numbers and +# calendars according to the current locale +USE_L10N = True + +# Absolute filesystem path to the directory that will hold user-uploaded files. +# Example: "/home/media/media.lawrence.com/" +MEDIA_ROOT = '' + +# URL that handles the media served from MEDIA_ROOT. Make sure to use a +# trailing slash if there is a path component (optional in other cases). +# Examples: "http://media.lawrence.com", "http://example.com/media/" +MEDIA_URL = '' + +# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a +# trailing slash. +# Examples: "http://foo.com/media/", "/media/". +ADMIN_MEDIA_PREFIX = '/media/' + +# Make this unique, and don't share it with anybody. +SECRET_KEY = '4a$-vh!9+^)rzhvq%uq)!qq)!4th=315o-q@-$2g81n0%(&c@a' + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', +# 'django.template.loaders.eggs.Loader', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', +) + +ROOT_URLCONF = 'gazetteer.urls' + +TEMPLATE_DIRS = ( + # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. +) + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.messages', + 'django.contrib.gis', + 'places', + # Uncomment the next line to enable the admin: + 'django.contrib.admin', + # Uncomment the next line to enable admin documentation: + 'django.contrib.admindocs', +) diff --git a/gazetteer/urls.py b/gazetteer/urls.py new file mode 100644 index 0000000..9763cba --- /dev/null +++ b/gazetteer/urls.py @@ -0,0 +1,16 @@ +from django.conf.urls.defaults import * + +# Uncomment the next two lines to enable the admin: +from django.contrib import admin +admin.autodiscover() + +urlpatterns = patterns('', + # Example: + # (r'^gazetteer/', include('gazetteer.foo.urls')), + + # Uncomment the admin/doc line below to enable admin documentation: + (r'^admin/doc/', include('django.contrib.admindocs.urls')), + + # Uncomment the next line to enable the admin: + (r'^admin/', include(admin.site.urls)), +)