Changeset 887 for trunk/Modules/Map

Timestamp:

Nov 20, 2020, 12:08:12 AM (4 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

Location:

trunk/Modules/Map

Files:

• Map.php (modified) (8 diffs)
• MapAPI.php (modified) (5 diffs)

trunk/Modules/Map/Map.php

@@ -5 +5 @@
 class PageNetworkMap extends Page
 {
-  var $FullTitle = 'Mapa sítě';
-  var $ShortTitle = 'Mapa sítě';
-  var $ParentClass = 'PagePortal';
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Mapa sítě';
+    $this->ShortTitle = 'Mapa sítě';
+    $this->ParentClass = 'PagePortal';
+  }
   //var $Load = 'initialize()';
   //var $Unload = 'GUnload()';
 
-  function Show()
-  {
-    if (!$this->System->User->CheckPermission('Map', 'Show'))
+  function Show(): string
+  {
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Map', 'Show'))
       return 'Nemáte oprávnění';
 
@@ -23 +27 @@
   }
 
-  function ShowPosition()
+  function ShowPosition(): string
   {
     $DbResult = $this->Database->select('MapPosition', '*', '`Id`='.$_GET['i']);
@@ -44 +48 @@
   }
 
-  function ShowMain()
+  function ShowMain(): string
   {
     $Map = new MapOpenStreetMaps($this->System);
@@ -242 +246 @@
 class TypeMapPosition extends TypeString
 {
-  function OnEdit($Item)
+  function OnEdit(array $Item): string
   {
     $Output = parent::OnEdit($Item);
@@ -255 +259 @@
 class ModuleMap extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -263 +267 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Show objects on Google maps';
-    $this->Dependencies = array('Network');
+    $this->Dependencies = array('Network', 'User');
     $this->SupportedModels = array();
   }
 
-  function DoStart()
+  function DoStart(): void
   {
     $this->System->Pages['map'] = 'PageNetworkMap';
@@ -310 +314 @@
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
     $this->System->Database->query("CREATE TABLE IF NOT EXISTS `MapPosition` (
@@ -320 +324 @@
   }
 
-  function DoUninstall()
+  function DoUninstall(): void
   {
     $this->Database->query('DROP TABLE `MapPosition`');

trunk/Modules/Map/MapAPI.php

@@ -3 +3 @@
 class MapMarker
 {
-  var $Position;
-  var $Text;
+  public array $Position;
+  public string $Text;
 }
 
 class MapPolyLine
 {
-  var $Points = array();
-  var $Color = 'black';
+  public array $Points = array();
+  public string $Color = 'black';
 }
 
 class Map extends Model
 {
-  var $Position;
-  var $Zoom;
-  var $Key;
+  public array $Position;
+  public int $Zoom;
+  public string $Key;
   var $OnClickObject;
-  var $MarkerText;
-  var $Markers;
-  var $PolyLines;
+  public string $MarkerText;
+  public array $Markers;
+  public array $PolyLines;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -35 +35 @@
   }
 
-  function Show()
+  function Show(): string
   {
     return '';
@@ -43 +43 @@
 class MapGoogle extends Map
 {
-  function ShowPage($Page)
+  function ShowPage(Page $Page): string
   {
     $Page->Load = 'initialize()';
@@ -113 +113 @@
 class MapOpenStreetMaps extends Map
 {
-  function GetPageHeader()
+  function GetPageHeader(): string
   {
     $Output = '<link rel="stylesheet" href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css"
@@ -124 +124 @@
   }
 
-  function ShowPage($Page)
+  function ShowPage(Page $Page): string
   {
     $this->System->PageHeaders[] = array($this, 'GetPageHeader');