Index: main/plugin-web/i18n/messages_en.xml
===================================================================
--- main/plugin-web/i18n/messages_en.xml	(revision 26840)
+++ main/plugin-web/i18n/messages_en.xml	(working copy)
@@ -1307,9 +1307,11 @@
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_XSLT_DESC">Select the display to use when displaying this service</message>
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_XSLT_LIST_LABEL">Ametys 3.2 compatibility mode</message>
     <message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_XSLT_LIST33_LABEL">Default</message>
+    <message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_XSLT_MAP_LIST_LABEL">List with map</message>
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_FRONT_PAGES">Pages:</message>
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_FRONT_PAGES_PRECEDE">Preceding</message>
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_FRONT_PAGES_NEXT">Next</message>
+    <message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_GEOCODE_LINK_SEE_MAP_LABEL">See on the map</message>
 	
 	<!-- FILTERED PAGES service -->
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_PAGES_LABEL">Pages digest</message>
@@ -1407,6 +1409,7 @@
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_XSLT_DESC">Select the display to use when displaying this service</message>
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_XSLT_SEARCH_LABEL">Ametys 3.2 compatibility mode</message>
     <message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_XSLT_SEARCH33_LABEL">Default</message>
+    <message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_XSLT_SEARCH_MAP_LABEL">Contents on a map</message>
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_ADVANCED_SEARCH">Advanced search</message>
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_ADVANCED_SEARCH_DESC">Check this box to display the advanced search (all words, exact phrase, any words).</message>
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_ON_DOCUMENTS">Documents</message>
Index: main/plugin-web/i18n/messages_fr.xml
===================================================================
--- main/plugin-web/i18n/messages_fr.xml	(revision 26840)
+++ main/plugin-web/i18n/messages_fr.xml	(working copy)
@@ -1308,9 +1308,11 @@
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_XSLT_DESC">Rendu à utiliser pour l'affichage du service</message>
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_XSLT_LIST_LABEL">Mode de compatibilité Ametys 3.2</message>
     <message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_XSLT_LIST33_LABEL">Par défaut</message>
+    <message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_XSLT_MAP_LIST_LABEL">Liste avec carte</message>
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_FRONT_PAGES">Pages :</message>
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_FRONT_PAGES_PRECEDE">Précédent</message>
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_FRONT_PAGES_NEXT">Suivant</message>
+    <message key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_GEOCODE_LINK_SEE_MAP_LABEL">Voir sur la carte</message>
 	
 	<!-- FILTERED PAGES service -->
 	<message key="PLUGINS_WEB_SERVICE_FILTERED_PAGES_LABEL">Remontée de pages</message>
@@ -1408,6 +1410,7 @@
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_XSLT_DESC">Rendu à utiliser pour l'affichage du service</message>
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_XSLT_SEARCH_LABEL">Mode de compatibilité Ametys 3.2</message>
     <message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_XSLT_SEARCH33_LABEL">Par défaut</message>
+    <message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_XSLT_SEARCH_MAP_LABEL">Contenus sur une carte</message>
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_ADVANCED_SEARCH">Recherche avancée</message>
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_ADVANCED_SEARCH_DESC">Cochez cette case pour afficher la recherche avancée (tous les mots, expression exacte, aucun des mots).</message>
 	<message key="PLUGINS_WEB_SERVICE_FRONT_SEARCH_ON_DOCUMENTS">Documents</message>
Index: main/plugin-web/resources/js/GmapViewer.js
===================================================================
--- main/plugin-web/resources/js/GmapViewer.js	(revision 26840)
+++ main/plugin-web/resources/js/GmapViewer.js	(working copy)
@@ -17,10 +17,7 @@
 function GmapViewer() 
 {
   
-  var mapId = '#gmap';
-  var data = null;
-  
-  return {    
+  return {
       
     addMarkers: function()
     {
@@ -39,10 +36,10 @@
     			animation: google.maps.Animation.DROP
     		},
     		icon: {
-    			image: this.pinImageUrl(record.icon, record.color)
+    			image: this.pinImageUrl(record.icon, record.color, record.letter)
     		},
-    		html:'&lt;div class="infowindow"&gt;&lt;span class="title"&gt;'+record.title+'&lt;/span&gt;&lt;p class="description"&gt;'+record.description+'&lt;/p&gt;&lt;/div&gt;'
-        });      
+    		html: this.renderHtmlTooltip(record.title, record.description)
+        });
     },
   
     addPolygons: function() 
@@ -60,54 +57,139 @@
     		options: {
     			fillColor: '#' + record.color,
     			strokeColor: '#' + record.color,
-    			html:'&lt;div class="infowindow"&gt;&lt;span class="title"&gt;'+record.title+'&lt;/span&gt;&lt;p class="description"&gt;'+record.description+'&lt;/p&gt;&lt;/div&gt;'          
+    			html: this.renderHtmlTooltip(record.title, record.description)
     		},
-    		html:'&lt;div class="infowindow"&gt;&lt;span class="title"&gt;'+record.title+'&lt;/span&gt;&lt;p class="description"&gt;'+record.description+'&lt;/p&gt;&lt;/div&gt;'
-        });      
+    		html: this.renderHtmlTooltip(record.title, record.description)
+        });
+    },
+    
+    renderHtmlTooltip: function(title, desc)
+    {
+    	return '<div class="infowindow"><span class="title">'+ title +'</span>'
+		+ '<p class="description">'+ (desc || '') +'</p>'
+		+ '</div>';
     },
       
