Changeset 12473 in genesis

Timestamp:

Oct 17, 2013, 9:11:57 PM (11 years ago)

Author:

rick

Message:

No more rdnap remote fetching using python module instead.

Location:

tools

Files:

• gformat.py (modified) (5 diffs)
• rdnap.py (deleted)

tools/gformat.py

@@ -24 +24 @@
 # WSGIScriptAlias /hello /var/www/cgi-bin/genesis/tools/gformat.py
 #
+# Package dependencies list:
+# yum install python-yaml pyproj proj-epsg python-jinja2
 #
 # Rick van der Zwet <info@rickvanderzwet.nl>
@@ -42 +44 @@
 import math
 import random
-import rdnap
 import re
 import socket
@@ -49 +50 @@
 import time
 import urlparse
+import pyproj
 
 from pprint import pprint
@@ -145 +147 @@
     return DHCP_SERVER
 
-
+def etrs2rd(lat, lon):
+  p1 = pyproj.Proj(proj='latlon',datum='WGS84')
+  p2 = pyproj.Proj(init='EPSG:28992')
+  RDx, RDy = pyproj.transform(p1,p2,lon, lat)
+  return (RDx, RDy)
+
+def rd2etrs(RDx, RDy):
+  p1 = pyproj.Proj(init='EPSG:28992')
+  p2 = pyproj.Proj(proj='latlon',datum='WGS84')
+  lon, lat = pyproj.transform(p1,p2, RDx, RDy)
+  return (lat, lon)
 
 def get_yaml(item,add_version_info=True):
@@ -1826 +1838 @@
 
           if datadump['rdnap_x'] and datadump['rdnap_y']:
-            datadump['latitude'], datadump['longitude'] = rdnap.rd2etrs(datadump['rdnap_x'], datadump['rdnap_y'])
+            datadump['latitude'], datadump['longitude'] = map(lambda x: "%.5f" % x, 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'])
+            datadump['rdnap_x'], datadump['rdnap_y'] = etrs2rd(datadump['latitude'], datadump['longitude'])
 
           if datadump['nodename'].startswith('Proxy'):