diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1ba3189bf8..6eafa6b5c3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2013-03-22 Ramon Novoa + + * operation/gis_maps/ajax.php, + godmode/agentes/agent_conf_gis.php: Fixed coordinate precision and + display order. Fixes bug #3608628. + 2013-03-22 Junichi Satoh * extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Added missing diff --git a/pandora_console/godmode/agentes/agent_conf_gis.php b/pandora_console/godmode/agentes/agent_conf_gis.php index 0966fe8088..227a4ad9c9 100644 --- a/pandora_console/godmode/agentes/agent_conf_gis.php +++ b/pandora_console/godmode/agentes/agent_conf_gis.php @@ -52,11 +52,11 @@ $table->head[0] =__('Agent position'); $table->head_colspan[0] = 2; $table->data[1][0] = __('Latitude: '); -$table->data[1][1] = html_print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 10, 10, false, '', +$table->data[1][1] = html_print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 20, 20, false, '', array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true); $table->data[2][0] = __('Longitude: '); -$table->data[2][1] = html_print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 10, 10, false, '', +$table->data[2][1] = html_print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 20, 20, false, '', array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true); $table->data[3][0] = __('Altitude: '); diff --git a/pandora_console/operation/gis_maps/ajax.php b/pandora_console/operation/gis_maps/ajax.php index b945c873cc..6e5f1ae429 100644 --- a/pandora_console/operation/gis_maps/ajax.php +++ b/pandora_console/operation/gis_maps/ajax.php @@ -139,7 +139,7 @@ switch ($opt) { $returnJSON = array(); $returnJSON['correct'] = 1; $returnJSON['content'] = __('Agent') . ': '.agents_get_name($row['tagente_id_agente']).'
'; - $returnJSON['content'] .= __('Position (Long, Lat, Alt)') . ': (' . $row['longitude'] . ', ' . $row['latitude'] . ', ' . $row['altitude'] . ')
'; + $returnJSON['content'] .= __('Position (Lat, Long, Alt)') . ': (' . $row['latitude'] . ', ' . $row['longitude'] . ', ' . $row['altitude'] . ')
'; $returnJSON['content'] .= __('Start contact') . ': ' . $row['start_timestamp'] . '
'; $returnJSON['content'] .= __('Last contact') . ': ' . $row['end_timestamp'] . '
'; $returnJSON['content'] .= __('Num reports') . ': '.$row['number_of_packages'].'
'; @@ -160,11 +160,11 @@ switch ($opt) { //it's positioned in default position of map. if ($agentDataGIS === false) { - $returnJSON['content'] .= __('Position (Long, Lat, Alt)') . ': ' . __("Default position of map.") . '
'; + $returnJSON['content'] .= __('Position (Lat, Long, Alt)') . ': ' . __("Default position of map.") . '
'; } else { - $returnJSON['content'] .= __('Position (Long, Lat, Alt)') . ': (' . $agentDataGIS['stored_longitude'] . ', ' . $agentDataGIS['stored_latitude'] . ', ' . $agentDataGIS['stored_altitude'] . ')
'; + $returnJSON['content'] .= __('Position (Lat, Long, Alt)') . ': (' . $agentDataGIS['stored_latitude'] . ', ' . $agentDataGIS['stored_longitude'] . ', ' . $agentDataGIS['stored_altitude'] . ')
'; } $agent_ip_address = agents_get_address ($id_agente); if ($agent_ip_address || $agent_ip_address != '') {