Adding classes Address and Coord, moving functions into the classes.

[treecutter.git] / xinclude / contact.py

diff --git a/xinclude/contact.py b/xinclude/contact.py
index 74d97008c9f993d584073fa2dec02a34e4cad9b9..e7e0ab32820a0127f7344fd8b88b310cde60e5c1 100755 (executable)
--- a/xinclude/contact.py
+++ b/xinclude/contact.py
@@ -3,39 +3,9 @@
 
 from vobject import readComponents
 import sys
-from addr import mapimage, geocode
+from address import Address
 from geohash import encode
 
-def coord2dms(coord):
-  ns = coord[0]
-  ew = coord[1]
-  mnt,sec = divmod(ns*3600,60)
-  deg,mnt = divmod(mnt,60)
-  out = u'''%d°%2d'%5.2f"%s''' % ( deg,mnt,sec,'N')
-  mnt,sec = divmod(ew*3600,60)
-  deg,mnt = divmod(mnt,60)
-  out +=  u''' %d°%2d'%05.2f"%s''' % ( deg,mnt,sec,'E')
-  return out
-
-
-def maplink(lat,lon):
-  return '''
-<uri type="location">
-  <link xlink:href=
-   "http://www.openstreetmap.org/?mlat=%s&amp;mlon=%s&amp;zoom=18&amp;layers=M">
-  <inlinemediaobject>
-    <imageobject condition="web">
-      <imagedata fileref="%s.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>geo:%s,%s</phrase>
-    </textobject>
-  </inlinemediaobject>
-  <para>%s</para>
-  </link>
-</uri>
-''' % (lat, lon, encode(float(lat), float(lon)), lat, lon, coord2dms((lat, lon)))
-
 for arg in sys.argv[1:]:
   al = arg.split("=")
   if al[0] == "lang":
@@ -43,7 +13,6 @@ for arg in sys.argv[1:]:
   if al[0] == "xptr":
     argument = al[1]
 
-
 (cards,query) = argument.split('?')
 (key, name) = query.split(':')
 with open(cards, 'r') as f: