tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-05-20 Miguel de Dios <miguel.dedios@artica.es> 

* operation/gis_maps/ajax.php,
	include/javascript/openlayers.pandora.js, include/functions_gis.php:
	lost changes to set the size of agent icons.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8168 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-05-20 12:49:57 +00:00
parent b16fc05509
commit f78b651a16
4 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-05-20 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/ajax.php,
include/javascript/openlayers.pandora.js, include/functions_gis.php:
lost changes to set the size of agent icons.
2013-05-20 Miguel de Dios <miguel.dedios@artica.es> 2013-05-20 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.data.postgreSQL.sql, pandoradb.data.oracle.sql, * pandoradb.data.postgreSQL.sql, pandoradb.data.oracle.sql,

13
pandora_console/include/functions_gis.php
View File

@ -297,9 +297,16 @@ function gis_activate_ajax_refresh($layers = null, $lastTimeOfData = null) {
feature = null feature = null
status = parseInt(agentDataGIS['status']); status = parseInt(agentDataGIS['status']);
js_addAgentPointExtent(layer.name, agentDataGIS['name'], js_addAgentPointExtent(layer.name,
agentDataGIS['stored_longitude'], agentDataGIS['stored_latitude'], agentDataGIS['name'],
agentDataGIS['icon_path'], 20, 20, idAgent, 'point_agent_info', status, agentDataGIS['id_parent']); agentDataGIS['stored_longitude'],
agentDataGIS['stored_latitude'],
agentDataGIS['icon_path'],
agentDataGIS['icon_width'],
agentDataGIS['icon_height'],
idAgent,
'point_agent_info', status,
agentDataGIS['id_parent']);
//TODO: Optimize, search a new position to call for all agent in the layer and or optimice code into function. //TODO: Optimize, search a new position to call for all agent in the layer and or optimice code into function.
js_refreshParentLines(); js_refreshParentLines();

9
pandora_console/operation/gis_maps/ajax.php
View File

@ -119,8 +119,15 @@ switch ($opt) {
if (!$config['gis_label']) if (!$config['gis_label'])
$row['nombre'] = ''; $row['nombre'] = '';
$icon = gis_get_agent_icon_map($row['tagente_id_agente'], true, $status);
$icon_size = getimagesize($icon);
$icon_width = $icon_size[0];
$icon_height = $icon_size[1];
$agents[$row['tagente_id_agente']] = array( $agents[$row['tagente_id_agente']] = array(
'icon_path' => gis_get_agent_icon_map($row['tagente_id_agente'], true, $status), 'icon_path' => $icon,
'icon_width' => $icon_width,
'icon_height' => $icon_height,
'name' => $row['nombre'], 'name' => $row['nombre'],
'status' => $status, 'status' => $status,
'stored_longitude' => $row['stored_longitude'], 'stored_longitude' => $row['stored_longitude'],