Index: src/django_gheat/gheat/__init__.py =================================================================== --- src/django_gheat/gheat/__init__.py (revision 9022) +++ src/django_gheat/gheat/__init__.py (revision 9026) @@ -31,5 +31,5 @@ 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. Index: src/django_gheat/gheat/base.py =================================================================== --- src/django_gheat/gheat/base.py (revision 9022) +++ src/django_gheat/gheat/base.py (revision 9026) @@ -8,5 +8,5 @@ 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,5 +164,5 @@ SELECT count(uid) FROM points """ - numpoints = Point.objects.num_points(self) + numpoints = Meting.objects.num_points(self) return numpoints == 0 @@ -178,7 +178,7 @@ 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,5 +194,5 @@ # 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,8 +204,8 @@ 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 Index: src/django_gheat/gheat/gheatsettings.py =================================================================== --- src/django_gheat/gheat/gheatsettings.py (revision 9022) +++ src/django_gheat/gheat/gheatsettings.py (revision 9026) Index: src/django_gheat/gheat/managers.py =================================================================== --- src/django_gheat/gheat/managers.py (revision 9022) +++ src/django_gheat/gheat/managers.py (revision 9026) @@ -2,5 +2,5 @@ from django.db import models -class PointManager(models.Manager): +class MetingManager(models.Manager): def actives(self): @@ -17,5 +17,5 @@ longitude__lte=lng1, longitude__gte=lng2, - density__gt=0, + signaal__gt=0, ) return qs Index: src/django_gheat/gheat/models.py =================================================================== --- src/django_gheat/gheat/models.py (revision 9022) +++ src/django_gheat/gheat/models.py (revision 9026) @@ -1,20 +1,29 @@ 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() Index: src/django_gheat/samples/persisted/settings.py =================================================================== --- src/django_gheat/samples/persisted/settings.py (revision 9022) +++ src/django_gheat/samples/persisted/settings.py (revision 9026) @@ -13,10 +13,14 @@ 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: Index: src/django_gheat/samples/persisted/templates/home.html =================================================================== --- src/django_gheat/samples/persisted/templates/home.html (revision 9022) +++ src/django_gheat/samples/persisted/templates/home.html (revision 9026) @@ -19,5 +19,5 @@ 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';