Changeset 10400 in genesis for tools

Timestamp:

Apr 8, 2012, 8:22:49 PM (13 years ago)

Author:

rick

Message:

Aanpassingen coordinaten in Kaag en Braassem, de WGS84 (degrees) to NAD27
(decimals) conversion is done using:

​http://transition.fcc.gov/mb/audio/bickel/DDDMMSS-decimal.html

Reported-by: henk

Location:

tools

Files:

• gformat.py (modified) (1 diff)
• rdnap.py (modified) (1 diff)

tools/gformat.py

@@ -1077 +1077 @@
 
       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()

tools/rdnap.py

@@ -38 +38 @@
   """
   
-  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