diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c4015bc4cf..f2219f948a 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-19  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* include/functions_gis.php: adapt to new tables.
+	
+	* include/javascript/openlayers.pandora.js
+	
+	* operation/gis_maps/render_view.php: adapt to new tables.
+	
+	* operation/gis_maps/ajax.php: adapt to new tables.
+	
+	* operation/agentes/gis_view.php: clean source code.
+
 2010-02-18  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* godmode/agentes/configurar_agente.php:  fix the date to save into DB.
diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php
index 7e7a43834c..f73c4d83ee 100644
--- a/pandora_console/include/functions_gis.php
+++ b/pandora_console/include/functions_gis.php
@@ -215,23 +215,6 @@ function activateAjaxRefresh($layers = null, $lastTimeOfData = null) {
 		var refreshAjaxIntervalSeconds = 6000;
 		var idIntervalAjax = null;
 
-		function searchPointAgentById(id) {
-			for (layerIndex = 0; layerIndex < map.getNumLayers(); layerIndex++) {
-				layer = map.layers[layerIndex];
-
-				if (layer.features != undefined) {
-					for (featureIndex = 0; featureIndex < layer.features.length; featureIndex++) {
-						feature = layer.features[featureIndex];
-						if (feature.data.id == id) {
-							return feature;
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-
 		function refreshAjaxLayer(layer) {
 			var featureIdArray = Array();
 			
@@ -254,49 +237,20 @@ function activateAjaxRefresh($layers = null, $lastTimeOfData = null) {
 	        		success: function (data) {
 	        			if (data.correct) {
 		        			content = $.evalJSON(data.content);
-							
-		        			if (content.coords != null) {
-		        				listAgentsPoints = content.coords;
-		        				
-		        				for (var idAgent in listAgentsPoints) {
-		        					if (isInt(idAgent)) {
-				        				listPoints = listAgentsPoints[idAgent];
-		
-				        				for (var pointIndex in listPoints) {
-				        					if (isInt(pointIndex)) {
-					        					feature = searchPointAgentById(idAgent);
-	
-					        					var point = new OpenLayers.LonLat(listPoints[pointIndex].longitude, listPoints[pointIndex].latitude)
-					        					.transform(map.displayProjection, map.getProjectionObject());
-	
-					        					feature.data.long_lat = point;
-					        					feature.move(point);
-				        					}
-				        				}
-		        					}
-		        				}
-		        			}
-							
-		        			if (content.new_coords != null) {
-		        				listNewAgentsPoints = content.new_coords;
 
-		        				for (var idAgent in listNewAgentsPoints) {
+		        			if (content != null) {
+		        				for (var idAgent in content) {
 		        					if (isInt(idAgent)) {
-				        				point = listNewAgentsPoints[idAgent];
+			        					agentDataGIS = content[idAgent];
 
-		        						var geometryPoint = new OpenLayers.Geometry.Point(point.longitude, point.latitude)
-		        							.transform(map.displayProjection, map.getProjectionObject());
-		        						
-		        						feature = new OpenLayers.Feature.Vector(geometryPoint,
-				        						{id: idAgent, 
-			        							type: 'point_agent_info', 
-			        							long_lat: new OpenLayers.LonLat(point.longitude, point.latitude).transform(map.displayProjection, map.getProjectionObject()) },
-			        							{fontWeight: "bolder",
-				        						fontColor: "#00014F",
-				        						labelYOffset: -point.icon_height,
-				        						graphicHeight: point.icon_width, graphicWidth: point.icon_height, externalGraphic: point.icon_path, label: point.name});
-		        						
-		        						layer.addFeatures(feature);
+			        					feature = searchPointAgentById(idAgent);
+			        					layer.removeFeatures(feature);
+			        					console.log(feature);
+			        					delete feature;
+										
+			        					js_addPointExtent(layer.name, agentDataGIS['name'],
+			        						agentDataGIS['stored_longitude'], agentDataGIS['stored_latitude'],
+			        						agentDataGIS['icon_path'], 20, 20, idAgent, 'point_agent_info');
 		        					}
 		        				}
 		        			}
@@ -338,7 +292,7 @@ function activateAjaxRefresh($layers = null, $lastTimeOfData = null) {
 	<?php
 }
 
-function addPoint($layerName, $pointName, $lat, $lon, $icon = null, $width = 20, $height = 20, $point_id  = '', $type_string = '') {
+function addPoint($layerName, $pointName, $lat, $lon, $icon = null, $width = 20, $height = 20, $point_id  = '', $status = -1, $type_string = '') {
 	?>
 	<script type="text/javascript">
 	$(document).ready (
diff --git a/pandora_console/include/javascript/openlayers.pandora.js b/pandora_console/include/javascript/openlayers.pandora.js
index b7f96898c6..4c1b06ee7e 100755
--- a/pandora_console/include/javascript/openlayers.pandora.js
+++ b/pandora_console/include/javascript/openlayers.pandora.js
@@ -357,4 +357,27 @@ function js_addLineString(layerName, points, color) {
 	);
 
 	layer.addFeatures(lineString);
+}
+
+/**
+ * Return feature object for a id agent passed.
+ * 
+ * @param interger id The agent id.
+ * @return mixed Return the feature object, if it didn't found then return null.
+ */
+function searchPointAgentById(id) {
+	for (layerIndex = 0; layerIndex < map.getNumLayers(); layerIndex++) {
+		layer = map.layers[layerIndex];
+
+		if (layer.features != undefined) {
+			for (featureIndex = 0; featureIndex < layer.features.length; featureIndex++) {
+				feature = layer.features[featureIndex];
+				if (feature.data.id == id) {
+					return feature;
+				}
+			}
+		}
+	}
+
+	return null;
 }
\ No newline at end of file
diff --git a/pandora_console/operation/agentes/gis_view.php b/pandora_console/operation/agentes/gis_view.php
index 394ae9d578..3101d8f998 100644
--- a/pandora_console/operation/agentes/gis_view.php
+++ b/pandora_console/operation/agentes/gis_view.php
@@ -56,6 +56,7 @@ $sql = sprintf ("SELECT longitude, latitude, altitude, start_timestamp, end_time
         WHERE tagente_id_agente = %d AND end_timestamp > %d 
         ORDER BY end_timestamp DESC
         LIMIT %d OFFSET %d", $agentId, get_system_time () - $period, $config['block_size'], get_parameter ('offset'));
+
 $result = get_db_all_rows_sql ($sql, true);
 
 if ($result === false) {
diff --git a/pandora_console/operation/gis_maps/ajax.php b/pandora_console/operation/gis_maps/ajax.php
index 0ad666ccc6..441f104f1c 100644
--- a/pandora_console/operation/gis_maps/ajax.php
+++ b/pandora_console/operation/gis_maps/ajax.php
@@ -42,78 +42,41 @@ switch ($opt) {
 		$returnJSON = array();
 		$returnJSON['correct'] = 1;
 		
-		$rows = get_db_all_rows_sql('SELECT *
-			FROM tgis_data 
-			WHERE tagente_id_agente IN (' . $id_features . ') AND start_timestamp > from_unixtime(' . $last_time_of_data . ') ORDER BY start_timestamp DESC');
+		$flagGroupAll = get_db_all_rows_sql('SELECT tgrupo_id_grupo FROM tgis_map_layer WHERE id_tmap_layer = ' . $layerId . ' AND tgrupo_id_grupo = 1;'); //group 1 = all groups
 		
-		$listCoords = null;
-		foreach ($rows as $row) {
-			if (empty($listCoords[$row['tagente_id_agente']])) {
-				$coords['latitude'] = $row['latitude'];
-				$coords['longitude'] = $row['longitude'];
-				$coords['start_timestamp'] = $row['start_timestamp'];
-				$coords['id_tgis_data'] = $row['id_tgis_data'];
-				
-				$listCoords[$row['tagente_id_agente']][] = $coords;
-			}
-		}
+		if ($flagGroupAll === false) {
+			$agentsGISStatus = get_db_all_rows_sql('SELECT tagente_id_agente, stored_longitude, stored_latitude
+				FROM tgis_data_status
+				WHERE tagente_id_agente IN
+					(SELECT id_agente FROM tagente WHERE id_grupo IN
+						(SELECT tgrupo_id_grupo FROM tgis_map_layer WHERE id_tmap_layer = ' . $layerId . '))
+					OR tagente_id_agente IN
+						(SELECT tagente_id_agente FROM tgis_map_layer_has_tagente WHERE tgis_map_layer_id_tmap_layer = ' . $layerId . ');');
 		
-		//Extract the data of tgis_data the new agents that it aren't in list
-		//of features.
-		$idGroup = get_db_value('tgrupo_id_grupo', 'tgis_map_layer', 'id_tmap_layer', $layerId);
-		//If id group = 1 is the all groups.
-		if ($idGroup != 1) {
-			$whereGroup = 'id_grupo = ' . $idGroup;
 		}
 		else {
-			$whereGroup = '1 = 1';
-		}
-			
-		$idAgents = get_db_all_rows_sql('SELECT id_agente 
-			FROM tagente 
-			WHERE id_agente IN (SELECT tagente_id_agente
-					FROM tgis_map_layer_has_tagente
-					WHERE tgis_map_layer_id_tmap_layer = ' . $layerId .') OR ' . $whereGroup);
-		
-		$temp = array();
-		foreach($idAgents as $idAgent) {
-			$temp[] = $idAgent['id_agente'];
+			//All groups, all agents
+			$agentsGISStatus = get_db_all_rows_sql('SELECT tagente_id_agente, stored_longitude, stored_latitude
+				FROM tgis_data_status
+				WHERE tagente_id_agente');
 		}
 		
-		$rows = get_db_all_rows_sql('SELECT * FROM tgis_data
-			WHERE tagente_id_agente NOT IN (' . $id_features . ') AND tagente_id_agente IN (' . implode(',',$temp) . ')
-				AND start_timestamp > from_unixtime(' . $last_time_of_data . ') ORDER BY start_timestamp DESC;');
-		
-		$agents = get_db_all_rows_sql('SELECT id_agente, nombre FROM tagente WHERE 
-				id_agente NOT IN (' . $id_features . ') AND id_agente IN (' . implode(',',$temp) . ')');
-		
-		$listNewCoords = null;
-		foreach ($rows as $row) {
-			if (empty($listNewCoords[$row['tagente_id_agente']])) {
-				foreach ($agents as $agent) {
-					if ($agent['id_agente'] == $row['tagente_id_agente']) {
-						$name = $agent['nombre'];
-						$icon_path = get_agent_icon_map($row['tagente_id_agente'], true);
-					}
-				}
-				
-				$listNewCoords[$row['tagente_id_agente']] = array (
-					'latitude' => $row['latitude'],
-					'longitude' => $row['longitude'],
-					'start_timestamp' => $row['start_timestamp'],
-					'id_tgis_data' => $row['id_tgis_data'],
-					'name' => $name,
-					'icon_path' => $icon_path,
-					'icon_width' => 20, //TODO SET CORRECT WIDTH
-					'icon_height' => 20, //TODO SET CORRECT HEIGHT
-					);
-			}
+		if ($agentsGISStatus === false) {
+			$agentsGISStatus = array();
 		}
 		
-		$content = array('coords' => $listCoords, 'new_coords' => $listNewCoords);
-		
-		$returnJSON['content'] = json_encode($content); json_encode($listcoords);
+		$agents = null;
+		foreach ($agentsGISStatus as $row) {
+			$agents[$row['tagente_id_agente']] = array(
+				'icon_path' => get_agent_icon_map($row['tagente_id_agente'], true),
+				'name' => get_agent_name($row['tagente_id_agente']),
+				'status' => get_agent_status($idAgent),
+				'stored_longitude' => $row['stored_longitude'],
+				'stored_latitude' => $row['stored_latitude']
+			);
+		}
 		
+		$returnJSON['content'] = json_encode($agents);
 		echo json_encode($returnJSON);
 		break;
 	case 'point_path_info':
diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index 6c4b3b2bbb..079a28fc28 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -84,11 +84,12 @@ if ($layers != false) {
 				continue;
 			
 			$icon = get_agent_icon_map($idAgent, true);
+			$status = get_agent_status($idAgent);
 			
 			if ($show_history == 'y') { 	
 				addPath($layer['layer_name'], $idAgent);
 			}
-			addPoint($layer['layer_name'], $agentName, $coords['stored_latitude'], $coords['stored_longitude'], $icon, 20, 20, $idAgent, 'point_agent_info');
+			addPoint($layer['layer_name'], $agentName, $coords['stored_latitude'], $coords['stored_longitude'], $icon, 20, 20, $idAgent, $status, 'point_agent_info');
 		}
 	}