Changeset 17653


Ignore:
Timestamp:
08/29/12 03:42:35 (7 years ago)
Author:
grum
Message:

bug:2710
bug:2731

Location:
extensions/GMaps
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/GMaps/gmaps_pip.class.inc.php

    r16011 r17653  
    369369 
    370370      // check if there is picture with gps tag in the selected category 
    371       $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS maxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS minValue 
     371      $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS cMaxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS cMinValue 
    372372            FROM (((".USER_CACHE_CATEGORIES_TABLE." pucc 
    373373              LEFT JOIN ".CATEGORIES_TABLE." pct ON pucc.cat_id = pct.id) 
     
    385385      if(count($page['items'])==0) return(false); 
    386386      // 'tags' 
    387       $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS maxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS minValue 
     387      $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS cMaxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS cMinValue 
    388388            FROM ".$prefixeTable."amd_images_tags pait 
    389389                  LEFT JOIN ".$prefixeTable."amd_used_tags paut ON pait.numId = paut.numId 
     
    400400      $this->buildMapList(0, 'C', self::ID_MODE_CATEGORY); 
    401401      // check if there is picture with gps tag in the selected category 
    402       $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS maxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS minValue 
     402      $sql="SELECT paut.tagId, MAX(CAST(pait.value AS DECIMAL(20,17))) AS cMaxValue, MIN(CAST(pait.value AS DECIMAL(20,17))) AS cMinValue 
    403403            FROM (((".USER_CACHE_CATEGORIES_TABLE." pucc 
    404404              LEFT JOIN ".CATEGORIES_TABLE." pct ON pucc.cat_id = pct.id) 
     
    427427          { 
    428428            case 'magic.GPS.LatitudeNum': 
    429               $this->category['bounds']['N']=$row['maxValue']; 
    430               $this->category['bounds']['S']=$row['minValue']; 
     429              $this->category['bounds']['N']=$row['cMaxValue']; 
     430              $this->category['bounds']['S']=$row['cMinValue']; 
    431431              break; 
    432432            case 'magic.GPS.LongitudeNum': 
    433               $this->category['bounds']['E']=$row['maxValue']; 
    434               $this->category['bounds']['W']=$row['minValue']; 
     433              $this->category['bounds']['E']=$row['cMaxValue']; 
     434              $this->category['bounds']['W']=$row['cMinValue']; 
    435435              break; 
    436436          } 
  • extensions/GMaps/gmaps_root.class.inc.php

    r16011 r17653  
    212212        if($id!=0) 
    213213        { 
    214           $sql.=" AND (pgcm.categoryId ='$id' or pct.id!='$id' AND pgcm.applySubCat='y') "; 
     214          $sql.=" AND (pgcm.categoryId ='$id' OR pgcm.applySubCat='y' AND FIND_IN_SET('$id', pct.uppercats)!=0) "; 
    215215        } 
    216216        else 
  • extensions/GMaps/gmaps_version.inc.php

    r15345 r17653  
    1515  if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 
    1616 
    17   define('GMAPS_VERSION',  '1.4.0'); 
    18   define('GMAPS_VERSION2', '01.04.00'); 
     17  define('GMAPS_VERSION',  '1.4.1'); 
     18  define('GMAPS_VERSION2', '01.04.01'); 
    1919  define('GMAPS_GPC_NEEDED', '3.5.2'); 
    2020  define('GMAPS_AMD_NEEDED', '0.7.0'); //advanced metadata plugin is needed 
  • extensions/GMaps/main.inc.php

    r16457 r17653  
    22/* 
    33Plugin Name: GMaps 
    4 Version: 1.4.0 
     4Version: 1.4.1 
    55Description: Display and manage (google) maps 
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=454 
     
    125125|         |            |   . Compatibility with Piwigo 2.4 
    126126|         |            | 
     127| 1.4.1   | 2012-08-29 | * mantis bug:2731 
     128|         |            |   . Association between album and map are not always respected 
    127129|         |            | 
     130|         |            | * mantis bug:2710 
     131|         |            |   . Incompatibiliy with some MySQL version 
    128132|         |            | 
    129133|         |            | 
Note: See TracChangeset for help on using the changeset viewer.