Changeset 8293 in genesis

Timestamp:

Aug 10, 2010, 1:27:13 PM (14 years ago)

Author:

rick

Message:

Fixed CNodeRick coordinates using make-map new function

Location:

nodes

Files:

• CNodeRick/wleiden.conf (modified) (1 diff)
• make-map.py (modified) (4 diffs)

nodes/CNodeRick/wleiden.conf

@@ -8 +8 @@
 $status='up';
 
-
 # edugis x,y
-$X='92434';
-$Y='461987';
+$X='92280';
+$Y='461707';
 
 $config{'vr0'}=sprintf <<SIS0;

nodes/make-map.py

@@ -11 +11 @@
 import urllib
 import yaml
+import math
 
 def get_yaml(gfile):
@@ -27 +28 @@
 coordinates = None
 
+def etrs2rd(lam, phi):
+  """ Convert rd to etrs """
+  
+  item = dict()
+  (remainder, item['lam_deg']) = math.modf(lam)
+  remainder *= 60
+  (remainder, item['lam_min']) = math.modf(remainder)
+  item['lam_sec'] = remainder * 60
+
+  (remainder, item['phi_deg']) = math.modf(phi)
+  remainder *= 60
+  (remainder, item['phi_min']) = math.modf(remainder)
+  item['phi_sec'] = remainder * 60
+
+  item['func'] = 'etrs2rd'
+
+  args = "&".join(["%s=%s" % (k,v) for k,v in item.iteritems()])
+  url = 'http://www.rdnap.nl/cgi-bin/rdetrs.pl?%s' % args
+  print "### Fetching coordinate %s, %s using: %s" % (phi, lam, url) 
+  f = urllib.urlopen(url)
+  raw = f.read()
+  
+  r = re.compile('name="([a-z_]+)" value="([0-9\.]+)"')
+  for i in r.finditer(raw):
+    name, value = i.group(1,2)
+    value = float(value)
+    item[name] = value
+  return (item['xrd'], item['yrd'])
+
+
 def rd2etrs(xrd, yrd, hnap=0.0):
   """ Convert rd to etrs """
   global coordinates
+  xrd = float(str(xrd))
+  yrd = float(str(yrd))
   if coordinates == None:
     try: 
@@ -43 +76 @@
   item['yrd'] = yrd
   item['hnap'] = hnap
-  f = urllib.urlopen('http://www.rdnap.nl/cgi-bin/rdetrs.pl?func=rd2etrs&xrd=%(xrd)s&yrd=%(yrd)s&hnap=%(hnap)s' % item)
+  item['func'] = 'rd2etrs'
+  args = "&".join(["%s=%s" % (k,v) for k,v in item.iteritems()])
+  url = 'http://www.rdnap.nl/cgi-bin/rdetrs.pl?%s' % args
+  print "### Fetching coordinate %s, %s from %s" % (xrd, yrd, url) 
+  f = urllib.urlopen(url)
   raw = f.read()
   
@@ -54 +91 @@
   lam = item['lam_deg'] + (item['lam_min'] + (item['lam_sec'] / 60)) / 60
   phi = item['phi_deg'] + (item['phi_min'] + (item['phi_sec'] / 60)) / 60
-  coordinates[(xrd, yrd)] = (phi, lam)
+  coordinates[(xrd, yrd)] = (lam, phi)
   write_yaml(CACHE_FILE, coordinates)
   return (lam, phi)