X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=openstreetmap%2Fopenstreetmap.php;h=3b7c4a58623e2b58dcb03d36bada36fe42002ae6;hb=607cc9238cb62a049f9393906a656d7216095203;hp=68edf8bfef5d375b23c92b71c691af7703101e28;hpb=c3fdf45b6dff82146a5f0c617d7f33df0cb12267;p=friendica-addons.git
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 68edf8bf..3b7c4a58 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -8,14 +8,15 @@
* Author: Klaus Weidenbach
*
*/
-use Friendica\Core\Addon;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
+
+use Friendica\App;
+use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\Util\Network;
+use Friendica\DI;
+use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\Strings;
const OSM_TMS = 'https://www.openstreetmap.org';
const OSM_NOM = 'https://nominatim.openstreetmap.org/search.php';
@@ -24,37 +25,25 @@ const OSM_MARKER = 0;
function openstreetmap_install()
{
- Addon::registerHook('load_config', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config');
- Addon::registerHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
- Addon::registerHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
- Addon::registerHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
- Addon::registerHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
- Addon::registerHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
-
- Logger::log("installed openstreetmap");
-}
-
-function openstreetmap_uninstall()
-{
- Addon::unregisterHook('load_config', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config');
- Addon::unregisterHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
- Addon::unregisterHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
- Addon::unregisterHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
- Addon::unregisterHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
- Addon::unregisterHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
-
- Logger::log("removed openstreetmap");
+ Hook::register('load_config', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config');
+ Hook::register('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
+ Hook::register('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
+ Hook::register('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
+ Hook::register('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
+ Hook::register('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
+
+ Logger::notice("installed openstreetmap");
}
-function openstreetmap_load_config(\Friendica\App $a)
+function openstreetmap_load_config(ConfigFileManager $loader)
{
- $a->loadConfigFile(__DIR__. '/config/openstreetmap.ini.php');
+ DI::app()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
}
-function openstreetmap_alterheader($a, &$navHtml)
+function openstreetmap_alterheader(&$navHtml)
{
- $addScriptTag = '' . "\r\n";
- $a->page['htmlhead'] .= $addScriptTag;
+ $addScriptTag = '' . "\r\n";
+ DI::page()['htmlhead'] .= $addScriptTag;
}
/**
@@ -63,10 +52,9 @@ function openstreetmap_alterheader($a, &$navHtml)
* If an item has coordinates add link to a tile map server, e.g. openstreetmap.org.
* If an item has a location open it with the help of OSM's Nominatim reverse geocode search.
*
- * @param mixed $a
* @param array& $item
*/
-function openstreetmap_location($a, &$item)
+function openstreetmap_location(array &$item)
{
if (!(strlen($item['location']) || strlen($item['coord']))) {
return;
@@ -80,19 +68,19 @@ function openstreetmap_location($a, &$item)
* ?mlat=lat&mlon=lon for markers.
*/
- $tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
- $nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
- $zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
- $marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
+ $tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
+ $nomserver = DI::config()->get('openstreetmap', 'nomserver', OSM_NOM);
+ $zoom = DI::config()->get('openstreetmap', 'zoom', OSM_ZOOM);
+ $marker = DI::config()->get('openstreetmap', 'marker', OSM_MARKER);
// This is needed since we stored an empty string in the config in previous versions
if (empty($nomserver)) {
$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;
@@ -107,18 +95,18 @@ 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(array &$b)
{
- $nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
+ $nomserver = DI::config()->get('openstreetmap', 'nomserver', OSM_NOM);
// This is needed since we stored an empty string in the config in previous versions
if (empty($nomserver)) {
@@ -127,14 +115,14 @@ function openstreetmap_get_coordinates($a, &$b)
$args = '?q=' . urlencode($b['location']) . '&format=json';
- $cachekey = "openstreetmap:" . $b['location'];
- $j = Cache::get($cachekey);
+ $cachekey = 'openstreetmap:' . $b['location'];
+ $j = DI::cache()->get($cachekey);
if (is_null($j)) {
- $curlResult = Network::curl($nomserver . $args);
+ $curlResult = DI::httpClient()->get($nomserver . $args);
if ($curlResult->isSuccess()) {
$j = json_decode($curlResult->getBody(), true);
- Cache::set($cachekey, $j, Cache::MONTH);
+ DI::cache()->set($cachekey, $j, Duration::MONTH);
}
}
@@ -144,31 +132,31 @@ function openstreetmap_get_coordinates($a, &$b)
}
}
-function openstreetmap_generate_named_map(&$a, &$b)
+function openstreetmap_generate_named_map(array &$b)
{
- openstreetmap_get_coordinates($a, $b);
+ openstreetmap_get_coordinates($b);
if (!empty($b['lat']) && !empty($b['lon'])) {
- openstreetmap_generate_map($a, $b);
+ openstreetmap_generate_map($b);
}
}
-function openstreetmap_generate_map(&$a, &$b)
+function openstreetmap_generate_map(array &$b)
{
- $tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
+ $tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
- if (strpos($a->getBaseURL(true), 'https:') !== false) {
+ if (strpos(DI::baseUrl(), 'https:') !== false) {
$tmsserver = str_replace('http:','https:',$tmsserver);
}
- $zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
- $marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
+ $zoom = DI::config()->get('openstreetmap', 'zoom', OSM_ZOOM);
+ $marker = DI::config()->get('openstreetmap', 'marker', OSM_MARKER);
$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'] ? escape_tags($b['location']) : 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'] = '