Changeset 7128

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

Location:

extensions/GMaps

Files:

• gmaps.css (modified) (1 diff)
• gmaps2.css (modified) (1 diff)
• gmaps_aip.class.inc.php (modified) (3 diffs)
• gmaps_ajax.php (modified) (7 diffs)
• gmaps_install.class.inc.php (modified) (1 diff)
• gmaps_pip.class.inc.php (modified) (4 diffs)
• gmaps_rb_callback.class.inc.php (added)
• gmaps_root.class.inc.php (modified) (1 diff)
• js/gmapsCategory.js (modified) (8 diffs)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• templates/gmaps_category.tpl (modified) (1 diff)
• templates/gmaps_dialog_area_choose.tpl (added)
• templates/gmaps_picture_icon.tpl (modified) (1 diff)

extensions/GMaps/gmaps.css

@@ -51 +51 @@
 }
 
-
+#iDialogGMapNfo {
+  height:18px;
+  margin:5px 5px 0 60px;
+  text-align:left;
+}
+#iDialogGMapNfo span {
+  position:relative;
+  top:-3px;
+  margin-left:3px;
+}
+#iDialogGMapWaiting {
+  position:absolute;
+  z-index:1500;
+  background:#000000;
+  opacity:0.55;
+  filter:alpha(opacity:55);
+}

extensions/GMaps/gmaps2.css

@@ -118 +118 @@
 }
 
+#gmapsNbPhotos {
+  font-size:80%;
+  font-weight:normal;
+  margin-left:3px;
+  position:relative;
+  top:-3px;
+}
+#gmapsLoading {
+  background:none repeat scroll 0 0 #FFFFFF;
+  position:absolute;
+  top:0;
+  width:90%;
+}
+#gmapsLoading span {
+  margin-left:3px;
+  position:relative;
+  top:-3px;
+}
 
+#iDialogGMapWaiting {
+  position:absolute;
+  z-index:1500;
+  background:#000000;
+  opacity:0.55;
+  filter:alpha(opacity:55);
+}

extensions/GMaps/gmaps_aip.class.inc.php

@@ -53 +53 @@
     $this->tabsheet->add('kml_files',
                           l10n('gmaps_kml_files_management'),
-                          $this->getAdminLink()."&fGMaps_tabsheet=kml_files");
+                          $this->getAdminLink()."&fGMaps_tabsheet=kml_files"); */
     $this->tabsheet->add('search',
                           l10n('gmaps_search'),
                           $this->getAdminLink()."&fGMaps_tabsheet=search");
-    $this->tabsheet->add('help',
+/*    $this->tabsheet->add('help',
                           l10n('gmaps_help'),
                           $this->getAdminLink()."&fGMaps_tabsheet=help");
@@ -74 +74 @@
   public function initEvents()
   {
+    parent::initEvents();
+
+    if($_REQUEST['fGMaps_tabsheet']=='search')
+    {
+      // load request builder JS only on the search page
+      GPCRequestBuilder::loadJSandCSS();
+    }
     add_event_handler('loc_end_page_header', array(&$this->css, 'applyCSS'));
     GPCCss::applyGpcCss();
-
-    parent::initEvents();
   }
 
@@ -254 +259 @@
     global $template;
 
-    /*$template->set_filename('body_page',
-                dirname($this->getFileLocation()).'/admin/plugin_admin_maps.tpl');
-
-
-    $template->assign_var_from_handle('GMAPS_BODY_PAGE', 'body_page');*/
+    $template->set_filename('body_page',
+                dirname($this->getFileLocation()).'/admin/gmaps_search.tpl');
+
+    $template->assign('gmaps_search_page', GPCRequestBuilder::displaySearchPage($this->getPluginName()));
+
+    $template->assign_var_from_handle('GMAPS_BODY_PAGE', 'body_page');
   }
 

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');
       }
 

extensions/GMaps/gmaps_install.class.inc.php

@@ -130 +130 @@
 
       GPCCore::register($this->getPluginName(), GMAPS_VERSION, GMAPS_GPC_NEEDED);
+      GPCRequestBuilder::register($this->getPluginName(), dirname($this->getFileLocation()).'/gmaps_rb_callback.class.inc.php');
       return('');
     }

extensions/GMaps/gmaps_pip.class.inc.php

@@ -209 +209 @@
       lang:{
         boundmap:'".l10n('gmaps_i_boundmap')."',
-        boundkml:'".l10n('gmaps_i_boundkml')."'
+        boundkml:'".l10n('gmaps_i_boundkml')."',
+        loading:'".l10n('gmaps_loading')."'
       },
       requestId:'',
