Changeset 864 for trunk/Modules/Map/Map.php

Timestamp:

Nov 10, 2019, 11:32:13 PM (5 years ago)

Author:

chronos

Message:

• Modified: Used embedded OpenStreetMaps as google maps v2 API is deprecated and v3 needs billing information.

File:

• trunk/Modules/Map/Map.php (modified) (6 diffs)

trunk/Modules/Map/Map.php

@@ -8 +8 @@
   var $ShortTitle = 'Mapa sítě';
   var $ParentClass = 'PagePortal';
-  var $Load = 'initialize()';
-  var $Unload = 'GUnload()';
+  //var $Load = 'initialize()';
+  //var $Unload = 'GUnload()';
 
   function Show()
@@ -30 +30 @@
       $DbRow = $DbResult->fetch_assoc();
       $Pos = explode(';', $DbRow['Pos']);
-      $MapApi = new MapApiGoogle($this->System);
+      $MapApi = new MapOpenStreetMaps($this->System);
       $MapApi->Position = array('Lat' => $Pos[0], 'Lng' => $Pos[1]);
       $MapApi->Zoom = 18;
       $MapApi->Key = $this->System->Config['Map']['GoogleMapsApiKey'];
       $MapApi->ShowMarker = true;
-      $MapApi->MarkerText = $DbRow['Name'];
+      $Marker = new MapMarker();
+      $Marker->Text = $DbRow['Name'];
+      $Marker->Position = $MapApi->Position;
+      $MapApi->Markers[] = $Marker;
       $Output = $MapApi->ShowPage($this);
       return($Output);
