Changeset 9819 for src/django_gheat

Timestamp:

Dec 23, 2011, 8:31:50 AM (13 years ago)

Author:

rick

Message:

Correct annoying typo in naming of the acces*s* point.

Location:

src/django_gheat

Files:

• gheat/admin.py (modified) (2 diffs)
• gheat/base.py (modified) (1 diff)
• gheat/dataimport/__init__.py (modified) (6 diffs)
• gheat/dataimport/kismet.py (modified) (2 diffs)
• gheat/management/commands/add_random_points.py (modified) (3 diffs)
• gheat/management/commands/import_datafile.py (modified) (1 diff)
• gheat/models.py (modified) (5 diffs)
• wlheatmap/filters.py (modified) (1 diff)
• wlheatmap/nodelist.py (modified) (1 diff)
• wlheatmap/static/heatmap_extensions.js (modified) (2 diffs)
• wlheatmap/templates/home.html (modified) (1 diff)
• wlheatmap/templates/js/LayerBase.js (modified) (2 diffs)

src/django_gheat/gheat/admin.py

@@ -2 +2 @@
 from django.contrib import admin
 
-class AccespointAdmin(admin.ModelAdmin):
+class AccesspointAdmin(admin.ModelAdmin):
   list_display = ['ssid','type', 'mac', 'organization']
   search_fields = ['ssid', 'mac', 'organization']
   ordering = ['ssid']
-admin.site.register(Accespoint, AccespointAdmin)
+admin.site.register(Accesspoint, AccesspointAdmin)
 
 class MeetBestandInline(admin.TabularInline):
@@ -35 +35 @@
 
 class MetingAdmin(admin.ModelAdmin):
-  list_display = ['accespoint', 'latitude', 'longitude', 'signaal']
-  search_fields = ['accespoint__ssid']
+  list_display = ['accesspoint', 'latitude', 'longitude', 'signaal']
+  search_fields = ['accesspoint__ssid']
 admin.site.register(Meting, MetingAdmin)

src/django_gheat/gheat/base.py

@@ -7 +7 @@
 import gheat
 import gheat.opacity
-from gheat.models import Accespoint, Gebruiker, Meting
+from gheat.models import Accesspoint, Gebruiker, Meting
 from gheat import gheatsettings as settings
 from gheat import gmerc

src/django_gheat/gheat/dataimport/__init__.py

@@ -74 +74 @@
 
 
-def import_accespoints(ap_pool, counters):
-  # Determine which Accespoints to add
-  bssid_list_present = Accespoint.objects.filter(mac__in=ap_pool.keys()).\
+def import_accesspoints(ap_pool, counters):
+  # Determine which Accesspoints to add
+  bssid_list_present = Accesspoint.objects.filter(mac__in=ap_pool.keys()).\
     values_list('mac', flat=True)
   bssid_list_insert = set(ap_pool.keys()) - set(bssid_list_present)
@@ -85 +85 @@
     for bssid in bssid_list_insert:
       ssid, encryption = ap_pool[bssid]
-      type = Accespoint.get_type_by_ssid(ssid)
+      type = Accesspoint.get_type_by_ssid(ssid)
       # Special trick in SSID ts avoid escaping in later stage
       item = str((bssid.upper(),ssid.replace('%','%%'),encryption,
-         Accespoint.get_type_by_ssid(ssid),
+         Accesspoint.get_type_by_ssid(ssid),
         get_organization_id_by_ssid(ssid)))
       sql_values.append(item)
