Changeset 10400 in genesis

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

Files:

• nodes/CNodeAMSchiphol/wleiden.yaml (modified) (1 diff)
• nodes/CNodeDrijfhuis/wleiden.yaml (modified) (1 diff)
• nodes/CNodeGraficall/wleiden.yaml (modified) (1 diff)
• nodes/CNodeRecpark/wleiden.yaml (modified) (1 diff)
• nodes/proxy17/wleiden.yaml (modified) (2 diffs)
• tools/gformat.py (modified) (1 diff)
• tools/rdnap.py (modified) (1 diff)

nodes/CNodeAMSchiphol/wleiden.yaml

@@ -5 +5 @@
 ileiden   : True
 latitude  : "52.25493"
-location  : ""
-longitude : "4.75742"
+location  : "52.261853"
+longitude : "4.73463"
 masterip  : "172.16.17.1"
-nodename  : "Schiphol"
+nodename  : "AMSchiphol"
 nodetype  : "CNode"
-rdnap_x   : 111998
-rdnap_y   : 474286
+rdnap_x   : "110442"
+rdnap_y   : "474300"
 release   : "8.1-RELEASE"
 status    : "dw"

nodes/CNodeDrijfhuis/wleiden.yaml

@@ -4 +4 @@
 comment   : "None"
 ileiden   : True
-latitude  : "52.26384"
+latitude  : "52.26387"
 location  : "Jachthaven Drijfhuis,1431 AA,Aalsmeer"
-longitude : "4.74572"
+longitude : "4.74555"
 masterip  : "172.17.12.1"
 nodename  : "Drijfhuis"
 nodetype  : "CNode"
-rdnap_x   : 111208
-rdnap_y   : 475284
+rdnap_x   : "111196"
+rdnap_y   : "475288"
 release   : "8.2-RELEASE"
 status    : "up"

nodes/CNodeGraficall/wleiden.yaml

@@ -4 +4 @@
 comment   : "None"
 ileiden   : True
-latitude  : "52.15596"
+latitude  : "52.15630"
 location  : "Zusterflat Ziekenhuis Rijnland, Simon Smitweg 1, 2353 GA, Leiderdorp"
-longitude : "4.54125"
+longitude : "4.53926"
 masterip  : "172.24.16.1"
 nodename  : "Graficall"
 nodetype  : "CNode"
-rdnap_x   : 97110
-rdnap_y   : 463425
+rdnap_x   : "96974"
+rdnap_y   : "463464"
 release   : "8.2-RELEASE"
 status    : "up"

nodes/CNodeRecpark/wleiden.yaml

@@ -4 +4 @@
 comment   : "None"
 ileiden   : True
-latitude  : "52.25834"
+latitude  : "52.25868"
 location  : "Recreatiepark,Uiterweg 214,1431AJ,Aalsmeer"
-longitude : "4.72635"
+longitude : "4.75814"
 masterip  : "172.17.11.1"
 nodename  : "Recpark"
 nodetype  : "CNode"
-rdnap_x   : 109880
-rdnap_y   : 474684
+rdnap_x   : "112051"
+rdnap_y   : "474703"
 release   : "8.2-RELEASE"
 status    : "up"

nodes/proxy17/wleiden.yaml

@@ -8 +8 @@
 internalif: "vr1"
 internalroute: "172.17.0.33"
-latitude  : "52.26427"
-location  : "Somewhere in Aalsmeer (line of sight Watertoren)"
-longitude : "4.75732"
+latitude  : "52.25868"
+location  : "Jasmijnstraat 25 1431 RH Aalsmeer"
+longitude : "4.75797"
 masterip  : "172.17.0.36"
 nat       : True
@@ -16 +16 @@
 nodetype  : "Proxy"
 proxyid   : 17
-rdnap_x   : 112000
-rdnap_y   : 475325
+rdnap_x   : "112039"
+rdnap_y   : "474703"
 release   : "8.2-RELEASE"
 status    : "up"

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