@@ -246 +247 @@
     if($this->picture['geolocated']==false) return(false);
 
-    if(count($this->picture['content']['MP'])>0)
+    if(isset($this->picture['content']['MP']) and count($this->picture['content']['MP'])>0)
     {
       // there is maps in meta display mode
@@ -270 +271 @@
     }
 
-    if(count($this->picture['content']['IP'])>0)
+    if(isset($this->picture['content']['IP']) and count($this->picture['content']['IP'])>0)
     {
       // there is maps in icon display mode
@@ -361 +362 @@
         'height' => $map['height'],
         'style' => $map['style'],
-        'mode' => $map['displayType']
+        'displayType' => $map['displayType']
       );
 

extensions/GMaps/gmaps_root.class.inc.php

@@ -276 +276 @@
   } //class
 
+
+
+class GMaps_functions
+  {
+    static private $tables = Array();
+    static private $config = Array();
+
+    /**
+     * initialise the class
+     *
+     * @param String $prefixeTable : the piwigo prefixe used on tables name
+     * @param String $pluginNameFile : the plugin name used for tables name
+     */
+    static public function init($prefixeTable)
+    {
+      GPCCore::loadConfig(GMaps_root::$pluginNameFile, self::$config);
+      $list=GMaps_root::$pluginTables;
+
+      for($i=0;$i<count($list);$i++)
+      {
+        self::$tables[$list[$i]]=$prefixeTable.GMaps_root::$pluginNameFile.'_'.$list[$i];
+      }
+    }
+
+
+    /**
+     *  return all HTML&JS code necessary to display a dialogbox to choose
+     *  geographic area
+     */
+    static public function dialogBoxGMaps()
+    {
+      global $template;
+
+      $template->set_filename('gmaps_choose',
+                    dirname(__FILE__).'/templates/gmaps_dialog_area_choose.tpl');
+
+      $datas=Array();
+
+      $template->assign('datas', $datas);
+
+      return($template->parse('gmaps_choose', true));
+    }
+
+    /**
+     * convert a decimal degree to D°M'S'
+     *
+     * @param Float $value : the value to convert
+     * @return String : value converted in DMS
+     */
+    static public function DDtoDMS($value)
+    {
+      $degrees=(int)$value;
+      $value=($value-$degrees)*60;
+      $minutes=(int)$value;
+      $seconds=($value-$minutes)*60;
+
+      return(sprintf('%d° %d\' %.2f"', $degrees, $minutes, $seconds));
+    }
+
+  } //GMaps_functions
+
+
+
 ?>

extensions/GMaps/js/gmapsCategory.js

@@ -65 +65 @@
     width:$(map.getDiv()).width(),
     height:$(map.getDiv()).height(),
-    distanceTreshold:25
+    distanceTreshold:20
   }
 
   currentMapLoad=map;
+
+  $('#gmapsLoading').css('display', 'inline-block');
+  $('#gmapsNbPhotos').html('');
+  $('#iDialogGMapWaiting').css(
+    {
+      width:$('#iGMapsIcon').width()+'px',
+      height:$('#iGMapsIcon').height()+'px',
+      top:$('#iGMapsIcon').position().top+'px',
+      left:$('#iGMapsIcon').position().left+'px',
+      display:'block'
+    }
+  );
 
   $.ajax(
@@ -80 +92 @@
         {
           tmp=$.parseJSON(msg);
-          tmp.sort(compareMarkers);
-          applyMarkers(currentMapLoad, tmp);
+          tmp.markers.sort(compareMarkers);
+          applyMarkers(currentMapLoad, tmp.markers);
+          $('#gmapsLoading').css('display', 'none');
+          $('#gmapsNbPhotos').html('['+tmp.datas.nbPhotos+']');
+          $('#iDialogGMapWaiting').css('display', 'none');
         }
     }
@@ -128 +143 @@
     var marker = new google.maps.Marker(
       {
-        position:new google.maps.LatLng(markers[i].latitude, markers[i].longitude),
+        position:new google.maps.LatLng(markers[i].lat, markers[i].lng),
         map: currentMapLoad,
-        title:markers[i].nbImagesTxt
+        title:markers[i].nbImgTxt
       }
     );