@@ -43 +46 @@
   function ShowMain()
   {
-    $Output = '<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;sensor=true&amp;key='.
-    $this->System->Config['Map']['GoogleMapsApiKey'].'"
-    type="text/javascript">
-  </script>';
-    $Output .= '<script type="text/javascript">
-
-    var map;
-    var tinyIcon;
-
-    function initialize()
-    {
-
-      if (GBrowserIsCompatible())
-      {
-        map = new GMap2(document.getElementById("map_canvas"));
-        map.setMapType(G_SATELLITE_MAP);
-        map.setCenter(new GLatLng(49.260422, 18.081179), 15);
-        map.setUIToDefault();
-        map.addControl(new GOverviewMapControl(new GSize(128, 96)));
-
-
-// Create our "tiny" marker icon
-var tinyIcon = new GIcon();
-tinyIcon.image = "point.gif";
-tinyIcon.shadow = "http://labs.google.com/ridefinder/images/mm_20_shadow.png";
-tinyIcon.iconSize = new GSize(10, 10);
-tinyIcon.shadowSize = new GSize(10, 10);
-tinyIcon.iconAnchor = new GPoint(5, 5);
-tinyIcon.infoWindowAnchor = new GPoint(5, 1);
-
-  toggleLabel(\'NetworkLinks\');
-  toggleLabel(\'NetworkDevices\');';
-
-      $Output .= '
-       }
-    }
-
-function toggleLabel(id)
-{
-  var ele = document.getElementById(id);
-  ele.checked = !ele.checked;
-  ele.onclick( );
-}
-
-    function UpdateNetworkLinks()
-    {
-      if ((document.getElementById("NetworkLinks")).checked == true)
-      {
-        NetworkLinks = [';
+    $Map = new MapOpenStreetMaps($this->System);
+    $Map->Position = array('Lat' => $this->System->Config['Map']['DefaultLatitude'],
+      'Lng' => $this->System->Config['Map']['DefaultLongitude']);
+    $Map->Zoom = $this->System->Config['Map']['DefaultZoom'];
+    $Map->Key = $this->System->Config['Map']['GoogleMapsApiKey'];
+    //$Map->OnClickObject = $_GET['r'];
+    //$MapApi->ShowMarker = true;
+
+    $DbResult = $this->Database->query('SELECT GROUP_CONCAT(`NetworkDevice`.`Name` SEPARATOR ",") AS `Name`, '.
+    '`MapPosition`.`Pos` AS `Pos`, `MapPosition`.`Name` AS `NodeName` '.
+    'FROM `NetworkDevice` LEFT JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
+    'WHERE (`NetworkDevice`.`Used`=1) AND (`NetworkDevice`.`MapPosition` IS NOT NULL) '.
+    'GROUP BY `NetworkDevice`.`MapPosition`');
+    while($Device = $DbResult->fetch_assoc())
+    {
+      $Pos = explode(';', $Device['Pos']);
+      $Marker = new MapMarker();
+      $Marker->Position = array('Lat' => $Pos[0], 'Lng' => $Pos[1]);
+      $Marker->Text = $Device['NodeName'].': '.$Device['Name'];
+      $Map->Markers[] = $Marker;
+    }
+
     $DbResult = $this->Database->query('SELECT * FROM `NetworkLink` WHERE (`Interface1` <> 0) AND (`Interface2` <> 0)');
     while($Link = $DbResult->fetch_assoc())
@@ -108 +84 @@
         $Pos2 = explode(';', $Device2['Pos']);
         if(($Device1['Used'] == 1) and ($Device2['Used'] == 1))
-          $Output .= 'new GPolyline([new GLatLng('.$Pos1[0].', '.
-        $Pos1[1].'),new GLatLng('.$Pos2[0].', '.$Pos2[1].')], "#4F4FBF", 3, 0.8), ';
+        {
+          $PolyLine = new MapPolyLine();
+          $PolyLine->Color = '#4F4FBF';
+          $PolyLine->Points[] = array('Lat' => $Pos1[0], 'Lng' => $Pos1[1]);
+          $PolyLine->Points[] = array('Lat' => $Pos2[0], 'Lng' => $Pos2[1]);
+          $Map->PolyLines[] = $PolyLine;
+        }
+      }
+    }
+
+    $Output = $Map->ShowPage($this);
+
+
+    /*
+    $Output = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?key='.
+    $this->System->Config['Map']['GoogleMapsApiKey'].'"></script>';
+    $Output .= '<script type="text/javascript">
+
+    var map;
+    var tinyIcon;
+
+    function initialize()
+    {
+
+      //if (google.maps.BrowserIsCompatible())
+      {
+        map = new google.maps.Map(document.getElementById("map_canvas"));
+        map.setMapTypeId(\'satellite\');
+        map.setCenter(new google.maps.LatLng(49.260422, 18.081179), 15);
+        //map.setUIToDefault();
+        //map.addControl(new google.maps.OverviewMapControl(new google.maps.Size(128, 96)));
+
+
+// Create our "tiny" marker icon
+//var tinyIcon = new google.maps.Icon();
+//tinyIcon.image = "point.gif";
+//tinyIcon.shadow = "http://labs.google.com/ridefinder/images/mm_20_shadow.png";
+//tinyIcon.iconSize = new google.maps.Size(10, 10);
+//tinyIcon.shadowSize = new google.maps.Size(10, 10);
+//tinyIcon.iconAnchor = new google.maps.Point(5, 5);
+//tinyIcon.infoWindowAnchor = new google.maps.Point(5, 1);
+
+  toggleLabel(\'NetworkLinks\');
+  toggleLabel(\'NetworkDevices\');';
+
+      $Output .= '
+       }
+    }
+
+function toggleLabel(id)
+{
+  var ele = document.getElementById(id);
+  ele.checked = !ele.checked;
+  ele.onclick( );
+}
+
+    function UpdateNetworkLinks()
+    {
+      if ((document.getElementById("NetworkLinks")).checked == true)
+      {
+        NetworkLinks = [';
+    $DbResult = $this->Database->query('SELECT * FROM `NetworkLink` WHERE (`Interface1` <> 0) AND (`Interface2` <> 0)');
+    while($Link = $DbResult->fetch_assoc())
+    {
+      $DbResult2 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
+        'JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
+        'WHERE `NetworkDevice`.`Id` = (SELECT `NetworkInterface`.`Device` FROM `NetworkInterface` WHERE `NetworkInterface`.`Id` = '.$Link['Interface1'].')');
+      $DbResult3 = $this->Database->query('SELECT `NetworkDevice`.`Used`, `MapPosition`.`Pos` FROM `NetworkDevice` '.
+        'JOIN `MapPosition` ON `MapPosition`.`Id` = `NetworkDevice`.`MapPosition` '.
+        'WHERE `NetworkDevice`.`Id` = (SELECT `NetworkInterface`.`Device` FROM `NetworkInterface` WHERE `NetworkInterface`.`Id` = '.$Link['Interface2'].')');
+      if(($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
+      {
+        $Device1 = $DbResult2->fetch_assoc();
+        $Pos1 = explode(';', $Device1['Pos']);
+        $Device2 = $DbResult3->fetch_assoc();
+        $Pos2 = explode(';', $Device2['Pos']);
+        if(($Device1['Used'] == 1) and ($Device2['Used'] == 1))
+          $Output .= 'new google.maps.Polyline([new google.maps.LatLng('.$Pos1[0].', '.
+        $Pos1[1].'),new google.maps.LatLng('.$Pos2[0].', '.$Pos2[1].')], "#4F4FBF", 3, 0.8), ';
       }
     }
@@ -148 +201 @@
     {
       $Pos = explode(';', $Device['Pos']);
-      $Output .= 'new GMarker(new GLatLng('.$Pos[0].', '.
-      $Pos[1].'), {title: "'.$Device['NodeName'].': '.$Device['Name'].'", icon:tinyIcon }), ';
+      $Output .= 'new google.maps.Marker(new google.maps.LatLng('.$Pos[0].', '.
+      $Pos[1].'), {title: "'.$Device['NodeName'].': '.$Device['Name'].'", icon:\'point.gif\' }), ';
     }
     $Output .= '];
@@ -182 +235 @@
                   </tr>
                 </table>';
+    */
     return($Output);
   }