Changeset 7128 for extensions/GMaps/gmaps_ajax.php

Timestamp:

Oct 8, 2010, 3:02:29 AM (14 years ago)

Author:

grum

Message:

Connect the plugin to the RBuilder component + fixe some small bugs

File:

• extensions/GMaps/gmaps_ajax.php (modified) (7 diffs)

extensions/GMaps/gmaps_ajax.php

@@ -72 +72 @@
 
            $_REQUEST['ajaxfct']=='public.maps.init' or
-           $_REQUEST['ajaxfct']=='public.maps.getMarkers' or
-           $_REQUEST['ajaxfct']=='public.maps.getMarkerInfos'
+           $_REQUEST['ajaxfct']=='public.maps.getMarkers' //or
+           //$_REQUEST['ajaxfct']=='public.maps.getMarkerInfos'
            )) $_REQUEST['ajaxfct']='';
 
@@ -234 +234 @@
               $_REQUEST['ajaxfct']='';
             }
+            else
+            {
+              if(!isset($_REQUEST['datas']['levelInfo'])) $_REQUEST['datas']['levelInfo']=1;
+
+              if(!($_REQUEST['datas']['levelInfo']==0 or
+                   $_REQUEST['datas']['levelInfo']==1)) $_REQUEST['datas']['levelInfo']=1;
+            }
           }
         }
@@ -246 +253 @@
             $_REQUEST['ajaxfct']='';
           }
+
+
         }
 
@@ -787 +796 @@
      *                       'width' : width of maps in pixels
      *                       'height' : height of maps in pixels
+     *                       'levelInfo' : 0 = don't return pictures info (name, url, ...)
+     *                                     1 = return pictures informations
      * @return Array|String : a JSON string of an array of points (nbPictures, lat, lng)
      */
@@ -793 +804 @@
       global $user, $page;
 
-      $returned=array();
+      $returned=array(
+        'markers' => array(),
+        'datas' => array(
+          'nbPhotos' => 0
+        )
+      );
 
       /*
@@ -907 +923 @@
         {
           $coords=array(
-            'nbImagesTxt' => '',
+            'nbImgTxt' => '',
             'nbImages' => 0,
-            'latitude' => 0,
-            'longitude' => 0,
-            'imagesTnFile' => array(),
-            'imagesCatsNames' => array(),
-            'imagesName' => array(),
-            'imagesCatsUrl' => array(),
+            'lat' => 0,                   // 'lat' rather than 'latitude'
+            'lng' => 0,                   // 'lng' rather than 'longitude'
+            'imgTn' => array(),
+            'imgCatsNames' => array(),
+            'imgName' => array(),
+            'imgCatsUrl' => array(),
           );
 
@@ -938 +954 @@
             }
 
+            if(count($tmpCatsId)<=1) $tmpCatsNames='';
+
             $coords['nbImages']++;
-            $coords['latitude']+=$point['latitude'];
-            $coords['longitude']+=$point['longitude'];
-            $coords['imagesTnFile'][]=$point['imageTnFile'];
-            $coords['imagesCatsNames'][]=$tmpCatsNames;
-            $coords['imagesName'][]=$point['imageName'];
-            $coords['imagesCatsUrl'][]=$tmpCatsUrl;
-          }
-          $coords['latitude']=$coords['latitude']/count($group);
-          $coords['longitude']=$coords['longitude']/count($group);
-          $coords['uniqueId']=md5($coords['latitude'].$coords['latitude']);
+
+            $coords['lat']+=$point['latitude'];
+            $coords['lng']+=$point['longitude'];
+
+            if($datas['levelInfo']==1)
+            {
+              $coords['imgTn'][]=substr($point['imageTnFile'],12);
+              $coords['imgCatsNames'][]=$tmpCatsNames;
+              $coords['imgName'][]=$point['imageName'];
+              $coords['imgCatsUrl'][]=$tmpCatsUrl;
+            }
+          }
+          $coords['lat']=$coords['lat']/count($group);
+          $coords['lng']=$coords['lng']/count($group);
+          $coords['uniqueId']=md5($coords['lat'].$coords['lng']);
 
           if($coords['nbImages']==1)
           {
-            $coords['nbImagesTxt']=l10n('gmaps_1_picture');
+            $coords['nbImgTxt']=l10n('gmaps_1_picture');
           }
           else
           {
-            $coords['nbImagesTxt']=sprintf(l10n('gmaps_nb_pictures'), $coords['nbImages']);
-          }
-
-          $returned[]=$coords;
-        }
+            $coords['nbImgTxt']=sprintf(l10n('gmaps_nb_pictures'), $coords['nbImages']);
+          }
+
+
+
+          $returned['markers'][]=$coords;
+          $returned['datas']['nbPhotos']+=$coords['nbImages'];
+        }
+      }
+
+      if($returned['datas']['nbPhotos']>1)
+      {
+        $returned['datas']['nbPhotos']=sprintf(l10n('gmaps_nb_pictures'), $returned['datas']['nbPhotos']);
+      }
+      else
+      {
+        $returned['datas']['nbPhotos']=l10n('gmaps_1_picture');
       }