Changeset 9026

Timestamp:

Apr 6, 2011, 4:23:50 PM (14 years ago)

Author:

dennisw

Message:

django_gheat - werkt met database, transprancy gefixed

Location:

src/django_gheat

Files:

• gheat/__init__.py (modified) (1 diff)
• gheat/base.py (modified) (5 diffs)
• gheat/etc/color-schemes/classic - Copy.png (added)
• gheat/etc/color-schemes/classic.png (modified) ( previous)
• gheat/managers.py (modified) (2 diffs)
• gheat/models.py (modified) (1 diff)
• samples/persisted/db/persisted.db (modified) ( previous)
• samples/persisted/settings.py (modified) (1 diff)
• samples/persisted/templates/home.html (modified) (1 diff)

src/django_gheat/gheat/__init__.py

@@ -31 +31 @@
 
 SIZE = 256 # size of (square) tile; NB: changing this will break gmerc calls!
-MAX_ZOOM = 31 # this depends on Google API; 0 is furthest out as of recent ver.
+MAX_ZOOM = 17 # this depends on Google API; 0 is furthest out as of recent ver.
 
 

src/django_gheat/gheat/base.py

@@ -8 +8 @@
 import gheat
 import gheat.opacity
-from gheat.models import Point
+from gheat.models import Accespoint, Gebruiker, Meting
 from gheat import gheatsettings as settings
 from gheat import gmerc
@@ -164 +164 @@
         SELECT count(uid) FROM points
         """
-        numpoints = Point.objects.num_points(self)
+        numpoints = Meting.objects.num_points(self)
         return numpoints == 0
 
@@ -178 +178 @@
    
         timestamp = os.stat(self.fspath)[stat.ST_MTIME]
-        modtime = datetime.datetime.fromtimestamp(timestamp)
-
-        numpoints = Point.objects.num_points(self, modtime)
+        datum = datetime.datetime.fromtimestamp(timestamp)
+
+        numpoints = Meting.objects.num_points(self, datum)
 
         return numpoints > 0
@@ -194 +194 @@
         # to be included on this tile, relative to the top-left of the tile.
 
-        _points = Point.objects.points_inside(self)
+        _points = Meting.objects.points_inside(self)
    
         def points():
@@ -204 +204 @@
                 x = x - self.x1 # account for tile offset relative to
                 y = y - self.y1 #  overall map
-                point_density = point.density
-                while point_density > 0:
+                point_signaal = point.signaal
+                while point_signaal > 0:
                     result.append((x-self.pad,y-self.pad))
-                    point_density = point_density - 1
+                    point_signaal = point_signaal - 1
             return result
 

src/django_gheat/gheat/managers.py

@@ -2 +2 @@
 from django.db import models
 
-class PointManager(models.Manager):
+class MetingManager(models.Manager):
 
     def actives(self):
@@ -17 +17 @@
             longitude__lte=lng1,
             longitude__gte=lng2,
-            density__gt=0,
+            signaal__gt=0,
             )
         return qs

src/django_gheat/gheat/models.py

@@ -1 +1 @@
 from django.db import models
 from gheat import managers
+import datetime
 
-# Create your models here.
-class Point(models.Model):
-    """
-        A simple representation of a point inside the gheat database
-    """
-    uid = models.CharField(max_length=100, name='unique identifier')
-    latitude = models.FloatField(name='Latitude', db_column='lat', blank=True)
-    longitude = models.FloatField(name='Longitude', db_column='lng', blank=True)
-    modtime = models.DateTimeField(auto_now = True,
-        name='Last modification time', null=True)
-    density = models.PositiveIntegerField(default=0, editable=False,
-        name='density of the current point')
 
-    objects = managers.PointManager()
+class Accespoint(models.Model):
+        mac = models.CharField(max_length=17)
+        ssid = models.CharField(max_length=64)
+        encryptie = models.BooleanField()
+        def __unicode__(self):
+                return (self.mac, self.ssid)
 
-    class Meta:
-        unique_together = ('uid',)
+
+class Gebruiker(models.Model):
+        gebruiker = models.CharField(max_length=64)
+        apparatuur = models.CharField(max_length=64)
+        def __unicode__(self):
+                return (self.gebruiker, self.apparatuur)
+
+
+class Meting(models.Model):
+        accespoint = models.ForeignKey(Accespoint)
+        gebruiker = models.ForeignKey(Gebruiker)
+        latitude = models.FloatField(name='Latitude', db_column='lat')
+        longitude = models.FloatField(name='Longitude', db_column='lng')
+        signaal = models.IntegerField(max_length=3)
+        datum = models.DateTimeField()
+
+        objects = managers.MetingManager()

src/django_gheat/samples/persisted/settings.py

@@ -13 +13 @@
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'postgresql_psycopg2'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': 'project_heatmap',                      # Or path to database file if using sqlite3.
+        'USER': 'root',                      # Not used with sqlite3.
+        'PASSWORD': 'password',                  # Not used with sqlite3.
+        'HOST': 'localhost',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '3306',                      # Set to empty string for default. Not used with sqlite3.
+    }
+}
 
 # Local time zone for this installation. Choices can be found here:

src/django_gheat/samples/persisted/templates/home.html

@@ -19 +19 @@
         heatmap.getTileUrl = function (tile, zoom) {
             base = 'http://127.0.0.1:8000/gheat/';
-            color_scheme = 'firetrans';
+            color_scheme = 'classic';
             url = base + color_scheme +'/'+ zoom +'/'
             url += tile.x +','+ tile.y +'.png';