Some improvement over the last path

diff --git a/UDLdap.py b/UDLdap.py
index 447368d..3dc2b74 100644 (file)
--- a/UDLdap.py
+++ b/UDLdap.py
@@ -1,5 +1,6 @@
 import ldap
 import time
+import userdir_ldap
 
 class Account:
     array_values = ['keyFingerPrint']
@@ -62,6 +63,11 @@ class Account:
     def numkeys(self):
         return len(self['keyFingerPrint'])
 
+    def latitude_dec(self, anonymized=False):
+        return userdir_ldap.DecDegree(self['latitude'], anonymized)
+    def longitude_dec(self, anonymized=False):
+        return userdir_ldap.DecDegree(self['longitude'], anonymized)
+
     def verbose_status(self):
         status = []
         status.append('mail: %s'  %(['disabled', 'active'][ self.has_mail() ]))

diff --git a/ud-generate b/ud-generate
index b31418a..303f9f5 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -585,7 +585,7 @@ def GenMarkers(File):
          if not ('latitude' in a and 'longitude' in a):
             continue
          try:
-            Line = "%8s %8s \"\""%(DecDegree(a['latitude'], 1), DecDegree(a['longitude'], 1))
+            Line = "%8s %8s \"\""%(a.latitude_dec(True), a.longitude_dec(True))
             Line = Sanitize(Line) + "\n"
             F.write(Line)
          except: