Model: Change type of AddressOrigin again.

Fixes db.update_ddb_ogn by removing the type Enum of AddressOrigin.

Partly reverts commit 04137acaf6 since
this commit broke db.update_ddb_ogn.

ogn/collect/fetchddb.py

@@ -14,7 +14,7 @@ def update_ddb_from_ogn():
     logger.info("Update ddb data from ogn.")
 
     app.session.query(Device) \
-        .filter(AddressOrigin(Device.address_origin) is AddressOrigin.ogn_ddb) \
+        .filter(Device.address_origin == AddressOrigin.ogn_ddb) \
         .delete()
 
     devices = get_ddb()
@@ -31,7 +31,7 @@ def update_ddb_from_file():
     logger.info("Import ddb data from file.")
 
     app.session.query(Device) \
-        .filter(AddressOrigin(Device.address_origin) is AddressOrigin.userdefined) \
+        .filter(Device.address_origin == AddressOrigin.userdefined) \
         .delete()
 
     devices = get_ddb('ogn/custom_ddb.txt')

ogn/commands/database.py

@@ -57,7 +57,7 @@ def stats():
     print('--- Devices ---')
     for [address_origin, device_count, nt_count, ni_count, ntni_count] in query.all():
         print('{:12s} Total:{:5d} - not tracked:{:3d}, not identified:{:3d}, not tracked & not identified: {:3d}'
-              .format(AddressOrigin(address_origin).name,
+              .format(AddressOrigin(address_origin).name(),
                       device_count,
                       nt_count,
                       ni_count,

ogn/model/address_origin.py

@@ -1,8 +1,19 @@
-from enum import Enum, unique
+class AddressOrigin:
-
-
-@unique
-class AddressOrigin(Enum):
     ogn_ddb = 1
     flarmnet = 2
     userdefined = 3
+
+    def __init__(self, origin):
+        if origin in [1, 2, 3]:
+            self.origin = origin
+        else:
+            raise ValueError('no address origin with id {} known'.format(origin))
+
+    def name(self):
+        if self.origin == self.ogn_ddb:
+            return 'ogn_ddb'
+        elif self.origin == self.flarmnet:
+            return 'flarmnet'
+        elif self.origin == self.userdefined:
+            return 'userdefined'
+        return ''