-    pinImageUrl: function (name, color) 
+    pinImageUrl: function (name, color, letter) 
     {
     	var url = '';   
-    	if (name == 'pin' || name == '')
+    	if (letter || name == 'pin' || name == '')
     	{
-    		url = "https://chart.googleapis.com/chart?chst=d_map_pin_letter&amp;chld=|" + color;
+    		url = "https://chart.googleapis.com/chart?chst=d_map_pin_letter&chld=" + (letter || '') + '|' + color;
     	}
     	else
     	{
-    		 url = "https://chart.googleapis.com/chart?chst=d_map_pin_icon&amp;chld=" + name + "|" + color;   
+    		 url = "https://chart.googleapis.com/chart?chst=d_map_pin_icon&chld=" + name + "|" + color;
     	}
     	return url;
     },
     
-    setUp: function (mapIdentifier, gdata)
+    setUp: function (mapIdentifier, gdata, fitbounds)
     {
     	this.mapId = mapIdentifier;
     	this.data = gdata;
+    	this.enableFitbounds = !!fitbounds;
       
-    	if (this.data &amp;&amp; this.mapId)
+    	if (this.data && this.mapId)
     	{
-    		this.initMap(this.data.lat, this.data.lng, this.data.zoomLevel, this.data.mapTypeId);
+    		if (this.gmap)
+			{
+    			$j(this.mapId).gMap("removeAllMarkers");
+    			$j(this.mapId).gMap("removeAllPolygons");
+			}
+    		
+    		this.prepareFitbounds();
+    		this.gmap = this.initMap(this.data.lat, this.data.lng, this.data.zoomLevel, this.data.mapTypeId);
+    		
+    		this.fitbounds();
     		this.addMarkers();
     		this.addPolygons();
+    		
+
     	}
     },
   
     initMap: function (lat, lng, zoomLevel, mapTypeId)
     {
-    	if (this.mapId)
-    	{   
-    		$j(this.mapId).gMap({
-    			latitude: lat,
-    			longitude: lng,
-    			zoom:zoomLevel,
-    			maptype:mapTypeId,
-    			mapTypeControl:true,
-    		  	zoomControl:true,
-    		  	panControl:true,
-    		  	streetViewControl:false
-    		});
-    	}
+    	if (!this.mapId) return;
+    	
+    	var latitude = lat;
+    	var longitude = lng;
+    	var c;
+    	
+    	if (this.enableFitbounds && this.boundCount > 0)
+		{
+    		c = this.bounds.getCenter();
+    		latitude = c.lat();
+    		longitude = c.lng();
+		}
+		
+//    	if (!this.gmap)
+//    	{
+//    		console.log('???');
+    		
+			return $j(this.mapId).gMap({
+				latitude: latitude,
+				longitude: longitude,
+				zoom:zoomLevel,
+				maptype:mapTypeId,
+				mapTypeControl:true,
+			  	zoomControl:true,
+			  	panControl:true,
+			  	streetViewControl:false
+			});
+//    	}
+//    	else
+//		{
+//    		// do re-init...
+//    		// set center + zoomlevel
+//    		console.log('reinit map!!');
+//    		return this.gmap;
+//		}
+    },
+    
+    prepareFitbounds: function()
+    {
+    	if (!this.enableFitbounds)
+		{
+    		return;
+		}
+    	
+		this.bounds = new google.maps.LatLngBounds();
+		this.boundCount = 0;
+    	
+		var me = this;
+		
+    	// markers
+    	$j.each(this.data.markers, function (idx, elem) {
+    		me.bounds.extend(new google.maps.LatLng(elem.lat, elem.lng));
+    		me.boundCount++;
+    	});
+    	
+    	// polygons
+    	var p, pl, pi;
+    	$j.each(this.data.polygons, function (idx, elem) {
+    		p = elem.points;
+    		pl = p ? p.length : 0;
+    		
+	    	if (p)
+			{
+	    		for (var i = 0; i < pl; i++)
+				{
+	    			pi = p[i];
+	    			this.bounds.extend(new google.maps.LatLng(pi.lat, pi.lng));
+	    			this.boundCount++;
+				}
+			}
+    	});
+    },
+    
+    fitbounds: function()
+    {
+		if (this.enableFitbounds && this.boundCount >= 2)
+		{
+			this.gmap.data('$gmap').fitBounds(this.bounds);
+		}
     }
   }
 };
\ No newline at end of file

Property changes on: main\plugin-web\resources\js\GmapViewer.js
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: main/plugin-web/resources/js/jquery.gmap.js
===================================================================
--- main/plugin-web/resources/js/jquery.gmap.js	(revision 26840)
+++ main/plugin-web/resources/js/jquery.gmap.js	(working copy)
@@ -2,7 +2,7 @@
  * jQuery gMap v3
  *
  * @url         http://www.smashinglabs.pl/gmap
- * @author      Sebastian Poreba &lt;sebastian.poreba@gmail.com&gt;
+ * @author      Sebastian Poreba <sebastian.poreba@gmail.com>
  * @version     3.1.0
  * @date        23.04.2011
  */
