Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 10396)
+++ tools/gformat.py	(revision 10400)
@@ -1077,5 +1077,9 @@
 
       for host,datadump in datadumps.iteritems():
-        datadump['latitude'], datadump['longitude'] = rdnap.rd2etrs(datadump['rdnap_x'], datadump['rdnap_y'])
+        if datadump['rdnap_x'] and datadump['rdnap_y']:
+          datadump['latitude'], datadump['longitude'] = rdnap.rd2etrs(datadump['rdnap_x'], datadump['rdnap_y'])
+        elif datadump['latitude'] and datadump['longitude']:
+          datadump['rdnap_x'], datadump['rdnap_y'] = rdnap.etrs2rd(datadump['latitude'], datadump['longitude'])
+
         if datadump['nodename'].startswith('Proxy'):
           datadump['nodename'] = datadump['nodename'].lower()
Index: tools/rdnap.py
===================================================================
--- tools/rdnap.py	(revision 10396)
+++ tools/rdnap.py	(revision 10400)
@@ -38,7 +38,5 @@
   """
   
-  item['phi'] = phi
-  item['lam'] = lam
-  item['func'] = 'etrs2rd'
+  item = { 'phi' : phi, 'lam' : lam, 'func': 'etrs2rd' }
   url = 'http://vanderzwet.net/rdnap/%(func)s/%(phi)s/%(lam)s/0/' % item