Changeset 10373 in genesis for tools

Timestamp:

Apr 7, 2012, 11:25:44 AM (13 years ago)

Author:

rick

Message:

Latitude and Longitude got shuffled around.

Related-To: beheer#167

File:

• tools/rdnap.py (modified) (4 diffs)

tools/rdnap.py

@@ -1 +1 @@
 #
-# REMEMBER
+# !!!REMEMBER!!!
 # latitude  : phi
 # longitude : lam
@@ -33 +33 @@
     pass
 
-def etrs2rd(lam, phi):
-  """ Convert etrs to rd """
+def etrs2rd(phi, lam):
+  """ Convert etrs to rd coordinates
+  @Return: (X,Y)
+  """
   
+  item['phi'] = phi
   item['lam'] = lam
-  item['phi'] = phi
   item['func'] = 'etrs2rd'
-  url = 'http://vanderzwet.net/rdnap/%(func)s/%(xrd)s/%(yrd)s/0/' % item
+  url = 'http://vanderzwet.net/rdnap/%(func)s/%(phi)s/%(lam)s/0/' % item
 
   f = urllib.urlopen(url)
@@ -51 +53 @@
 def rd2etrs(xrd, yrd, hnap=0.0):
   """ 
-  Convert rd to etrs 
+  Convert rd to etrs
   JavaScript Version: https://rdinfo.kadaster.nl/rd/transformator.html
+  @Return: (latitude,longitude)
   """
   # Get cache is exists
@@ -76 +79 @@
   item['func'] = 'rd2etrs'
   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) 
+  print "### Not in Cache, Fetching coordinate %s, %s from %s" % (xrd, yrd, url)
   f = urllib.urlopen(url)
   raw = f.read()
-  
-  # Coordinates returned in 'odd' order
+
   phi,lam,h = raw.split('/')
-  coordinates[(xrd, yrd)] = (lam, phi)
+  coordinates[(xrd, yrd)] = (phi, lam)
   write_yaml(CACHE_FILE, coordinates)
-  return (lam, phi)
+  return (phi, lam)