Changeset 9664

Timestamp:

Sep 5, 2011, 5:05:20 PM (13 years ago)

Author:

rick

Message:

Fix import of invalid datapoints, causing large dots in output as signal values of 100+ where imported.

Location:

src/django_gheat/gheat

Files:

• dataimport/__init__.py (modified) (2 diffs)
• models.py (modified) (2 diffs)

src/django_gheat/gheat/dataimport/__init__.py

@@ -113 +113 @@
   sql_values = []
   for (bssid,lat,lon),signals in meting_pool.iteritems():
+    final_signal = max(signals)
     if clients.has_key(bssid):
       counters['meting_ignored'] += len(signals)
@@ -118 +119 @@
       counters['meting_failed'] += len(signals)
       bssid_failed[bssid] += len(signals)
+    elif final_signal < MIN_SIGNAL or final_signal > MAX_SIGNAL: 
+      counters['meting_failed'] += len(signals)
     else:
       item = str((int(meetrondje.id),mac2id[bssid],float(lat),\

src/django_gheat/gheat/models.py

@@ -3 +3 @@
 from django.core import validators
 from django.db import models
+
+MIN_SIGNAL = 0
+MAX_SIGNAL = 100
+
+
+# http://stackoverflow.com/questions/849142/how-to-limit-the-maximum-value-of-a-numeric-field-in-a-django-model/849426#849426
+class IntegerRangeField(models.IntegerField):
+  def __init__(self, verbose_name=None, name=None, min_value=None, max_value=None, **kwargs):
+    self.min_value, self.max_value = min_value, max_value
+    models.IntegerField.__init__(self, verbose_name, name, **kwargs)
+  def formfield(self, **kwargs):
+    defaults = {'min_value': self.min_value, 'max_value':self.max_value}
+    defaults.update(kwargs)
+    return super(IntegerRangeField, self).formfield(**defaults)
 
 
@@ -110 +124 @@
   latitude = models.FloatField()
   longitude = models.FloatField()
-  signaal = models.IntegerField(max_length=3)
+  signaal = IntegerRangeField(max_length=3,min_value=MIN_SIGNAL,max_value=MAX_SIGNAL)
   def __unicode__(self):
     return "%s @ %.5f,%.5f : %s" % (self.accespoint.ssid, float(self.latitude), float(self.longitude), self.signaal)