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

Timestamp:

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

Author:

grum

Message:

implement feature:1950

File:

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

extensions/GMaps/gmaps_pip.class.inc.php

@@ -18 +18 @@
 class GMaps_PIP extends GMaps_root
 {
-  protected $maps = array(); //list of maps
   protected $category=array(
     'id' => 0,
@@ -36 +35 @@
   protected $picture=array(
     'geolocated' => false,
+    'forceDisplay' => false,
     'coords' => array('lat' => 0, 'lng' => 0),
     'content' => array(
@@ -155 +155 @@
           }
 
-          if($nb>0)
+          if($nb>0 or $this->forceDisplay>0)
           {
             /*
@@ -163 +163 @@
             foreach($this->maps as $keyMap => $map)
             {
-              $scripts[]="
+              if($nb>0 or
+                 $map['forceDisplay']=='y' and ($map['kmlFileUrl']!='' or $map['kmlFileId']!=0)
+                )
               {
-                id:'iGMapsIcon',
-                zoomLevel:".$map['zoomLevel'].",
-                markerImg:'".$map['marker']."',
-                mapType:'".$map['mapType']."',
-                mapTypeControl:'".$map['mapTypeControl']."',
-                navigationControl:'".$map['navigationControl']."',
-                scaleControl:'".$map['scaleControl']."',
-                streetViewControl:'".$map['streetViewControl']."',
-                kmlFileUrl:'".$map['kmlFileUrl']."',
-                displayType:'".$map['displayType']."',
-                sizeMode:'".$map['sizeMode']."',
-                title:'".addslashes( ($map['title']=='')?l10n('gmaps_geolocation'):$map['title']  )."',
-                markers:[],
-                fitToBounds:true,
-                zoomLevelMaxActivated:".($map['zoomLevelMaxActivated']=='y'?'true':'false')."
-              }";
-
-              preg_match('/^i(\d+)x(\d+).*/i', basename($map['icon']), $result);
-              $this->category['icon']['iconStyle']=$map['iconStyle'];
-              $this->category['icon']['file']=$map['icon'];
-              $this->category['icon']['width']=isset($result[1])?$result[1]:-1;
-              $this->category['icon']['height']=isset($result[2])?$result[2]:-1;
+                $scripts[]="
+                {
+                  id:'iGMapsIcon',
+                  zoomLevel:".$map['zoomLevel'].",
+                  markerImg:'".$map['marker']."',
+                  mapType:'".$map['mapType']."',
+                  mapTypeControl:'".$map['mapTypeControl']."',
+                  navigationControl:'".$map['navigationControl']."',
+                  scaleControl:'".$map['scaleControl']."',
+                  streetViewControl:'".$map['streetViewControl']."',
+                  kmlFileUrl:'".$map['kmlFileUrl']."',
+                  displayType:'".$map['displayType']."',
+                  sizeMode:'".$map['sizeMode']."',
+                  title:'".addslashes( ($map['title']=='')?l10n('gmaps_geolocation'):$map['title']  )."',
+                  markers:[],
+                  fitToBounds:true,
+                  zoomLevelMaxActivated:".($map['zoomLevelMaxActivated']=='y'?'true':'false')."
+                }";
+
+                preg_match('/^i(\d+)x(\d+).*/i', basename($map['icon']), $result);
+                $this->category['icon']['iconStyle']=$map['iconStyle'];
+                $this->category['icon']['file']=$map['icon'];
+                $this->category['icon']['width']=isset($result[1])?$result[1]:-1;
+                $this->category['icon']['height']=isset($result[2])?$result[2]:-1;
+              }
             }
-
 
             $template->assign('maps', $this->maps);
@@ -209 +213 @@
   gmaps =
     {
+      geolocated:".($nb>0?'true':'false').",
+      forceDisplay:".($nb==0?'true':'false').",
       lang:{
         boundmap:'".l10n('gmaps_i_boundmap')."',
@@ -249 +255 @@
     global $page, $template;
 
-    if($this->picture['geolocated']==false) return(false);
+    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)
@@ -258 +264 @@
       $template->assign('maps', $this->picture['content']['MP']);
 
+      $metaTitle='';
+      foreach($this->picture['content']['MP'] as $map)
+      {
+        if($metaTitle=='') $metaTitle=$map['title'];
+      }
+
       $metadata=array
         (
-          'TITLE' => l10n('gmaps_geolocation'),
+          'TITLE' => ($metaTitle=='')?l10n('gmaps_geolocation'):$metaTitle,
           'lines' =>
             array(
@@ -296 +308 @@
   gmaps =
     {
+      geolocated:".($this->picture['geolocated']?'true':'false').",
+      forceDisplay:".($this->picture['forceDisplay']?'true':'false').",
       lang:{
         centermap:'".l10n('gmaps_i_centermap')."',
@@ -328 +342 @@
     global $template, $page;
 
+    $isGeolocated=true;
+
     if(is_null($jpegMD->getTag('magic.GPS.LatitudeNum')) or
        is_null($jpegMD->getTag('magic.GPS.LongitudeNum')) or
-       $page['section']!='categories') return(false);
-
-
-    $this->picture['geolocated']=true;
-    $this->picture['coords']['lat']=$jpegMD->getTag('magic.GPS.LatitudeNum')->getValue();
-    $this->picture['coords']['lng']=$jpegMD->getTag('magic.GPS.LongitudeNum')->getValue();
+       $page['section']!='categories') $isGeolocated=false;
 
 
@@ -347 +358 @@
     }
 
+    if($this->forceDisplay==0 and !$isGeolocated) return(false);
+
+    $this->picture['geolocated']=$isGeolocated;
+    $this->picture['forceDisplay']=!$isGeolocated;
+    if($isGeolocated)
+    {
+      $this->picture['coords']['lat']=$jpegMD->getTag('magic.GPS.LatitudeNum')->getValue();
+      $this->picture['coords']['lng']=$jpegMD->getTag('magic.GPS.LongitudeNum')->getValue();
+    }
+
 
     foreach($this->maps as $map)
     {
-      if($map['displayType']=='IP')
-      {
-        preg_match('/^i(\d+)x(\d+).*/i', basename($map['icon']), $result);
-        $this->picture['icon']=array(
-          'iconStyle' => $map['iconStyle'],
-          'file' => $map['icon'],
-          'width' => isset($result[1])?$result[1]:-1,
-          'height' => isset($result[2])?$result[2]:-1
+      if($isGeolocated or
+         $map['forceDisplay']=='y' and ($map['kmlFileUrl']!='' or $map['kmlFileId']!=0)
+        )
+      {
+        if($map['displayType']=='IP')
+        {
+          preg_match('/^i(\d+)x(\d+).*/i', basename($map['icon']), $result);
+          $this->picture['icon']=array(
+            'iconStyle' => $map['iconStyle'],
+            'file' => $map['icon'],
+            'width' => isset($result[1])?$result[1]:-1,
+            'height' => isset($result[2])?$result[2]:-1
+          );
+        }
+
+
+        $this->picture['content'][$map['displayType']][]=array(
+          'id' => $map['id'],
+          'width' => $map['width'],
+          'height' => $map['height'],
+          'style' => $map['style'],
+          'displayType' => $map['displayType'],
+          'title' => $map['title'],
         );
+
+        $this->picture['properties'][]="
+        {
+          id:'iGMaps".(($map['displayType']=='IP')?'Icon':$map['id'])."',
+          zoomLevel:".$map['zoomLevel'].",
+          markerImg:'".$map['marker']."',
+          mapType:'".$map['mapType']."',
+          mapTypeControl:'".$map['mapTypeControl']."',
+          navigationControl:'".$map['navigationControl']."',
+          scaleControl:'".$map['scaleControl']."',
+          streetViewControl:'".$map['streetViewControl']."',
+          kmlFileUrl:'".$map['kmlFileUrl']."',
+          displayType:'".$map['displayType']."',
+          sizeMode:'".$map['sizeMode']."',
+          title:'".addslashes( ($map['title']=='')?l10n('gmaps_geolocation'):$map['title']  )."'
+        }";
       }
-
-
-      $this->picture['content'][$map['displayType']][]=array(
-        'id' => $map['id'],
-        'width' => $map['width'],
-        'height' => $map['height'],
-        'style' => $map['style'],
-        'displayType' => $map['displayType']
-      );
-
-      $this->picture['properties'][]="
-      {
-        id:'iGMaps".(($map['displayType']=='IP')?'Icon':$map['id'])."',
-        zoomLevel:".$map['zoomLevel'].",
-        markerImg:'".$map['marker']."',
-        mapType:'".$map['mapType']."',
-        mapTypeControl:'".$map['mapTypeControl']."',
-        navigationControl:'".$map['navigationControl']."',
-        scaleControl:'".$map['scaleControl']."',
-        streetViewControl:'".$map['streetViewControl']."',
-        kmlFileUrl:'".$map['kmlFileUrl']."',
-        displayType:'".$map['displayType']."',
-        sizeMode:'".$map['sizeMode']."',
-        title:'".addslashes( ($map['title']=='')?l10n('gmaps_geolocation'):$map['title']  )."'
-      }";
     }
   }