@@ -68,7 +68,7 @@
                     // Check for map controls
                     if (opts.controls.length !== 0) {
                         // Add custom map controls
-                        for (var i = 0; i &lt; opts.controls.length; i+= 1) {
+                        for (var i = 0; i < opts.controls.length; i+= 1) {
                             $gmap.controls[opts.controls[i].pos].push(opts.controls[i].div);
                         }
                     }
@@ -118,9 +118,9 @@
 
             /**
              * Priorities order:
-             * - latitude &amp; longitude in options
+             * - latitude & longitude in options
              * - address in options
-             * - latitude &amp; longitude of first marker having it
+             * - latitude & longitude of first marker having it
              * - address of first marker having it
              * - failsafe (0,0)
              *
@@ -131,8 +131,8 @@
                 // Create new object to geocode addresses
 
                 var center, that = this; // 'that' scope fix in geocoding
-                if (opts.latitude &amp;&amp; opts.longitude) {
-                    // lat &amp; lng available, return
+                if (opts.latitude && opts.longitude) {
+                    // lat & lng available, return
                     center = new $googlemaps.LatLng(opts.latitude, opts.longitude);
                     return center;
                 } else {
@@ -155,10 +155,10 @@
                 }
 
                 // Check for a marker to center on (if no coordinates given)
-                if ($.isArray(opts.markers) &amp;&amp; opts.markers.length &gt; 0) {
+                if ($.isArray(opts.markers) && opts.markers.length > 0) {
                     var selectedToCenter = null;
-                    for (var i = 0; i &lt; opts.markers.length; i+= 1) {
-                        if (opts.markers[i].latitude &amp;&amp; opts.markers[i].longitude) {
+                    for (var i = 0; i < opts.markers.length; i+= 1) {
+                        if (opts.markers[i].latitude && opts.markers[i].longitude) {
                             selectedToCenter = opts.markers[i];
                             break;
                         }
@@ -172,7 +172,7 @@
                         return center;
                     }
 
-                    if (selectedToCenter.latitude &amp;&amp; selectedToCenter.longitude) {
+                    if (selectedToCenter.latitude && selectedToCenter.longitude) {
                         return new $googlemaps.LatLng(selectedToCenter.latitude, selectedToCenter.longitude);
                     }
 
@@ -266,7 +266,7 @@
                     var _gshadow = {
                         image: opts.icon.shadow,
                         iconSize: new $googlemaps.Size(opts.icon.shadowsize[0], opts.icon.shadowsize[1]),
-                        anchor: (_gicon &amp;&amp; _gicon.iconAnchor)?_gicon.iconAnchor:new $googlemaps.Point(opts.icon.iconanchor[0], opts.icon.iconanchor[1])
+                        anchor: (_gicon && _gicon.iconAnchor)?_gicon.iconAnchor:new $googlemaps.Point(opts.icon.iconanchor[0], opts.icon.iconanchor[1])
                     };
                 }
 
@@ -297,12 +297,12 @@
 
                     $googlemaps.event.addListener(gmarker, 'click', function() {
                         if (opts.log) {console.log('opening popup ' + marker.html);}
-                        if (opts.singleInfoWindow &amp;&amp; $data.infoWindow) {$data.infoWindow.close();}
+                        if (opts.singleInfoWindow && $data.infoWindow) {$data.infoWindow.close();}
                         infoWindow.open($gmap, gmarker);
                         $data.infoWindow = infoWindow;
                     });
                 }
-                if (marker.html &amp;&amp; marker.popup) {
+                if (marker.html && marker.popup) {
                     if (opts.log) {console.log('opening popup ' + marker.html);}
                     infoWindow.open($gmap, gmarker);
                 }
@@ -345,13 +345,13 @@
                 if (opts.log) {console.log("autozooming map");}
             
                 // get position from every marker and extend the "bounds" object with new coordinates
-                for (i = 0; i &lt; markers.length; i++) 
+                for (i = 0; i < markers.length; i++) 
                 {
                     bounds.extend(markers[i].getPosition()); 
                 }
             
                 // if there were markers, now fit the bounds of the map
-                if(i&gt;0){
+                if(i>0){
                     $map.fitBounds(bounds);
                 }
                 return this;
@@ -361,7 +361,7 @@
                 if (markers.length !== 0) {
                     if (opts.log) {console.log("adding " + markers.length +" markers");}
                     // Loop through marker array
-                    for (var i = 0; i &lt; markers.length; i+= 1) {
+                    for (var i = 0; i < markers.length; i+= 1) {
                         methods.addMarker.apply($(this),[markers[i]]);
                     }
                 }
@@ -438,7 +438,7 @@
             removeAllMarkers: function () {
                 var markers = this.data('gmap').markers, i;
 
-                for(i = 0; i &lt; markers.length; i += 1) {
+                for(i = 0; i < markers.length; i += 1) {
                     markers[i].setMap(null);
                 }
                 markers = [];
@@ -501,13 +501,13 @@
 
                       $googlemaps.event.addListener(gpolygon, 'click', function() {
                           if (opts.log) {console.log('opening popup ' + polygonOpts.html);}
-                          if (opts.singleInfoWindow &amp;&amp; $data.infoWindow) {$data.infoWindow.close();}
+                          if (opts.singleInfoWindow && $data.infoWindow) {$data.infoWindow.close();}
                           if (opts.log) {console.log(gpolygon)}
                           infoWindow.open($gmap);
                           $data.infoWindow = infoWindow;
                       });
                   }
-                  if (polygonOpts.html &amp;&amp; polygonOpts.popup) {
+                  if (polygonOpts.html && polygonOpts.popup) {
                       if (opts.log) {console.log('opening popup ' + gpolygon.html);}
                       infoWindow.open($gmap, gpolygon);
                   }
@@ -517,7 +517,7 @@
             removeAllPolygons: function () {
                 var polygons = this.data('gmap').polygons, i;
 
-                for(i = 0; i &lt; polygons.length; i += 1) {
+                for(i = 0; i < polygons.length; i += 1) {
                     polygons[i].setMap(null);
                 }
                 polygons = [];
@@ -565,8 +565,8 @@
 
         singleInfoWindow:        true,
 
-        html_prepend:            '&lt;div class="gmap_marker"&gt;',
-        html_append:             '&lt;/div&gt;',
+        html_prepend:            '<div class="gmap_marker">',
+        html_append:             '</div>',
         icon: {
             image:               "http://www.google.com/mapfiles/marker.png",
             iconsize:            [20, 34],

Property changes on: main\plugin-web\resources\js\jquery.gmap.js
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: main/plugin-web/pages/services/filtered-contents/map-list.xml
===================================================================
--- main/plugin-web/pages/services/filtered-contents/map-list.xml	(revision 0)
+++ main/plugin-web/pages/services/filtered-contents/map-list.xml	(revision 0)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2014 Anyware Services
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   -->
+<service>
+	<label i18n="true">PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_XSLT_MAP_LIST_LABEL</label>
+</service>
\ No newline at end of file
Index: main/plugin-web/pages/services/filtered-contents/map-list.xsl
===================================================================
--- main/plugin-web/pages/services/filtered-contents/map-list.xsl	(revision 0)
+++ main/plugin-web/pages/services/filtered-contents/map-list.xsl	(revision 0)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2014 Anyware Services
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   -->
+<xsl:stylesheet version="1.0" 
+				xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+                xmlns:ametys="org.ametys.web.transformation.xslt.AmetysXSLTHelper"
+                xmlns:xalan="http://xml.apache.org/xalan"
+                xmlns:resolver="org.ametys.cms.transformation.xslt.ResolveURIComponent"
+                exclude-result-prefixes="ametys xalan resolver">
+
+    <xsl:import href="service:web://pages/services/filtered-contents/list_3.3.xsl"/>
+    
+    <!-- Variables -->
+    <xsl:variable name="common-service-css-class-name">filtered-contents filtered-contents-<xsl:value-of select="$view"/> map-list</xsl:variable>
+    <xsl:variable name="service-height" select="'450'"/> <!-- hardcoded height -->
+    
+    <!-- can be overriden to provide a meaningful color palette. -->
+    <xsl:variable name="colorsRTF">
+        <color>95499C|F7F7F8</color>
+    </xsl:variable>
+    <xsl:variable name="colors" select="xalan:nodeset($colorsRTF)"/>
+    
+    <!-- default coordinates that can be overriden. -->
+    <xsl:variable name="default-coord-lat" select="'0'" />
+    <xsl:variable name="default-coord-lng" select="'0'" />
+    <xsl:variable name="default-zoom" select="'1'" />
+    
+    <!-- Template for div contents + pagination -->
+	<xsl:template name="contents">
+		<xsl:param name="from" select="0"/>
+		<xsl:param name="by" select="$contentsPerPage"/>
+		<xsl:param name="count" select="1"/>
+        
+        <xsl:if test="$from = '0'">
+            <xsl:variable name="geo-contents-RTF">
+                <xsl:for-each select="/contents/content">
+                    <xsl:if test="html/head/meta[substring-after(@name, ';') = 'latitude']">
+                        <xsl:element name="{name()}"> <!-- content -->
+                            <xsl:attribute name="content-index"><xsl:value-of select="position() - 1" /></xsl:attribute>
+                            <xsl:copy-of select="@*|node()" />
+                        </xsl:element>
+                    </xsl:if>
+                </xsl:for-each>
+            </xsl:variable>
+            <xsl:variable name="geo-contents" select="xalan:nodeset($geo-contents-RTF)"/>
+            
+            <xsl:if test="$geo-contents/content">
+                <xsl:call-template name="display-geo-map">
+                    <xsl:with-param name="geo-contents" select="$geo-contents" />
+                    <xsl:with-param name="by" select="$by"/>
+                </xsl:call-template>
+            </xsl:if>
+        </xsl:if>
+    
+		<li id="{$prefix}-part-{$count}" class="content-list">
+			<script type="text/javascript">
+				<xsl:comment>
+					<xsl:if test="$count &gt; 1">
+						document.getElementById('<xsl:value-of select="$prefix"/>-part-<xsl:value-of select="$count"/>').style.display = 'none';
+					</xsl:if>
+						
+					pagination_<xsl:value-of select="$prefix"/>.push('<xsl:value-of select="$count"/>');
+				</xsl:comment>
+			</script>
+
+			<ul>			
+				<xsl:apply-templates select="/contents/content[position() &gt;= ($from + 1) and position() &lt; ($by + $from + 1)]"/>
+			</ul>
+            <div class="clear-L"><xsl:comment>empty</xsl:comment></div>
+		</li>
+		
+		<xsl:if test="$from + $by &lt; count(content)">
+			<xsl:call-template name="contents">
+				<xsl:with-param name="from" select="$from + $by"/>
+				<xsl:with-param name="by" select="$by"/>
+				<xsl:with-param name="count" select="$count + 1"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+    
+    <xsl:template name="display-geo-map">
+        <xsl:param name="geo-contents" />
+        <xsl:param name="by" />
+    
+        <xsl:variable name="scheme" select="substring-before($absolute-uri-prefix, '://')"/>
+        <script src="{$scheme}://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>
+        <script src="{ametys:pluginResourceURL('web', 'js/jquery.gmap.js')}" type="text/javascript"></script>
+        <script src="{ametys:pluginResourceURL('web', 'js/GmapViewer.js')}" type="text/javascript"></script>
+        
+        <script type="text/javascript">
+            <xsl:comment>
+                geocode_map_<xsl:value-of select="$prefix"/> = {};
+                var colors = []; <xsl:for-each select="$colors/color">colors.push('<xsl:value-of select="."/>');</xsl:for-each>
+                var gmap_page_length;
+                
+                <xsl:for-each select="$geo-contents/content">
+                    <xsl:variable name="page" select="floor(@content-index div $by) + 1" />
+                    <xsl:variable name="lat" select="html/head/meta[substring-after(@name, ';') = 'latitude']/@content" />
+                    
+                    <xsl:if test="$lat != ''">
+                        <xsl:variable name="lng" select="html/head/meta[substring-after(@name, ';') = 'longitude']/@content" />
+                        <xsl:variable name="tooltip-title"><xsl:call-template name="get-tooltip-title" /></xsl:variable>
+                        
+                        geocode_map_<xsl:value-of select="$prefix"/>['<xsl:value-of select="$page" />'] = geocode_map_<xsl:value-of select="$prefix"/>['<xsl:value-of select="$page" />'] || [];
+                        gmap_page_length = geocode_map_<xsl:value-of select="$prefix"/>['<xsl:value-of select="$page" />'].length;
+                        geocode_map_<xsl:value-of select="$prefix"/>['<xsl:value-of select="$page" />'].push({
+                            lat: <xsl:value-of select="$lat" />,
+                            lng: <xsl:value-of select="$lng" />,
+                            letter: '' + (gmap_page_length + 1),
+                            color: colors[gmap_page_length % colors.length],
+                            title: '<xsl:value-of select="ametys:escapeJS($tooltip-title)"/>'
+                        });
+                    </xsl:if>
+                </xsl:for-each>
+            </xsl:comment>
+        </script>
+
+        <!-- Allow the possibility to define the js function onAfterGmapViewerSetup via a template -->
+        <xsl:call-template name="display-geo-map-js-listener" />
+        
+        <script type="text/javascript">
+            $j(document).ready(function () 
+            {
+                $j('#<xsl:value-of select="$prefix"/>-map').show();
+                
+                var gmap_page_data = geocode_map_<xsl:value-of select="$prefix"/>['1'] || [];
+                var data = {
+                    zoomLevel: gmap_page_data.length &gt; 0 ? 15 : <xsl:value-of select="$default-zoom"/>,
+                    lat: (gmap_page_data[0] || {}).lat || <xsl:value-of select="$default-coord-lat"/>,
+                    lng: (gmap_page_data[0] || {}).lng || <xsl:value-of select="$default-coord-lng"/>,
+                    mapTypeId:  google.maps.MapTypeId.ROADMAP,
+                    markers: gmap_page_data,
+                    polygons: []
+                };
+                
+                var gmapViewer = new GmapViewer();
+                gmapViewer.setUp('#<xsl:value-of select="$prefix"/>-map', data, true);
+                
+                // onAfterGmapViewerSetup hook.
+                var geoIdxs = []; <xsl:for-each select="$geo-contents/content">geoIdxs.push(<xsl:value-of select="@content-index"/>);</xsl:for-each>
+                var colors = []; <xsl:for-each select="$colors/color">colors.push('<xsl:value-of select="."/>');</xsl:for-each>
+                if ($j.isFunction(onAfterGmapViewerSetup))
+                {
+                    onAfterGmapViewerSetup(gmapViewer, colors, geoIdxs, <xsl:value-of select="$by"/>);
+                }
+                
+                // Pagination change listener.
+                // Used to reinitialize map markers, center, zoom, bounds..
+                var onPaginationShow = function(page)
+                {
+                    var gmap_page_data = geocode_map_<xsl:value-of select="$prefix"/>[''+page] || [];
+                    
+                    var data = {
+                        zoomLevel: gmap_page_data.length &gt; 0 ? 15 : <xsl:value-of select="$default-zoom"/>,
+                        lat: (gmap_page_data[0] || {}).lat || <xsl:value-of select="$default-coord-lat"/>,
+                        lng: (gmap_page_data[0] || {}).lng || <xsl:value-of select="$default-coord-lng"/>,
+                        mapTypeId:  google.maps.MapTypeId.ROADMAP,
+                        markers: gmap_page_data,
+                        polygons: []
+                    };
+                    
+                    gmapViewer.setUp('#<xsl:value-of select="$prefix"/>-map', data, true);
+                }
+                
+                // Exposing as global variable.
+                window.onPaginationShow = onPaginationShow;
+            });
+            
+        </script>
+        
+        <!-- map placeholder -->
+        <div id="{$prefix}-map" class="map" style="height: {$service-height}px; display: none;">
+        </div>
+    </xsl:template>
+    
+    <!-- empty by default. Can be overriden in skin to define the 'onAfterGmapViewerSetup' js function -->
+    <xsl:template name="display-geo-map-js-listener" />
+    
+    <!-- Tooltip title with embedded page link. -->
+    <xsl:template name="get-tooltip-title">
+        <xsl:variable name="title" select="html/head/meta[@name = 'title']/@content"/>
+        
+        <xsl:variable name="pageHref">
+            <xsl:variable name="pageId" select="html/head/meta[@name = 'pages/page;id']/@content"/>
+            <xsl:if test="$pageId != ''">
+                <xsl:value-of select="resolver:resolve('page', $pageId, false())" />
+            </xsl:if>
+        </xsl:variable>
+        
+        <xsl:choose>
+            <xsl:when test="$pageHref != ''">
+                <xsl:value-of select="concat('&lt;a href=&quot;', $pageHref , '&quot; &gt;', $title, '&lt;/a&gt;')" />
+            </xsl:when>
+            <xsl:otherwise><xsl:value-of select="$title" /></xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <!-- Template for a content -->
+	<xsl:template match="content">
+       	<xsl:variable name="raw-is-title-visible">
+	        <xsl:call-template name="common-service-body-nonempty-content-title-content">
+    	        <xsl:with-param name="title" select="$service-title"/>
+        	</xsl:call-template>  
+		</xsl:variable>
+
+		<li>
+            <xsl:attribute name="class">content-list-item<xsl:text> </xsl:text>
+                <xsl:call-template name="common-utils-class"/>
+            </xsl:attribute>
+            
+            <xsl:apply-templates select="html/body/node()" mode="move-hierarchy">
+                <xsl:with-param name="level">
+                    <xsl:choose>
+                        <xsl:when test="$raw-is-title-visible != ''">2</xsl:when>
+                        <xsl:otherwise>1</xsl:otherwise>
+                    </xsl:choose>
+                </xsl:with-param>
+            </xsl:apply-templates>
+            
+            <!-- geocode : location info -->
+            <xsl:variable name="lat" select="html/head/meta[substring-after(@name, ';') = 'latitude']/@content" />
+            <xsl:if test="$lat != ''">
+                <xsl:variable name="lng" select="html/head/meta[substring-after(@name, ';') = 'longitude']/@content" />
+                
+                <div class="geoloc-info">
+                    <!-- accessibility -->
+                    <noscript>
+                        <a href="https://maps.google.com/maps?q={$lat},{$lng}&amp;ll={$lat},{$lng}">
+                            <i18n:text i18n:key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_GEOCODE_LINK_SEE_MAP_LABEL" i18n:catalogue="plugin.web"/><xsl:text> (</xsl:text>
+                            <xsl:value-of select="round($lat*10000) div 10000" /><xsl:text>°</xsl:text><i18n:text i18n:key="PLUGINS_CMS_GEOCODE_DIRECTIONS_NORTH" i18n:catalogue="plugin.cms"/><xsl:text>, </xsl:text>
+                            <xsl:value-of select="round($lng*10000) div 10000" /><xsl:text>°</xsl:text><i18n:text i18n:key="PLUGINS_CMS_GEOCODE_DIRECTIONS_EST" i18n:catalogue="plugin.cms"/><xsl:text>)</xsl:text>
+                        </a>
+                    </noscript>
+                </div>
+            </xsl:if>
+		</li>
+	</xsl:template>
+    
+</xsl:stylesheet>
Index: main/plugin-web/pages/services/filtered-contents/list_3.3.xsl
===================================================================
--- main/plugin-web/pages/services/filtered-contents/list_3.3.xsl	(revision 26840)
+++ main/plugin-web/pages/services/filtered-contents/list_3.3.xsl	(working copy)
@@ -243,6 +243,12 @@
 
                     document.getElementById("content_filter_prev_<xsl:value-of select="$prefix"/>").style.display = (pagination_<xsl:value-of select="$prefix"/>_current == "0" ? 'none' : '');
                     document.getElementById("content_filter_next_<xsl:value-of select="$prefix"/>").style.display = (pagination_<xsl:value-of select="$prefix"/>_current == (pagination_<xsl:value-of select="$prefix"/>.length - 1) ? 'none' : '');
+                    
+                    // onPaginationShow hook.
+                    if ($j.isFunction(onPaginationShow))
+                    {
+                        onPaginationShow(count + 1);
+                    }
                 }
             }
         </script>      
Index: main/plugin-web/pages/services/search/search-map.xml
===================================================================
--- main/plugin-web/pages/services/search/search-map.xml	(revision 0)
+++ main/plugin-web/pages/services/search/search-map.xml	(revision 0)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2014 Anyware Services
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   -->
+<service>
+	<label i18n="true">PLUGINS_WEB_SERVICE_FRONT_SEARCH_XSLT_SEARCH_MAP_LABEL</label>
+</service>
\ No newline at end of file
Index: main/plugin-web/pages/services/search/hit/hit_3.3.xsl
===================================================================
--- main/plugin-web/pages/services/search/hit/hit_3.3.xsl	(revision 26840)
+++ main/plugin-web/pages/services/search/hit/hit_3.3.xsl	(working copy)
@@ -47,43 +47,49 @@
     <xsl:template name="hit-page">
         <li>
             <xsl:attribute name="class">hit page<xsl:text> </xsl:text>
-                <xsl:call-template name="common-utils-class"/>                        
+                <xsl:call-template name="common-utils-class"/>
             </xsl:attribute>
-            <a title="{title}">
-                <xsl:attribute name="href">
-                    <xsl:value-of select="ametys:absoluteSiteUriPrefix(siteName)"/>
-                    <xsl:text>/</xsl:text>
-                    <xsl:value-of select="uri"/>
-                    <xsl:text>.html</xsl:text>
-                    <xsl:if test="/search/form/values/textfield != '' or /search/form/values/all-words != '' or /search/form/values/exact-wording != ''">
-                        <xsl:choose>
-                            <xsl:when test="contains(uri, '?')">&amp;</xsl:when>
-                            <xsl:otherwise>?</xsl:otherwise>
-                        </xsl:choose>
-                        <xsl:text>search-keywords=</xsl:text>
-                        <xsl:if test="/search/form/values/textfield != ''"><xsl:value-of select="/search/form/values/textfield"/></xsl:if>
-                        <xsl:if test="/search/form/values/all-words != ''">
-                            <xsl:if test="/search/form/values/textfield != ''">,</xsl:if>
-                            <xsl:for-each select="str:split(/search/form/values/all-words)">
-                                <xsl:if test="position() &gt; 1">,</xsl:if>
-                                <xsl:value-of select="."/>
-                            </xsl:for-each>
-                        </xsl:if>
-                        <xsl:if test="/search/form/values/exact-wording != ''">
-                            <xsl:if test="/search/form/values/textfield != '' or /search/form/values/all-words != ''">,</xsl:if>
-                            <xsl:value-of select="/search/form/values/exact-wording"/>
-                        </xsl:if>
-                    </xsl:if>
-                </xsl:attribute>
-                <xsl:value-of select="title"/>
-            </a>
+            <xsl:call-template name="hit-page-title" />
             <xsl:call-template name="hit-scoring"/>
-            <xsl:call-template name="hit-excerpt"/>                            
+            <xsl:call-template name="hit-excerpt"/>
             <xsl:call-template name="hit-multisite"/>
-            <xsl:call-template name="hit-lastvalidation"/>           
+            <xsl:call-template name="hit-lastvalidation"/>
         </li>
     </xsl:template>
     
+    <xsl:template name="hit-page-title">
+        <a title="{title}">
+            <xsl:attribute name="href"><xsl:call-template name="hit-page-title-href" /></xsl:attribute>
+            <xsl:value-of select="title"/>
+        </a>
+    </xsl:template>
+    
+    <xsl:template name="hit-page-title-href">
+        <xsl:value-of select="ametys:absoluteSiteUriPrefix(siteName)"/>
+        <xsl:text>/</xsl:text>
+        <xsl:value-of select="uri"/>
+        <xsl:text>.html</xsl:text>
+        <xsl:if test="/search/form/values/textfield != '' or /search/form/values/all-words != '' or /search/form/values/exact-wording != ''">
+            <xsl:choose>
+                <xsl:when test="contains(uri, '?')">&amp;</xsl:when>
+                <xsl:otherwise>?</xsl:otherwise>
+            </xsl:choose>
+            <xsl:text>search-keywords=</xsl:text>
+            <xsl:if test="/search/form/values/textfield != ''"><xsl:value-of select="/search/form/values/textfield"/></xsl:if>
+            <xsl:if test="/search/form/values/all-words != ''">
+                <xsl:if test="/search/form/values/textfield != ''">,</xsl:if>
+                <xsl:for-each select="str:split(/search/form/values/all-words)">
+                    <xsl:if test="position() &gt; 1">,</xsl:if>
+                    <xsl:value-of select="."/>
+                </xsl:for-each>
+            </xsl:if>
+            <xsl:if test="/search/form/values/exact-wording != ''">
+                <xsl:if test="/search/form/values/textfield != '' or /search/form/values/all-words != ''">,</xsl:if>
+                <xsl:value-of select="/search/form/values/exact-wording"/>
+            </xsl:if>
+        </xsl:if>
+    </xsl:template>
+    
     <!-- Template used to display the excerpt -->    
     <xsl:template name="hit-excerpt">
         <xsl:if test="excerpt">
Index: main/plugin-web/pages/services/search/search-map.xsl
===================================================================
--- main/plugin-web/pages/services/search/search-map.xsl	(revision 0)
+++ main/plugin-web/pages/services/search/search-map.xsl	(revision 0)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2014 Anyware Services
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   -->
+<xsl:stylesheet version="1.0"
+                xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+				xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				xmlns:xalan="http://xml.apache.org/xalan"
+                xmlns:ametys="org.ametys.web.transformation.xslt.AmetysXSLTHelper"
+                extension-element-prefixes="ametys xalan">
+	
+    <xsl:import href="service:web://pages/services/search/search_3.3.xsl"/>
+    
+    <!-- Variables -->
+    <xsl:variable name="common-service-css-class-name">search search-criteria search-map</xsl:variable>
+    <xsl:variable name="map-height" select="'450'"/> <!-- hardcoded map height -->
+    
+    <!-- can be overriden to provide a meaningful color palette. -->
+    <xsl:variable name="colorsRTF">
+        <color>95499C|F7F7F8</color>
+    </xsl:variable>
+    <xsl:variable name="colors" select="xalan:nodeset($colorsRTF)"/>
+    
+    <!-- default coordinates that can be overriden. -->
+    <xsl:variable name="default-coord-lat" select="'0'" />
+    <xsl:variable name="default-coord-lng" select="'0'" />
+    <xsl:variable name="default-zoom" select="'1'" />
+    
+	<!-- +
+		 | Template for results
+		 + -->
+	<xsl:template name="hits">
+        <xsl:call-template name="display-geo-map" />
+    
+		<div class="results">
+            <ul>
+    			<xsl:for-each select="/search/hits/hit|/search/content-types/*[@current = 'true']/hits/hit">
+    				<xsl:choose>
+    					<xsl:when test="type = 'resource'">
+                            <xsl:call-template name="hit-resource"/>
+    					</xsl:when>
+    					<xsl:otherwise>
+                            <xsl:call-template name="hit-page"/>
+    					</xsl:otherwise>
+    				</xsl:choose>
+    			</xsl:for-each>
+    		</ul>
+        </div>
+	</xsl:template>
+    
+    <xsl:template name="display-geo-map">
+    
+        <!-- collection content with indexed geocode metadata -->
+        <xsl:variable name="geo-contents-RTF">
+            <xsl:for-each select="/search/hits/hit|/search/content-types/*[@current = 'true']/hits/hit">
+                <xsl:if test="latitude != ''">
+                    <pos><xsl:value-of select="position() - 1" /></pos>
+                    <xsl:copy-of select="." /> <!-- hit -->
+                </xsl:if>
+            </xsl:for-each>
+        </xsl:variable>
+        <xsl:variable name="geo-contents" select="xalan:nodeset($geo-contents-RTF)"/>
+    
+        <xsl:variable name="scheme" select="substring-before($absolute-uri-prefix, '://')"/>
+        <script src="{$scheme}://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>
+        <script src="{ametys:pluginResourceURL('web', 'js/jquery.gmap.js')}" type="text/javascript"></script>
+        <script src="{ametys:pluginResourceURL('web', 'js/GmapViewer.js')}" type="text/javascript"></script>
+        
+        <script type="text/javascript">
+            <xsl:comment>
+                geocode_map_<xsl:value-of select="$uniqueId"/> = [];
+                var pinIdx = 0;
+                <xsl:variable name="cl" select="count($colors/color)"/>;
+                
+                <xsl:for-each select="$geo-contents/hit">
+                    <xsl:variable name="pos" select="position()"/>
+                    <xsl:variable name="tooltip-title"><xsl:call-template name="get-tooltip-title" /></xsl:variable>
+                    pinIdx++;
+                    
+                    geocode_map_<xsl:value-of select="$uniqueId"/>.push({
+                        lat: <xsl:value-of select="latitude" />,
+                        lng: <xsl:value-of select="longitude" />,
+                        letter: '' + pinIdx,
+                        color: '<xsl:value-of select="$colors/color[(($pos - 1) mod $cl)+1]"/>',
+                        title: '<xsl:value-of select="ametys:escapeJS($tooltip-title)"/>'
+                    });
+                </xsl:for-each>
+            </xsl:comment>
+        </script>
+
+        <!-- Allow the possibility to define the js function onAfterGmapViewerSetup via a template -->
+        <xsl:call-template name="display-geo-map-js-listener" />
+        
+        <script type="text/javascript">
+            $j(document).ready(function () 
+            {
+                $j('#<xsl:value-of select="$uniqueId"/>-map').show();
+                
+                var data = {
+                    zoomLevel: geocode_map_<xsl:value-of select="$uniqueId"/>.length &gt; 0 ? 15 : <xsl:value-of select="$default-zoom"/>,
+                    lat: (geocode_map_<xsl:value-of select="$uniqueId"/>[0] || {}).lat || <xsl:value-of select="$default-coord-lat"/>,
+                    lng: (geocode_map_<xsl:value-of select="$uniqueId"/>[0] || {}).lng || <xsl:value-of select="$default-coord-lng"/>,
+                    mapTypeId:  google.maps.MapTypeId.ROADMAP,
+                    markers: geocode_map_<xsl:value-of select="$uniqueId"/>,
+                    polygons: []
+                };
+                
+                var gmapViewer = new GmapViewer();
+                gmapViewer.setUp('#<xsl:value-of select="$uniqueId"/>-map', data, true);
+                
+                // onAfterGmapViewerSetup hook.
+                var geoIdxs = []; <xsl:for-each select="$geo-contents/pos">geoIdxs.push(<xsl:value-of select="."/>);</xsl:for-each>
+                var colors = []; <xsl:for-each select="$colors/color">colors.push('<xsl:value-of select="."/>');</xsl:for-each>
+                if ($j.isFunction(onAfterGmapViewerSetup))
+                {
+                    onAfterGmapViewerSetup(gmapViewer, colors, geoIdxs);
+                }
+            });
+        </script>
+        
+        <!-- map placeholder -->
+        <div id="{$uniqueId}-map" class="map" style="height: {$map-height}px; display: none;">
+        </div>
+    </xsl:template>
+    
+    <!-- empty by default. Can be overriden in skin to define the 'onAfterGmapViewerSetup' js function -->
+    <xsl:template name="display-geo-map-js-listener" />
+    
+    <!-- Tooltip title with embedded page link. -->
+    <xsl:template name="get-tooltip-title">
+        <xsl:variable name="href"><xsl:call-template name="hit-page-title-href" /></xsl:variable>
+        
+        <!-- <a title="page-title" href="page-href">page-title</a> -->
+        <xsl:value-of select="concat('&lt;a title=&quot;', title, '&quot; href=&quot;', $href , '&quot; &gt;', title, '&lt;/a&gt;')" />
+    </xsl:template>
+    
+    <!-- Template used to display a page -->
+    <xsl:template name="hit-page">
+        <li>
+            <xsl:attribute name="class">hit page<xsl:text> </xsl:text>
+                <xsl:call-template name="common-utils-class"/>
+            </xsl:attribute>
+            
+            <xsl:call-template name="hit-page-title" />
+            <xsl:call-template name="hit-scoring"/>
+            <xsl:call-template name="hit-excerpt"/>
+            <xsl:call-template name="hit-multisite"/>
+            <xsl:call-template name="hit-lastvalidation"/>
+            <xsl:call-template name="hit-geocode-info"/> <!-- adding geocode data to the default template -->
+        </li>
+    </xsl:template>
+    
+    <xsl:template name="hit-geocode-info">
+        <xsl:if test="latitude != ''">
+            <div class="geoloc-info">
+                <!-- accessibility -->
+                <noscript>
+                    <a href="https://maps.google.com/maps?q={latitude},{longitude}&amp;ll={latitude},{longitude}">
+                        <i18n:text i18n:key="PLUGINS_WEB_SERVICE_FILTERED_CONTENTS_GEOCODE_LINK_SEE_MAP_LABEL" i18n:catalogue="plugin.web"/><xsl:text> (</xsl:text>
+                        <xsl:value-of select="round(latitude*10000) div 10000" /><xsl:text>°</xsl:text><i18n:text i18n:key="PLUGINS_CMS_GEOCODE_DIRECTIONS_NORTH" i18n:catalogue="plugin.cms"/><xsl:text>, </xsl:text>
+                        <xsl:value-of select="round(longitude*10000) div 10000" /><xsl:text>°</xsl:text><i18n:text i18n:key="PLUGINS_CMS_GEOCODE_DIRECTIONS_EST" i18n:catalogue="plugin.cms"/><xsl:text>)</xsl:text>
+                    </a>
+                </noscript>
+            </div>
+        </xsl:if>
+    </xsl:template>
+    
+</xsl:stylesheet>
Index: main/plugin-web/src/org/ametys/web/frontoffice/AbstractSearchGenerator.java
===================================================================
--- main/plugin-web/src/org/ametys/web/frontoffice/AbstractSearchGenerator.java	(revision 26840)
+++ main/plugin-web/src/org/ametys/web/frontoffice/AbstractSearchGenerator.java	(working copy)
@@ -620,6 +620,14 @@
                 XMLUtils.createElement(contentHandler, "siteUrl", url);
             }
         }
+        
+        String[] coordinates = doc.getValues(GEOCODE_COORDINATES);
+        if (coordinates.length > 0)
+        {
+            String[] latLng = StringUtils.split(coordinates[0], ',');
+            XMLUtils.createElement(contentHandler, "latitude", latLng[0]);
+            XMLUtils.createElement(contentHandler, "longitude", latLng[1]);
+        }
 
         saxAdditionalInfosOnPageHit (doc);