Changeset 8587 in genesis

Timestamp:

Oct 30, 2010, 2:27:36 AM (14 years ago)

Author:

rick

Message:

Python friendly name (does not like the dashes)

File:

• nodes/make_map.py (moved) (moved from nodes/make-map.py ) (2 diffs)

nodes/make_map.py

@@ -29 +29 @@
 
 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
-
+  """ Convert etrs to rd """
+  
+  item['lam'] = lam
+  item['phi'] = phi
   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) 
+  url = 'http://vanderzwet.net/rdnap/%(func)s/%(xrd)s/%(yrd)s/0/' % item
+
   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'])
+  rdnap_x,rdnap_y,rdnap_h = raw.split('/')
+  return (rdnap_x, rdnap_y)
+
 
 
 def rd2etrs(xrd, yrd, hnap=0.0):
-  """ Convert rd to etrs """
+  """ 
+  Convert rd to etrs 
+  JavaScript Version: https://rdinfo.kadaster.nl/rd/transformator.html
+  """
   # Get cache is exists
   global coordinates
@@ -81 +70 @@
   item['hnap'] = hnap
   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
+  url = 'http://vanderzwet.net/rdnap/%(func)s/%(xrd)s/%(yrd)s/%(hnap)s/' % item
   print "### Not in Cache, Fetching coordinate %s, %s from %s" % (xrd, yrd, 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
-  
-  lam = item['lam_deg'] + (item['lam_min'] + (item['lam_sec'] / 60)) / 60
-  phi = item['phi_deg'] + (item['phi_min'] + (item['phi_sec'] / 60)) / 60
+  lam,phi,h = raw.split('/')
   coordinates[(xrd, yrd)] = (lam, phi)
   write_yaml(CACHE_FILE, coordinates)