Changeset 7139 for extensions/GMaps/gmaps_aip.class.inc.php

Timestamp:

Oct 9, 2010, 9:55:26 PM (14 years ago)

Author:

grum

Message:

add marker style management + minor bugs fixed

File:

• extensions/GMaps/gmaps_aip.class.inc.php (modified) (6 diffs)

extensions/GMaps/gmaps_aip.class.inc.php

@@ -27 +27 @@
   {
     parent::__construct($prefixeTable, $filelocation);
+
     $this->loadConfig();
     $this->configForTemplate();
@@ -36 +37 @@
 
     $this->tabsheet = new tabsheet();
-
 
     if($this->amdState!='advanced')
@@ -231 +231 @@
     $datas=Array(
       'urlRequest' => $this->getAdminLink('ajax'),
-      'cats' => $this->makeCategoriesTree(),
+      'cats' => $this->makeCategoryList(),
       'maps' => $this->makeMapsList(),
       'icons' => $this->makeIconsList(),
+      'markers' => $this->makeMarkersList(),
       'kmlFiles'  => $this->makeKmlFilesList()
     );
@@ -322 +323 @@
 
 
-  /**
-   * build the categories tree
-   * @return Array : an array, ready to use in the template
-   */
-  private function makeCategoriesTree()
+
+  /**
+   * build an ordered category list
+   * returns an array, each item is an array like :
+   *  'id'     => the category Id
+   *  'name'   => the category name
+   *  'rank'   => the category rank (global)
+   *  'level'  => the category level
+   *
+   * @return Array : the list
+   */
+  protected function makeCategoryList()
   {
     $returned=array(
       array(
-        'id' => 0,
-        'name' => '-- '.l10n('gmaps_applyForAllTheGallery').' --'
+        'id'     => 0,
+        'name'   => l10n('gmaps_applyForAllTheGallery'),
+        'rank'   => '0000',
+        'level'  => 0,
+        'status' => 'public',
+        'childs'  => false
       )
     );
 
-    $sql="SELECT id, name, global_rank
-          FROM ".CATEGORIES_TABLE."
-          ORDER BY global_rank";
-    $result = pwg_query($sql);
+    $sql="SELECT DISTINCT pct.id, pct.name, pct.global_rank AS rank
+          FROM ".CATEGORIES_TABLE." pct
+            JOIN (
+              SELECT DISTINCT pgat.cat_id AS catId FROM ".GROUP_ACCESS_TABLE." pgat
+              UNION DISTINCT
+              SELECT DISTINCT puat.cat_id AS catId FROM ".USER_ACCESS_TABLE." puat
+                 ) pat
+            ON (pat.catId = pct.id AND pct.status = 'private') OR (pct.status = 'public')
+          ORDER BY global_rank;";
+    $result=pwg_query($sql);
     if($result)
     {
-      while ($row = pwg_db_fetch_assoc($result))
+      while($row=pwg_db_fetch_assoc($result))
       {
-        $returned[]=array(
-          'id' => $row['id'],
-          'name' => str_repeat('  ', substr_count($row['global_rank'], '.')).$row['name']
-        );
+        $row['level']=1+substr_count($row['rank'], '.');
+
+        /* rank is in formated without leading zero, giving bad order
+         *  1
+         *  1.10
+         *  1.11
+         *  1.2
+         *  1.3
+         *  ....
+         *
+         *  this loop cp,vert all sub rank in four 0 format, allowing to order
+         *  categories easily
+         *  0001
+         *  0001.0010
+         *  0001.0011
+         *  0001.0002
+         *  0001.0003
+         */
+        $row['rank']=explode('.', $row['rank']);
+        foreach($row['rank'] as $key=>$rank)
+        {
+          $row['rank'][$key]=str_pad($rank, 4, '0', STR_PAD_LEFT);
+        }
+        $row['rank']=implode('.', $row['rank']);
+
+        $returned[]=$row;
       }
     }
 
+    usort($returned, array(&$this, 'compareCat'));
+
     return($returned);
-  } //makeCategoriesTree
+  }
+
+  /**
+   * used for sort comparison
+   * defined as public, but don't use it directly
+   *
+   * this function compare two categorie with their rank value
+   */
+  public function compareCat($catA, $catB)
+  {
+    if($catA['rank'] == $catB['rank'])
+    {
+      return(0);
+    }
+    return( ($catA['rank'] < $catB['rank'])?-1:1 );
+  }
 
 
@@ -400 +457 @@
       {
         $returned[]=array(
-          'type' => (strtolower(substr($file,0,1))=='i')?'img':'other',
           'file' => $file
         );
@@ -409 +465 @@
   } //makeIconsList
 
+
+  /**
+   * build the markers list
+   * @return Array : an array, ready to use in the template
+   */
+  private function makeMarkersList()
+  {
+    $returned=array();
+
+    $directory=scandir(GMAPS_PATH.'img/');
+    foreach($directory as $file)
+    {
+      $ext=(pathinfo($file, PATHINFO_EXTENSION));
+      if(preg_match('/^mS(\d\d)_(\d\d)\.png$/i', $file))
+      {
+        $returned[]=array(
+          'file' => $file
+        );
+      }
+    }
+
+    return($returned);
+  } //makeIconsList
 
   /**