Changeset 890

Timestamp:

07/26/06 15:29:41 (7 years ago)

Author:

mglb1

Message:

• Re-enable GPolyLine generation for the network map
• Allow loading zoomin key from a separate file

Location:

ccsweb/trunk/ccs_mods/host

Files:

• host.php (modified) (2 diffs)
• map.js (modified) (1 diff)
• map.tpl (modified) (2 diffs)

ccsweb/trunk/ccs_mods/host/host.php

@@ -24 +24 @@
 require("lib/ccs_init.php");
 require("host/host_common.php");
+@include("host/zoominkey.php");
+if (!isset($zoominkey)) {
+    $zoominkey="";
+}
 
 if (!isset($_REQUEST["do"]) || $_REQUEST["do"] == "") {
@@ -279 +283 @@
         $hosts[$idx]["gps_lat"] = $bits[0];
         $hosts[$idx]["gps_long"] = $bits[1];
-        //$hosts[$idx]["ifaces"] = getHostInterfaces($hosts[$idx]["host_id"]);
+        $hosts[$idx]["ifaces"] = getHostInterfaces($hosts[$idx]["host_id"]);
     }
     $smarty->assign("hosts", $hosts);
     $smarty->assign("sheets", array("host.css"));
     $smarty->assign("scripts", 
-        //array("/js/zoomin2.js", "map.js"));
-        array("http://mapapi.zoomin.co.nz/?v=4&apikey=foo", "map.js"));
+        array("/js/zoomin2.js",
+        //array("http://mapapi.zoomin.co.nz/?v=4&apikey=".$zoominkey,
+        "map.js"));
     display_page("mods/host/map.tpl");
 

ccsweb/trunk/ccs_mods/host/map.js

@@ -63 +63 @@
             marker.addEventListener('mouseout', siteHoverOff);
         }
-        /*for (i in links) {
+        for (i in links) {
+            d= document.getElementById("debug");
+            debug("link: " + i);
             point1 = sites[links[i][0]];
+            debug("point 1");
             point2 = sites[links[i][1]];
+            debug("point 2");
             points = new Array(point1, point2);
+            debug("points");
             var line = new GPolyLine(points, "#ff0000", 2, 100);
+            debug("line " + line.icon + " " + line.icon.style);
             map.addOverlay(line);
-        }*/
+            debug(" overlaid");
+        }
     }
 }
+function debug(msg) {
+    d= document.getElementById("debug");
+    ts = new Date();
+    d.innerHTML = d.innerHTML + ts +": " + msg + "<br />";
+}

ccsweb/trunk/ccs_mods/host/map.tpl

@@ -72 +72 @@
 {$host.host_name} = new GPoint({$host.gps_lat}, {$host.gps_long});
 sites["{$host.host_name}"] = new Array({$host.host_name}, "{$host.host_name}", "{$host.description} at {$host.location}");
-{*
 {foreach from=$host.ifaces item=iface}
 {if $iface.link_id != ""}
@@ -81 +80 @@
 {/if}
 {/foreach}
-*}
 {/if}
 {/foreach}