WebApps/Observium_CE
1
0
Fork 0
Code Pull Requests Activity

Commit version 24.12.13800

Browse Source
This commit is contained in:
Chris Hammer
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
includes/geolocation/google.inc.php
View File

@ -5,10 +5,10 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage geolocation
* @author Adam Armstrong <adama@observium.org>
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @package observium
* @subpackage geolocation
* @author Adam Armstrong <adama@observium.org>
* @copyright (C) Adam Armstrong
*
*/
@ -17,71 +17,54 @@
* At end returned main $location variables
*/
// Use google data only with good status response
if (in_array($data['status'], ['OK', 'ZERO_RESULTS', 'UNKNOWN_ERROR']))
{
$data = $data['results'][0];
// Use google data only with good status response
if (in_array($data['status'], [ 'OK', 'ZERO_RESULTS', 'UNKNOWN_ERROR' ])) {
$data = $data['results'][0];
// Detect if required second request
$try_second = FALSE;
if ($geo_type == 'forward')
{
$try_second = !isset($data['geometry']['location_type']) || $data['geometry']['location_type'] == 'APPROXIMATE';
if ($geo_type === 'forward') {
$try_second = !isset($data['geometry']['location_type']) || $data['geometry']['location_type'] === 'APPROXIMATE';
}
// Make second request (address_second passed from main function get_geolocation()
if ($try_second && strlen($address_second) > 4)
{
// Re-Generate geolocation tags, override location
$tags['location'] = $address_second;
if ($try_second && !safe_empty($address_second)) {
// Re-Generate geolocation tags, override location
$tags['location'] = $address_second;
// Generate context/options with encoded data and geo specific api headers
$options_new = generate_http_context($geo_def[$geo_type], $tags);
// API URL to POST to
$url_new = generate_http_url($geo_def[$geo_type], $tags);
// Second request
$mapresponse = get_http_request($url_new, $options_new, $ratelimit);
if (test_http_request($geo_def[$geo_type], $mapresponse))
{
// Valid response
$data_new = json_decode($mapresponse, TRUE);
if ($data_new['status'] == 'OK' && $data_new['results'][0]['geometry']['location_type'] != 'APPROXIMATE')
{
$url = $url_new;
$data = $data_new['results'][0];
// Second request
$data_new = get_geo_http_def($geo_def, $geo_type, $tags);
if ($data_new && $data_new['status'] === 'OK' &&
$data_new['results'][0]['geometry']['location_type'] !== 'APPROXIMATE') {
$data = $data_new['results'][0];
}
}
unset($data_new);
}
if ($geo_type == 'forward')
{
// If using reverse queries, do not change lat/lon
$location['location_lat'] = $data['geometry']['location']['lat'];
$location['location_lon'] = $data['geometry']['location']['lng'];
if ($geo_type == 'forward') {
// If using reverse queries, do not change lat/lon
$location['location_lat'] = $data['geometry']['location']['lat'];
$location['location_lon'] = $data['geometry']['location']['lng'];
}
foreach ($data['address_components'] as $entry)
{
switch ($entry['types'][0])
{
case 'sublocality_level_1':
case 'postal_town':
case 'locality':
$location['location_city'] = $entry['long_name'];
break;
case 'administrative_area_level_2':
$location['location_county'] = $entry['long_name'];
break;
case 'administrative_area_level_1':
$location['location_state'] = $entry['long_name'];
break;
case 'country':
$location['location_country'] = strtolower($entry['short_name']);
break;
}
foreach ($data['address_components'] as $entry) {
switch ($entry['types'][0]) {
case 'sublocality_level_1':
case 'postal_town':
case 'locality':
$location['location_city'] = $entry['long_name'];
break;
case 'administrative_area_level_2':
$location['location_county'] = $entry['long_name'];
break;
case 'administrative_area_level_1':
$location['location_state'] = $entry['long_name'];
break;
case 'country':
$location['location_country'] = strtolower($entry['short_name']);
break;
}
}
} else {
} else {
$data = FALSE;
}
}
// EOF

92
includes/geolocation/yandex.inc.php
View File

@ -1,5 +1,4 @@
<?php
/**
* Observium
*
@ -7,8 +6,7 @@
*
* @package observium
* @subpackage geolocation
* @author Adam Armstrong <adama@observium.org>
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @copyright (C) Adam Armstrong
*
*/
@ -17,75 +15,59 @@
* At end returned main $location variables
*/
if (isset($data['response']))
{
if (isset($data['response'])) {
// Detect if required second request
$try_second = FALSE;
if ($data['response']['GeoObjectCollection']['metaDataProperty']['GeocoderResponseMetaData']['found'] > 0)
{
$data = $data['response']['GeoObjectCollection']['featureMember'][0];
print_debug_vars($data);
if ($geo_type == 'forward' && $data['GeoObject']['metaDataProperty']['GeocoderMetaData']['precision'] == 'other')
{
if ($data['response']['GeoObjectCollection']['metaDataProperty']['GeocoderResponseMetaData']['found'] > 0) {
$data = $data['response']['GeoObjectCollection']['featureMember'][0];
print_debug_vars($data);
if ($geo_type === 'forward' && $data['GeoObject']['metaDataProperty']['GeocoderMetaData']['precision'] === 'other') {
$try_second = TRUE;
}
} elseif ($geo_type === 'forward') {
$try_second = TRUE;
}
}
elseif ($geo_type == 'forward')
{
$try_second = TRUE;
}
// Make second request (address_second passed from main function get_geolocation()
if ($try_second && strlen($address_second) > 4)
{
// Re-Generate geolocation tags, override location
$tags['location'] = $address_second;
if ($try_second && !safe_empty($address_second)) {
// Re-Generate geolocation tags, override location
$tags['location'] = $address_second;
// Generate context/options with encoded data and geo specific api headers
$options_new = generate_http_context($geo_def[$geo_type], $tags);
// API URL to POST to
$url_new = generate_http_url($geo_def[$geo_type], $tags);
// Second request
$mapresponse = get_http_request($url_new, $options_new, $ratelimit);
if (test_http_request($geo_def[$geo_type], $mapresponse))
{
// Valid response
$data_new = json_decode($mapresponse, TRUE);
if ($data_new['response']['GeoObjectCollection']['metaDataProperty']['GeocoderResponseMetaData']['found'] > 0 &&
$data_new['response']['GeoObjectCollection']['featureMember'][0]['GeoObject']['metaDataProperty']['GeocoderMetaData']['precision'] != 'other')
{
$url = $url_new;
$data = $data_new['response']['GeoObjectCollection']['featureMember'][0];
// Second request
$data_new = get_geo_http_def($geo_def, $geo_type, $tags);
if ($data_new && $data_new['response']['GeoObjectCollection']['metaDataProperty']['GeocoderResponseMetaData']['found'] > 0 &&
$data_new['response']['GeoObjectCollection']['featureMember'][0]['GeoObject']['metaDataProperty']['GeocoderMetaData']['precision'] !== 'other') {
$data = $data_new['response']['GeoObjectCollection']['featureMember'][0];
}
}
unset($data_new);
}
if ($geo_type == 'forward')
{
// If using reverse queries, do not change lat/lon
list($location['location_lon'], $location['location_lat']) = explode(' ', $data['GeoObject']['Point']['pos']);
if ($geo_type === 'forward') {
// If using reverse queries, do not change lat/lon
[ $location['location_lon'], $location['location_lat'] ] = explode(' ', $data['GeoObject']['Point']['pos']);
}
$data = $data['GeoObject']['metaDataProperty']['GeocoderMetaData']['AddressDetails'];
$location['location_country'] = strtolower($data['Country']['CountryNameCode']);
$location['location_state'] = $data['Country']['AdministrativeArea']['AdministrativeAreaName'];
if (isset($data['Country']['AdministrativeArea']['SubAdministrativeArea']))
{
$location['location_county'] = $data['Country']['AdministrativeArea']['SubAdministrativeArea']['SubAdministrativeAreaName'];
$location['location_city'] = $data['Country']['AdministrativeArea']['SubAdministrativeArea']['Locality']['LocalityName'];
}
else if (isset($data['Country']['AdministrativeArea']['Locality']['DependentLocality']))
{
$location['location_county'] = $data['Country']['AdministrativeArea']['Locality']['DependentLocality']['DependentLocalityName'];
$location['location_city'] = $data['Country']['AdministrativeArea']['Locality']['DependentLocality']['DependentLocality']['DependentLocalityName'];
if (isset($data['Country']['AdministrativeArea']['SubAdministrativeArea'])) {
$entry = $data['Country']['AdministrativeArea']['SubAdministrativeArea'];
print_debug_vars($entry);
$location['location_county'] = $entry['SubAdministrativeAreaName'];
$location['location_city'] = $entry['Locality']['LocalityName'] ?? $entry['Locality']['DependentLocality']['DependentLocalityName'];
} elseif (isset($data['Country']['AdministrativeArea']['Locality']['DependentLocality'])) {
$entry = $data['Country']['AdministrativeArea']['Locality']['DependentLocality'];
print_debug_vars($entry);
$location['location_county'] = $entry['DependentLocalityName'];
$location['location_city'] = $entry['DependentLocality']['DependentLocalityName'];
} else {
$location['location_county'] = $data['Country']['AdministrativeArea']['AdministrativeAreaName'];
$location['location_city'] = $data['Country']['AdministrativeArea']['Locality']['LocalityName'];
$entry = $data['Country']['AdministrativeArea'];
print_debug_vars($entry);
$location['location_county'] = $entry['AdministrativeAreaName'];
$location['location_city'] = $entry['Locality']['LocalityName'];
}
} else {
} else {
$data = FALSE;
}
}
// EOF