X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=openstreetmap%2Fopenstreetmap.php;h=e83e02c27f5c315d3c36f2f9b4b4931194464b1b;hb=2fc7356cf43a52ac91fa451f0e8a49f83bccf6df;hp=168d3d2ff4bb71b5dc507d9045cad2f32ab256ac;hpb=2365a9ae02f15bab90349cad0721cb068c47eb02;p=friendica-addons.git
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 168d3d2f..e83e02c2 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,12 +9,13 @@
*
*/
-use Friendica\Core\Cache\Duration;
+use Friendica\App;
+use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\DI;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\Strings;
const OSM_TMS = 'https://www.openstreetmap.org';
@@ -31,15 +32,15 @@ function openstreetmap_install()
Hook::register('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
Hook::register('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
- Logger::log("installed openstreetmap");
+ Logger::notice("installed openstreetmap");
}
-function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader)
+function openstreetmap_load_config(App $a, ConfigFileLoader $loader)
{
- $a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
+ $a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
}
-function openstreetmap_alterheader($a, &$navHtml)
+function openstreetmap_alterheader(App $a, &$navHtml)
{
$addScriptTag = '' . "\r\n";
DI::page()['htmlhead'] .= $addScriptTag;
@@ -54,7 +55,7 @@ function openstreetmap_alterheader($a, &$navHtml)
* @param mixed $a
* @param array& $item
*/
-function openstreetmap_location($a, &$item)
+function openstreetmap_location(App $a, &$item)
{
if (!(strlen($item['location']) || strlen($item['coord']))) {
return;
@@ -78,9 +79,9 @@ function openstreetmap_location($a, &$item)
$nomserver = OSM_NOM;
}
- if ($item['coord'] != "") {
+ if ($item['coord'] != '') {
$coords = explode(' ', $item['coord']);
- if (count($coords) > 1) {
+ if ((count($coords) > 1) && is_numeric($coords[0]) && is_numeric($coords[1])) {
$lat = urlencode(round($coords[0], 5));
$lon = urlencode(round($coords[1], 5));
$target = $tmsserver;
@@ -95,16 +96,16 @@ function openstreetmap_location($a, &$item)
$target = $nomserver.'?q='.urlencode($item['location']);
}
- if ($item['location'] != "") {
+ if ($item['location'] != '') {
$title = $item['location'];
} else {
$title = $item['coord'];
}
- $item['html'] = ''.$title.'';
+ $item['html'] = '' . $title . '';
}
-function openstreetmap_get_coordinates($a, &$b)
+function openstreetmap_get_coordinates(App $a, array &$b)
{
$nomserver = DI::config()->get('openstreetmap', 'nomserver', OSM_NOM);
@@ -115,11 +116,11 @@ function openstreetmap_get_coordinates($a, &$b)
$args = '?q=' . urlencode($b['location']) . '&format=json';
- $cachekey = "openstreetmap:" . $b['location'];
+ $cachekey = 'openstreetmap:' . $b['location'];
$j = DI::cache()->get($cachekey);
if (is_null($j)) {
- $curlResult = DI::httpRequest()->get($nomserver . $args);
+ $curlResult = DI::httpClient()->get($nomserver . $args);
if ($curlResult->isSuccess()) {
$j = json_decode($curlResult->getBody(), true);
DI::cache()->set($cachekey, $j, Duration::MONTH);
@@ -132,7 +133,7 @@ function openstreetmap_get_coordinates($a, &$b)
}
}
-function openstreetmap_generate_named_map(&$a, &$b)
+function openstreetmap_generate_named_map(App $a, array &$b)
{
openstreetmap_get_coordinates($a, $b);
@@ -141,7 +142,7 @@ function openstreetmap_generate_named_map(&$a, &$b)
}
}
-function openstreetmap_generate_map(&$a, &$b)
+function openstreetmap_generate_map(App $a, array &$b)
{
$tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
@@ -155,8 +156,8 @@ function openstreetmap_generate_map(&$a, &$b)
$lat = $b['lat']; // round($b['lat'], 5);
$lon = $b['lon']; // round($b['lon'], 5);
- Logger::log('lat: ' . $lat, Logger::DATA);
- Logger::log('lon: ' . $lon, Logger::DATA);
+ Logger::debug('lat: ' . $lat);
+ Logger::debug('lon: ' . $lon);
$cardlink = '' . ($b['location'] ? Strings::escapeHtml($b['location']) : DI::l10n()->t('View Larger')) . '';
+ $cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ??0? Strings::escapeHtml($b['location']) : DI::l10n()->t('View Larger')) . '';
if (empty($b['mode'])) {
$b['html'] = '