-    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`,\
+    counters['ap_added'] = bulk_sql('gheat_accesspoint (`mac`, `ssid`,\
       `encryptie`, `type`, `organization_id`)',sql_values)
   return counters
@@ -104 +104 @@
   # Build mapping for meting import
   mac2id = {}
-  for mac,id in Accespoint.objects.filter(mac__in=bssid_list).\
+  for mac,id in Accesspoint.objects.filter(mac__in=bssid_list).\
     values_list('mac','id'):
     mac2id[mac] = int(id)
@@ -134 +134 @@
   if sql_values:
     counters['meting_added'] = bulk_sql('gheat_meting (`meetrondje_id`,\
-      `accespoint_id`, `latitude`, `longitude`, `signaal`)',sql_values)
+      `accesspoint_id`, `latitude`, `longitude`, `signaal`)',sql_values)
   return counters
 
@@ -186 +186 @@
 
   if ap_pool:
-    counters = import_accespoints(ap_pool, counters)
+    counters = import_accesspoints(ap_pool, counters)
   if client_pool:
     counters = import_clients(client_pool, counters)
@@ -192 +192 @@
     counters = import_metingen(meetrondje, meting_pool, counters)
 
-  logger.debug("summary accespoints: total:%(ap_total)-6s added:%(ap_added)-6s failed:%(ap_failed)-6s ignored:%(ap_ignored)-6s" % counters)
+  logger.debug("summary accesspoints: total:%(ap_total)-6s added:%(ap_added)-6s failed:%(ap_failed)-6s ignored:%(ap_ignored)-6s" % counters)
   logger.debug("summary client     : total:%(client_total)-6s added:%(client_added)-6s failed:%(client_failed)-6s ignored:%(client_ignored)-6s" % counters)
   logger.debug("summary metingen   : total:%(meting_total)-6s added:%(meting_added)-6s failed:%(meting_failed)-6s ignored:%(meting_ignored)-6s" % counters)

src/django_gheat/gheat/dataimport/kismet.py

@@ -17 +17 @@
     raise IOError(e)
 
-  # Prepare new accespoints and measurements
+  # Prepare new accesspoints and measurements
   wnetworks = netxml_doc.findall('wireless-network')
 
@@ -55 +55 @@
   bssid_failed = defaultdict(int)
 
-  # Prepare new accespoints and measurements
+  # Prepare new accesspoints and measurements
   points = gpsxml_doc.findall('gps-point')
 

src/django_gheat/gheat/management/commands/add_random_points.py

@@ -19 +19 @@
   equipment, created = Apparatuur.objects.get_or_create(antenne='itern', kaart='device')
 
-  accespoint, created = Accespoint.objects.get_or_create(mac='00:11:22:33:44',
+  accesspoint, created = Accesspoint.objects.get_or_create(mac='00:11:22:33:44',
     ssid='ap-WirelessLeiden-Test', encryptie=True)
 
@@ -27 +27 @@
   rondje.save()
 
-  sql_insert = "INSERT INTO gheat_meting (meetrondje_id, accespoint_id, lat, lng, signaal) VALUES ";
+  sql_insert = "INSERT INTO gheat_meting (meetrondje_id, accesspoint_id, lat, lng, signaal) VALUES ";
   sql_insert_values = []
   for i in range(0,count):
@@ -38 +38 @@
     #  print "#Importing Random mesurements: %s/%s" % (i,count)
     #meting = Meting.objects.create(meetrondje=rondje,
-    #    accespoint=accespoint,latitude=latitude,
+    #    accesspoint=accesspoint,latitude=latitude,
     #    longitude=longitude,signaal=signal)
     #meting.save()
-    sql_insert_values.append("('" + "','".join(map(str,[rondje.id, accespoint.id, latitude, longitude, signal])) + "')")
+    sql_insert_values.append("('" + "','".join(map(str,[rondje.id, accesspoint.id, latitude, longitude, signal])) + "')")
 
   sql_insert += ','.join(sql_insert_values) + ';';

src/django_gheat/gheat/management/commands/import_datafile.py

@@ -139 +139 @@
 
       counters = import_file(filename,meetrondje)
-      logger.info("summary accespoints: total:%(ap_total)-6s added:%(ap_added)-6s failed:%(ap_failed)-6s ignored:%(ap_ignored)-6s" % counters)
+      logger.info("summary accesspoints: total:%(ap_total)-6s added:%(ap_added)-6s failed:%(ap_failed)-6s ignored:%(ap_ignored)-6s" % counters)
       logger.info("summary client     : total:%(client_total)-6s added:%(client_added)-6s failed:%(client_failed)-6s ignored:%(client_ignored)-6s" % counters)
       logger.info("summary metingen   : total:%(meting_total)-6s added:%(meting_added)-6s failed:%(meting_failed)-6s ignored:%(meting_ignored)-6s" % counters)

src/django_gheat/gheat/models.py

@@ -7 +7 @@
 MAX_SIGNAL = 100
 
-ACCESPOINT_TYPE_CHOICES= (
-  ('accespoint', 'Acess Point'),
+ACCESSPOINT_TYPE_CHOICES= (
+  ('accesspoint', 'Acess Point'),
   ('interlink', 'InterLink'),
 )
@@ -72 +72 @@
     return "%s - %s" % (self.name, self.organization)
 
-class Accespoint(models.Model):
+class Accesspoint(models.Model):
   mac = models.CharField(max_length=17)
   ssid = models.CharField(max_length=64)
-  type = models.CharField(max_length=20, null=True, blank=True, choices=ACCESPOINT_TYPE_CHOICES)
+  type = models.CharField(max_length=20, null=True, blank=True, choices=ACCESSPOINT_TYPE_CHOICES)
   organization = models.ForeignKey(Organization,null=True, blank=True)
   encryptie = models.BooleanField()
@@ -86 +86 @@
   def get_type_by_ssid(ssid):
     if ssid.startswith('ap'):
-      type = 'accespoint'
+      type = 'accesspoint'
     elif ssid.startswith('il'):
       type = 'interlink'
@@ -94 +94 @@
 
   def save(self, *args, **kwargs):
-    super(Accespoint, self).save(*args, **kwargs)
+    super(Accesspoint, self).save(*args, **kwargs)
 
 class Gebruiker(models.Model):
@@ -141 +141 @@
 class Meting(models.Model):
   meetrondje = models.ForeignKey(MeetRondje)
-  accespoint = models.ForeignKey(Accespoint)
+  accesspoint = models.ForeignKey(Accesspoint)
   latitude = models.FloatField()
   longitude = models.FloatField()
   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)
+    return "%s @ %.5f,%.5f : %s" % (self.accesspoint.ssid, float(self.latitude), float(self.longitude), self.signaal)
   class Meta:
     # This implies that you cannot have multiple messurements on the same
     # location for a single 'run', thus the data needs cleaned before to make
     # this properly hold.
-    unique_together = ('meetrondje', 'accespoint', 'latitude', 'longitude'),
+    unique_together = ('meetrondje', 'accesspoint', 'latitude', 'longitude'),
     verbose_name_plural = 'Metingen'
 

src/django_gheat/wlheatmap/filters.py

@@ -18 +18 @@
     sum_ssid = set()
     for mr in MeetRondje.objects.filter(gebruiker=user).order_by('naam'):
-      # Get list if accespoints found in the specific 'Meting', and make this is list.
+      # Get list if accesspoints found in the specific 'Meting', and make this is list.
       wirelessleiden_ssid = Meting.objects.filter(meetrondje=mr,
-        accespoint__organization__name__startswith='Wireless').\
-        values_list('accespoint__ssid',flat=True).\
-        order_by('accespoint__ssid').distinct()
+        accesspoint__organization__name__startswith='Wireless').\
+        values_list('accesspoint__ssid',flat=True).\
+        order_by('accesspoint__ssid').distinct()
       # The explicit cast to list is required as django lists are special and
       # cannot be handled by simplejson.

src/django_gheat/wlheatmap/nodelist.py

@@ -47 +47 @@
   })
 
-  objquery = Accespoint.objects.filter(**filter).distinct()
+  objquery = Accesspoint.objects.filter(**filter).distinct()
   nodelist = serializers.serialize('json', objquery, fields=('fields','ssid'))
 

src/django_gheat/wlheatmap/static/heatmap_extensions.js

@@ -313 +313 @@
           initialize: function(name, options) {
             var url = [
-              "tile/${z}/${x},${y}.png?&colour=" + colour + "&accespoint__ssid=" + node
+              "tile/${z}/${x},${y}.png?&colour=" + colour + "&accesspoint__ssid=" + node
             ];
             options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
@@ -357 +357 @@
     }
     if (wlnode != 'all') {
-      query_array.push('accespoint__ssid=' + wlnode);
+      query_array.push('accesspoint__ssid=' + wlnode);
     }
     if (nodetype) {

src/django_gheat/wlheatmap/templates/home.html

@@ -47 +47 @@
           <select id="select_node" style="width:104px"></select> Node<br />
           <select id="select_nodetype" style="width:104px">
-            <option value="accespoint__ssid__icontains=ap-WirelessLeiden">WL Nodes</option>
-            <option value="accespoint__ssid__icontains=WirelessLeiden">WL Nodes &amp; WL InterLinks</option>
+            <option value="accesspoint__ssid__icontains=ap-WirelessLeiden">WL Nodes</option>
+            <option value="accesspoint__ssid__icontains=WirelessLeiden">WL Nodes &amp; WL InterLinks</option>
             <option value="">Alle AccessPoints (ook niet WL)</option>
           </select> Type<br />

src/django_gheat/wlheatmap/templates/js/LayerBase.js

@@ -162 +162 @@
 
 /**
- * All accespoints 
+ * All accesspoints 
  */
 OpenLayers.Layer.OSM.Overlay2 = OpenLayers.Class(OpenLayers.Layer.OSM, {
@@ -182 +182 @@
     initialize: function(name, options) {
         var url = get_balanced_urls('{{ settings.DJANGO_CDN_DOMAINS_PROTOCOL }}', {{ settings.DJANGO_CDN_DOMAINS|safe }},
-          '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=255,0,0&accespoint__organization__name__startswith=Wireless');
+          '{{ settings.DJANGO_PREFIX }}/wlheatmap/tile/${z}/${x},${y}.png?colour=255,0,0&accesspoint__organization__name__startswith=Wireless');
         options = OpenLayers.Util.extend({ numZoomLevels: 21 }, options);
         var newArguments = [name, url, options];