Index: trunk/src/inc/KMLFile.class.php
===================================================================
--- trunk/src/inc/KMLFile.class.php (revision 7773)
+++ trunk/src/inc/KMLFile.class.php (revision 7775)
@@ -5,4 +5,8 @@
* Purpose: Creating of editing KML files
*/
+
+define('NODE_STATUS_UP', 0);
+define('NODE_STATUS_ERROR', 1);
+define('NODE_STATUS_UNREACHABLE', 2);
class KMLFile {
@@ -13,4 +17,18 @@
1
Wireless Leiden Interactive Nodemap 2.0
+
+ %OVERALL_LONGITUDE%
+ %OVERALL_LATITUDE%
+ %OVERALL_ALTITUDE%
+ %OVERALL_HEADING%
+ %OVERALL_TILT%
+ %OVERALL_RANGE%
+
+
-
Nodes
Nodes from the Wireless Leiden network
- 4.490153
- 52.161087
- 5
- 0
- 0
- 500
+ %OVERALL_LONGITUDE%
+ %OVERALL_LATITUDE%
+ %OVERALL_ALTITUDE%
+ %OVERALL_HEADING%
+ %OVERALL_TILT%
+ %OVERALL_RANGE%
%NODESCONTENT%
@@ -57,10 +69,10 @@
Lines from nodes to nodes from the Wireless Leiden network
- 4.490153
- 52.161087
- 5
- 0
- 0
- 500
+ %OVERALL_LONGITUDE%
+ %OVERALL_LATITUDE%
+ %OVERALL_ALTITUDE%
+ %OVERALL_HEADING%
+ %OVERALL_TILT%
+ %OVERALL_RANGE%
%LINESCONTENT%
@@ -146,4 +158,11 @@
$toString = str_replace('%LINESCONTENT%', $lineString, $toString);
+ $toString = str_replace('%OVERALL_LONGITUDE%', $config['overall_longitude'], $toString);
+ $toString = str_replace('%OVERALL_LATITUDE%', $config['overall_latitude'], $toString);
+ $toString = str_replace('%OVERALL_ALTITUDE%', $config['overall_altitude'], $toString);
+ $toString = str_replace('%OVERALL_HEADING%', $config['overall_heading'], $toString);
+ $toString = str_replace('%OVERALL_TILT%', $config['overall_tilt'], $toString);
+ $toString = str_replace('%OVERALL_RANGE%', $config['overall_range'], $toString);
+
return $toString;
}
@@ -218,9 +237,28 @@
// Creating a string with the complete description of the node using all data in the location file
- $descriptionLocation = 'Naam: ' . $name . '
Locatie: ' . $location . '
Status: ' . $status . '
Latitude: ' . $latitude . '
Longitude: ' . $longitude . '
Interfaces: ' . $interfaces . '
Master IP: ' . $masterip . '
Node type: ' . $nodetype . '
';
+ $dataLocation = '
+
+
+
+
+
+
+ ' . $status . '
+
+
+ ' . $interfaces . '
+
+
+ ' . $masterip . '
+
+
+ ' . $nodetype . '
+ ';
if ($placemarkPosition = $this->getNodeByName($name)) {
// Updating an excisting placemark
- $this->KMLNodes[$placemarkPosition]->setDescriptionLocation($descriptionLocation);
+ $this->KMLNodes[$placemarkPosition]->setDataLocation($dataLocation);
$this->KMLNodes[$placemarkPosition]->setLongitude($longitude);
$this->KMLNodes[$placemarkPosition]->setLatitude($latitude);
@@ -230,5 +268,5 @@
$placemark->setID($name);
$placemark->setName($name);
- $placemark->setDescriptionLocation($descriptionLocation);
+ $placemark->setDataLocation($dataLocation);
$placemark->setLongitude($longitude);
$placemark->setLatitude($latitude);
@@ -259,8 +297,49 @@
$this->NetworkList->add($network);
+ $data = '
+
+ ' . $network->netmaskDecimal . '
+
+
+ ' . $network->netmaskBinary . '
+
+
+ ' . $network->wildcardDecimal . '
+
+
+ ' . $network->wildcardBinary . '
+
+
+ ' . $network->networkDecimal . '
+
+
+ ' . $network->networkBinary . '
+
+
+ ' . $network->broadcastDecimal . '
+
+
+ ' . $network->broadcastBinary . '
+
+
+ ' . $network->hostminDecimal . '
+
+
+ ' . $network->hostminBinary . '
+
+
+ ' . $network->hostmaxDecimal . '
+
+
+ ' . $network->hostmaxBinary . '
+
+
+ ' . $network->numberHosts . '
+ ';
+
$line = new KMLLine();
- $line->setID($network->networkDecimal);
+ $line->setID(str_replace('.', '', $network->networkDecimal));
$line->setName('Link: Van ' . $name . ' naar ');
- $line->setDescription($network->toString());
+ $line->setData($data);
$line->setLongitude1($longitude);
$line->setLatitude1($latitude);
@@ -334,9 +413,41 @@
// Creating a string with the complete description of the node using all data in the status file
- $descriptionStatus = 'Type: ' . $lineContent[0] . '
Host name: ' . $lineContent[1] . '
Has been checked: ' . $lineContent[2] . '
Check execution time: ' . $lineContent[3] . '
Currenr state: ' . $lineContent[4] . '
Last hard state: ' . $lineContent[5] . '
Last check: ' . $lineContent[6] . '
Problem has been acknowledged: ' . $lineContent[7] . '
';
+ $dataStatus = '
+
+ ' . $lineContent[0] . '
+
+
+ ' . $lineContent[1] . '
+
+
+ ' . $lineContent[2] . '
+
+
+ ' . $lineContent[3] . '
+
+
+ ' . $lineContent[4] . '
+
+
+ ' . $lineContent[5] . '
+
+
+ ' . $lineContent[6] . '
+
+
+ ' . $lineContent[7] . '
+ ';
+
+ $style = NODE_RED;
+ if ($lineContent[4] == NODE_STATUS_ERROR) {
+ $style = NODE_ORANGE;
+ } elseif ($lineContent[4] == NODE_STATUS_UP) {
+ $style = NODE_GREEN;
+ }
if ($placemarkPosition = $this->getNodeByName($lineContent[1])) {
// Updating an excisting placemark
- $this->KMLNodes[$placemarkPosition]->setDescriptionStatus($descriptionStatus);
+ $this->KMLNodes[$placemarkPosition]->setDataStatus($dataStatus);
+ $this->KMLNodes[$placemarkPosition]->setStyle($style);
} else {
// Adding a new placemark
@@ -344,5 +455,6 @@
$placemark->setID($lineContent[1]);
$placemark->setName($lineContent[1]);
- $placemark->setDescriptionStatus($descriptionStatus);
+ $placemark->setDataStatus($dataStatus);
+ $placemark->setStyle($style);
$this->addNode($placemark);
}
Index: trunk/src/inc/KMLLine.class.php
===================================================================
--- trunk/src/inc/KMLLine.class.php (revision 7773)
+++ trunk/src/inc/KMLLine.class.php (revision 7775)
@@ -6,5 +6,5 @@
*/
-define('LINE_BLACK', 'blackLine');
+define('LINE_BLACK', '#blackLine');
class KMLLine {
@@ -12,23 +12,21 @@
%NAME%
-
-
- %DESCRIPTION%
- ]]>
-
+ %NAME%
%LONGITUDE1%
%LATITUDE1%
- 0
- 0
- 0
- 500
+ %OVERALL_ALTITUDE%
+ %OVERALL_HEADING%
+ %OVERALL_TILT%
+ %OVERALL_RANGE%
+
+ %EXTENDEDDATA%
+
%STYLE%
- %LONGITUDE1%, %LATITUDE1%, 0.
- %LONGITUDE2%, %LATITUDE2%, 0.
+ %LONGITUDE1%,%LATITUDE1%,0.
+ %LONGITUDE2%,%LATITUDE2%,0.
@@ -37,5 +35,5 @@
private $id; // ID of the line
private $name; // Name of the line
- private $description; // Description of the line
+ private $data; // Extra information of the line
private $style; // Style of the line
private $longitude1; // Start longitude of line
@@ -94,11 +92,11 @@
/*
- * Function: setDescription
- * Description: Setting the description of the placemark
- * Parameters: string $newDescription
+ * Function: setData
+ * Description: Setting the extra data of the placemark
+ * Parameters: string $newData
* Returns: -
*/
- function setDescription($newDescription) {
- $this->description = (string) $newDescription;
+ function setData($newData) {
+ $this->data = (string) $newData;
}
@@ -179,5 +177,5 @@
$toString = str_replace('%ID%', $this->id, $toString);
$toString = str_replace('%NAME%', $this->name, $toString);
- $toString = str_replace('%DESCRIPTION%', $this->description, $toString);
+ $toString = str_replace('%EXTENDEDDATA%', $this->data, $toString);
$toString = str_replace('%STYLE%', $this->style, $toString);
$toString = str_replace('%LONGITUDE1%', $this->longitude1, $toString);
Index: trunk/src/inc/KMLNode.class.php
===================================================================
--- trunk/src/inc/KMLNode.class.php (revision 7773)
+++ trunk/src/inc/KMLNode.class.php (revision 7775)
@@ -6,7 +6,7 @@
*/
-define('NODE_GREEN', 'greenArrowIcon');
-define('NODE_ORANGE', 'orangeArrowIcon');
-define('NODE_RED', 'redArrowIcon');
+define('NODE_GREEN', '#greenArrowIcon');
+define('NODE_ORANGE', '#orangeArrowIcon');
+define('NODE_RED', '#redArrowIcon');
class KMLNode {
@@ -14,18 +14,16 @@
%NAME%
-
-
- %DESCRIPTION%
- ]]>
-
+ %NAME%
%LONGITUDE%
%LATITUDE%
- 0
- 0
- 0
- 500
+ %OVERALL_ALTITUDE%
+ %OVERALL_HEADING%
+ %OVERALL_TILT%
+ %OVERALL_RANGE%
+
+ %EXTENDEDDATA%
+
%STYLE%
@@ -35,11 +33,11 @@
';
- private $id; // ID of the node
- private $name; // Name of the node
- private $descriptionLocation; // Location information of the node
- private $descriptionStatus; // Status information of the node
- private $longitude; // Longitude of the node
- private $latitude; // Latitude of the node
- private $style; // Style of the node
+ private $id; // ID of the node
+ private $name; // Name of the node
+ private $dataLocation; // Location information of the node
+ private $dataStatus; // Status information of the node
+ private $longitude; // Longitude of the node
+ private $latitude; // Latitude of the node
+ private $style; // Style of the node
/*
@@ -52,9 +50,9 @@
$this->id = '';
$this->name = '';
- $this->descriptionLocation = '';
- $this->descriptionStatus = '';
+ $this->dataLocation = '';
+ $this->dataStatus = '';
$this->longitude = 0;
$this->latitude = 0;
- $this->style = 'orangeArrowIcon';
+ $this->style = NODE_RED;
}
@@ -95,6 +93,6 @@
* Returns: -
*/
- function setDescriptionLocation($newDescriptionLocation) {
- $this->descriptionLocation = (string) $newDescriptionLocation;
+ function setDataLocation($newDataLocation) {
+ $this->dataLocation = (string) $newDataLocation;
}
@@ -105,6 +103,6 @@
* Returns: -
*/
- function setDescriptionStatus($newDescriptionStatus) {
- $this->descriptionStatus = (string) $newDescriptionStatus;
+ function setDataStatus($newDataStatus) {
+ $this->dataStatus = (string) $newDataStatus;
}
@@ -150,5 +148,5 @@
$toString = str_replace('%ID%', $this->id, $toString);
$toString = str_replace('%NAME%', $this->name, $toString);
- $toString = str_replace('%DESCRIPTION%', $this->descriptionLocation . $this->descriptionStatus, $toString);
+ $toString = str_replace('%EXTENDEDDATA%', $this->dataLocation . $this->dataStatus, $toString);
$toString = str_replace('%LONGITUDE%', $this->longitude, $toString);
$toString = str_replace('%LATITUDE%', $this->latitude, $toString);