Changeset 7482 for extensions/GMaps/gmaps_pip.class.inc.php

Timestamp:

Oct 29, 2010, 4:16:18 PM (14 years ago)

Author:

grum

Message:

Maps are not displayed if user navigate with tag
bug:1967

File:

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

extensions/GMaps/gmaps_pip.class.inc.php

@@ -103 +103 @@
     global $page, $prefixeTable, $template, $user, $conf;
 
-    if($page['section']=='categories')
+    if($page['section']=='categories' or $page['section']=='tags')
     {
       if(isset($page['category']))
@@ -109 +109 @@
         $this->category['id']=$page['category']['id'];
         $this->buildMapList($page['category']['id'], 'C');
-        $sqlCatRestrict="AND FIND_IN_SET(".$page['category']['id'].", pct.uppercats)!=0";
-      }
-      else
-      {
-        $this->category['id']=0;
-        $this->buildMapList(0, 'C');
-        $sqlCatRestrict="";
-      }
-
-      if(count($this->maps)>0)
-      {
-        $scripts=array();
 
         // check if there is picture with gps tag in the selected category
@@ -132 +120 @@
                AND (paut.tagId = 'magic.GPS.LatitudeNum' OR paut.tagId = 'magic.GPS.LongitudeNum')
                AND pic.image_id IS NOT NULL
-               $sqlCatRestrict
+               AND FIND_IN_SET(".$page['category']['id'].", pct.uppercats)!=0
                GROUP BY paut.tagId";
+      }
+      elseif(isset($page['items']))
+      {
+        if(count($page['items'])==0) return(false);
+        // 'tags'
+        $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS maxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS minValue
+              FROM ".$prefixeTable."amd_images_tags pait
+                    LEFT JOIN ".$prefixeTable."amd_used_tags paut ON pait.numId = paut.numId
+              WHERE (paut.tagId = 'magic.GPS.LatitudeNum' OR paut.tagId = 'magic.GPS.LongitudeNum')
+               AND pait.imageId IN (".implode(',', $page['items']).")
+               GROUP BY paut.tagId";
+        $this->category['id']=0;
+        $this->buildMapList(0, 'C');
+      }
+      else
+      {
+        // 'home'
+        $this->category['id']=0;
+        $this->buildMapList(0, 'C');
+        // check if there is picture with gps tag in the selected category
+        $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS maxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS minValue
+              FROM (((".USER_CACHE_CATEGORIES_TABLE." pucc
+                LEFT JOIN ".CATEGORIES_TABLE." pct ON pucc.cat_id = pct.id)
+                LEFT JOIN ".IMAGE_CATEGORY_TABLE." pic ON pic.category_id = pucc.cat_id)
+                LEFT JOIN ".$prefixeTable."amd_images_tags pait ON pait.imageId = pic.image_id)
+                LEFT JOIN ".$prefixeTable."amd_used_tags paut ON pait.numId = paut.numId
+              WHERE pucc.user_id = '".$user['id']."'
+               AND (paut.tagId = 'magic.GPS.LatitudeNum' OR paut.tagId = 'magic.GPS.LongitudeNum')
+               AND pic.image_id IS NOT NULL
+               GROUP BY paut.tagId";
+      }
+
+      if(count($this->maps)>0)
+      {
+        $scripts=array();
 
         $result=pwg_query($sql);
@@ -256 +279 @@
 
     if($this->picture['geolocated']==false and $this->picture['forceDisplay']==false) return(false);
-
     if(isset($this->picture['content']['MP']) and count($this->picture['content']['MP'])>0)
     {
@@ -340 +362 @@
   public function preparePictureMaps($jpegMD)
   {
-    global $template, $page;
+    global $template, $page, $user;
 
     $isGeolocated=true;
 
     if(is_null($jpegMD->getTag('magic.GPS.LatitudeNum')) or
-       is_null($jpegMD->getTag('magic.GPS.LongitudeNum')) or
-       $page['section']!='categories') $isGeolocated=false;
+       is_null($jpegMD->getTag('magic.GPS.LongitudeNum'))) $isGeolocated=false;
 
 
@@ -355 +376 @@
     else
     {
-      $this->buildMapList(0, 'P');
+      $sql="SELECT GROUP_CONCAT(pict.category_id)
+            FROM ".IMAGE_CATEGORY_TABLE." pict
+            WHERE pict.image_id=".$page['image_id'];
+      if($user['forbidden_categories']!='') $sql.=" AND pict.category_id NOT IN (".$user['forbidden_categories'].")";
+
+      $result=pwg_query($sql);
+      if($result)
+      {
+        while($row=pwg_db_fetch_row($result))
+        {
+          $cats=explode(',', $row[0]);
+        }
+      }
+
+      $cats[]=0;
+      $i=0;
+      while(count($this->maps)==0 and $i<count($cats))
+      {
+        $this->buildMapList($cats[$i], 'P');
+        $i++;
+      }
     }