@@ -204 +219 @@
 {
   gmaps.currentInfo.displayed=index;
-  if(gmaps.currentInfo.imagesName[index]=='')
+  if(gmaps.currentInfo.imgName[index]=='')
   {
     $('#ciGMIWC_title').html(' ');
@@ -210 +225 @@
   else
   {
-    $('#ciGMIWC_title').html(gmaps.currentInfo.imagesName[index]);
-  }
-  $('#ciGMIWC_img').attr('src', gmaps.currentInfo.imagesTnFile[index]);
+    $('#ciGMIWC_title').html(gmaps.currentInfo.imgName[index]);
+  }
+  $('#ciGMIWC_img').attr('src', './galleries/'+gmaps.currentInfo.imgTn[index]);
 
   $('#ciGMIWC_img').unbind();
-  if(gmaps.currentInfo.imagesCatsUrl[index].length==1)
+  if(gmaps.currentInfo.imgCatsUrl[index].length==1)
   {
     $('#ciGMIWC_img').bind('click',
       function ()
       {
-        window.location=gmaps.currentInfo.imagesCatsUrl[gmaps.currentInfo.displayed][0];
+        window.location=gmaps.currentInfo.imgCatsUrl[gmaps.currentInfo.displayed][0];
       }
     );
@@ -227 +242 @@
   {
     $('#ciGMIWC_showcatList').html('');
-    for(var i=0;i<gmaps.currentInfo.imagesCatsUrl[index].length;i++)
+    for(var i=0;i<gmaps.currentInfo.imgCatsUrl[index].length;i++)
     {
       $('#ciGMIWC_showcatList')
-        .append('<li><a href="'+gmaps.currentInfo.imagesCatsUrl[index][i]+'">'+gmaps.currentInfo.imagesCatsNames[index][i]+'</a></li>');
+        .append('<li><a href="'+gmaps.currentInfo.imgCatsUrl[index][i]+'">'+gmaps.currentInfo.imgCatsNames[index][i]+'</a></li>');
     }
     $('#ciGMIWC_img, #ciGMIWC_showcat')
@@ -239 +254 @@
   if(gmaps.currentInfo.nbImages>1)
   {
-    $('#ciGMIWC_picnum').html((index+1)+'/'+gmaps.currentInfo.nbImagesTxt);
+    $('#ciGMIWC_picnum').html((index+1)+'/'+gmaps.currentInfo.nbImgTxt);
     $('#ciWALeft, #ciWARight').css('display', 'inline-block');
   }
   else
   {
-    $('#ciGMIWC_picnum').html(gmaps.currentInfo.nbImagesTxt);
+    $('#ciGMIWC_picnum').html(gmaps.currentInfo.nbImgTxt);
     $('#ciWALeft, #ciWARight').css('display', 'none');
   }
@@ -416 +431 @@
       }
 
+      $('div.gmapsPopup div.ui-dialog-titlebar')
+      .append('<span id="gmapsLoading" style="display:none;"><img src="./plugins/GrumPluginClasses/icons/processing.gif"><span>'+gmaps.lang.loading+'</span></span>');
+
+      $('#ui-dialog-title-iGMapsIconContent')
+      .append('<span id="gmapsNbPhotos"></span>');
+
 
     }

extensions/GMaps/language/fr_FR/plugin.lang.php

@@ -121 +121 @@
 $lang['gmaps_i_show_this_picture_in']="Voir cette photo dans la catégorie :";
 
+$lang['gmaps_north']="Nord";
+$lang['gmaps_south']="Sud";
+$lang['gmaps_east']="Est";
+$lang['gmaps_west']="Ouest";
+$lang['gmaps_add_geographic_area']="Ajouter une zone géographique";
+$lang['gmaps_choose_geographic_area']="Sélectionner la zone géographique";
+$lang['gmaps_search_by_geographic_area']="Effectuer une recherche par zone géographique";
+$lang['gmaps_geographic_coords_between']="Les coordonnées géographiques sont situées entre :";
+$lang['gmaps_of_lat']="de latitude";
+$lang['gmaps_of_lng']="de longitude";
+$lang['gmaps_and']="et";
+
+
 ?>

extensions/GMaps/templates/gmaps_category.tpl

@@ -8 +8 @@
   <div id='iGMapsIconContent' style='display:none;'>
       <div id='iGMapsIcon' style='width:{$map.width}px;height:{$map.height}px;{$map.style}'></div>
+      <div id='iDialogGMapWaiting' style="display:none;"></div>
   </div>
 {/foreach}

extensions/GMaps/templates/gmaps_picture_icon.tpl

@@ -7 +7 @@
 <div id='iGMapsIconContent' style='display:none;'>
     <div id='iGMapsIcon' style='width:{$map.width}px;height:{$map.height}px;{$map.style}'></div>
+    <div id='iDialogGMapWaiting' style="display:none;"></div>
 </div>