tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 07:44:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

2010-01-29 Pablo de la Concepción <pablo.concepcion@artica.es>

Browse Source 
* operation/gis_maps/render_view.php: Fixed call to get_agent_names to
	get the names in the same case as they are in the DB.

	* operation/agentes/gis_view.php: Changed size of the map to be relative

	* include/functions_gis.php: Fixed the call to addPoint in getAgentMap
	to use the new parameters.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2322 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Pablo de la Concepción Sanz 2010-01-29 15:47:40 +00:00
parent 9af0431c21
commit efe71d5c71
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2010-01-29 Pablo de la Concepción <pablo.concepcion@artica.es>
* operation/gis_maps/render_view.php: Fixed call to get_agent_names to
get the names in the same case as they are in the DB.
* operation/agentes/gis_view.php: Changed size of the map to be relative
* include/functions_gis.php: Fixed the call to addPoint in getAgentMap
to use the new parameters.
2010-01-29 Miguel de Dios <miguel.dedios@artica.es> 2010-01-29 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/map_builder.php: use "clean_cache" in the deleting of * godmode/reporting/map_builder.php: use "clean_cache" in the deleting of

2
pandora_console/include/functions_gis.php
View File

@ -591,6 +591,6 @@ function getAgentMap($agent_id, $heigth, $width, $show_history = false, $history
/* TODO: only show the last history_time part of the path */ /* TODO: only show the last history_time part of the path */
addPath("layer_for_agent_".$agent_name,$agent_id); addPath("layer_for_agent_".$agent_name,$agent_id);
} }
addPoint("layer_for_agent_".$agent_name, $agent_name, $agent_position['last_latitude'], $agent_position['last_longitude'], $agent_icon); addPoint("layer_for_agent_".$agent_name, $agent_name, $agent_position['last_latitude'], $agent_position['last_longitude'], $agent_icon, 20, 20, $agent_id, 'point_agent_info');
} }
?> ?>

2
pandora_console/operation/agentes/gis_view.php
View File

@ -36,7 +36,7 @@ echo "<h2>".__('Received data from')." ". $agent_name . " </h2>";
echo "<h3>" . __("Map with the last position/s") . " " . human_time_description ($period) ."</h3>"; echo "<h3>" . __("Map with the last position/s") . " " . human_time_description ($period) ."</h3>";
/* Map with the current position */ /* Map with the current position */
echo "<div id=\"".$agent_name."_agent_map\" style=\"border:1px solid black; width: 250px; height: 250px;\"></div>"; echo "<div id=\"".$agent_name."_agent_map\" style=\"border:1px solid black; width:98%; height: 30em;\"></div>";
echo getAgentMap($agentId, "500px", "98%", true); echo getAgentMap($agentId, "500px", "98%", true);
echo "<h3>" . __("Positional data from the last") . " " . human_time_description ($period) ."</h3>"; echo "<h3>" . __("Positional data from the last") . " " . human_time_description ($period) ."</h3>";

3
pandora_console/operation/gis_maps/render_view.php
View File

@ -72,7 +72,8 @@ if ($layers != false) {
foreach ($layers as $layer) { foreach ($layers as $layer) {
makeLayer($layer['layer_name'], $layer['view_layer']); makeLayer($layer['layer_name'], $layer['view_layer']);
$agentNames = get_group_agents($layer['tgrupo_id_grupo']); // calling get_group_agents with none to obtain the names in the same case as they are in the DB.
$agentNames = get_group_agents($layer['tgrupo_id_grupo'],false,'none');
foreach ($agentNames as $agentName) { foreach ($agentNames as $agentName) {
$idAgent = get_agent_id($agentName); $idAgent = get_agent_id($agentName);
$coords = get_agent_last_coords($idAgent); $coords = get_agent_last_coords($idAgent);