Changeset 7479 for extensions/GMaps/gmaps_root.class.inc.php

Timestamp:

Oct 29, 2010, 3:01:40 PM (13 years ago)

Author:

grum

Message:

implement feature:1950

File:

• extensions/GMaps/gmaps_root.class.inc.php (modified) (4 diffs)

extensions/GMaps/gmaps_root.class.inc.php

@@ -21 +21 @@
     protected $css;
     protected $maps=array();
+    protected $forceDisplay=0;
 
     /**
@@ -196 +197 @@
 
       $this->maps=array();
+      $this->forceDisplay=0;
 
       if($page=='C')
@@ -217 +219 @@
               pgmm.mapType, pgmm.mapTypeControl, pgmm.scaleControl, pgmm.streetViewControl,
               pgmm.navigationControl, pgmm.style, pgmm.zoomLevelMaxActivated,
-              IF(pgcm.categoryId=0, 0, pct.global_rank) AS priorityRank
+              IF(pgcm.categoryId=0, 0, pct.global_rank) AS priorityRank,
+              pgcm.forceDisplay
             FROM ((".$this->tables['category_maps']." pgcm
                   LEFT JOIN ".$this->tables['maps']." pgmm ON pgcm.mapId = pgmm.id)
@@ -278 +281 @@
               $this->maps[]=$row;
               $displayType[$row['displayType']]=false;
+              if($row['forceDisplay']=='y' and ($row['kmlFileUrl']!='' or $row['kmlFileId']!=0)) $this->forceDisplay++;
             }
           }