Model: Fix hyphenation of keyword 'user_defined'

ogn/model/address_origin.py

@@ -1,7 +1,7 @@
 class AddressOrigin:
     ogn_ddb = 1
     flarmnet = 2
-    userdefined = 3
+    user_defined = 3
 
     def __init__(self, origin):
         if origin in [1, 2, 3]:
@@ -11,9 +11,9 @@ class AddressOrigin:
 
     def name(self):
         if self.origin == self.ogn_ddb:
-            return 'ogn_ddb'
+            return 'OGN-DDB'
         elif self.origin == self.flarmnet:
-            return 'flarmnet'
+            return 'FlarmNet'
-        elif self.origin == self.userdefined:
+        elif self.origin == self.user_defined:
-            return 'userdefined'
+            return 'user-defined'
         return ''

ogn/utils.py

@@ -25,7 +25,7 @@ def get_ddb(csvfile=None):
     else:
         r = open(csvfile, 'r')
         rows = ''.join(i for i in r.readlines() if i[0] != '#')
-        address_origin = AddressOrigin.userdefined
+        address_origin = AddressOrigin.user_defined
 
     data = csv.reader(StringIO(rows), quotechar="'", quoting=csv.QUOTE_ALL)
 

tests/test_utils.py

@@ -21,7 +21,7 @@ class TestStringMethods(unittest.TestCase):
         self.assertTrue(device.tracked)
         self.assertTrue(device.identified)
 
-        self.assertEqual(device.address_origin, AddressOrigin.userdefined)
+        self.assertEqual(device.address_origin, AddressOrigin.user_defined)
 
     def test_get_trackable(self):
         devices = get_ddb('tests/custom_ddb.txt')