X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=openstreetmap%2Fopenstreetmap.php;h=9d35df913d6028f40d9f275350693838fa912b0b;hb=795eb1bb367dd687ac4b94d3fb9bf86856db356b;hp=e0287a817076969c480962266683a8ceeac2f5ec;hpb=665948b37e5d1844b95f5e365cedc43e4be445b2;p=friendica-addons.git

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index e0287a81..9d35df91 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,15 +9,13 @@
  *
  */
 
-use Friendica\DI;
-use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Util\ConfigFileLoader;
-use Friendica\Util\Network;
+use Friendica\DI;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 const OSM_TMS = 'https://www.openstreetmap.org';
@@ -34,27 +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_uninstall()
-{
-	Hook::unregister('load_config',     'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config');
-	Hook::unregister('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
-	Hook::unregister('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
-	Hook::unregister('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
-	Hook::unregister('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
-	Hook::unregister('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
-
-	Logger::log("removed openstreetmap");
-}
-
-function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader)
+function openstreetmap_load_config(App $a, ConfigFileLoader $loader)
 {
 	$a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
 }
 
-function openstreetmap_alterheader($a, &$navHtml)
+function openstreetmap_alterheader(App $a, &$navHtml)
 {
 	$addScriptTag = '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
 	DI::page()['htmlhead'] .= $addScriptTag;
@@ -69,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;
@@ -83,17 +69,17 @@ 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) {
 			$lat = urlencode(round($coords[0], 5));
@@ -110,18 +96,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'] = '<a target="map" title="'.$title.'" href= "'.$target.'">'.$title.'</a>';
+	$item['html'] = '<a target="map" title="' . $title . '" href= "' . $target . '">' . $title . '</a>';
 }
 
-function openstreetmap_get_coordinates($a, &$b)
+function openstreetmap_get_coordinates(App $a, 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)) {
@@ -130,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 = Network::curl($nomserver . $args);
+		$curlResult = DI::httpClient()->get($nomserver . $args);
 		if ($curlResult->isSuccess()) {
 			$j = json_decode($curlResult->getBody(), true);
 			DI::cache()->set($cachekey, $j, Duration::MONTH);
@@ -147,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);
 
@@ -156,22 +142,22 @@ function openstreetmap_generate_named_map(&$a, &$b)
 	}
 }
 
-function openstreetmap_generate_map(&$a, &$b)
+function openstreetmap_generate_map(App $a, array &$b)
 {
-	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
+	$tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
 
 	if (strpos(DI::baseUrl()->get(true), '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 = '<a href="' . $tmsserver;
 
@@ -179,7 +165,7 @@ function openstreetmap_generate_map(&$a, &$b)
 		$cardlink .= '?mlat=' . $lat . '&mlon=' . $lon;
 	}
 
-	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? Strings::escapeHtml($b['location']) : L10n::t('View Larger')) . '</a>';
+	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ??0? Strings::escapeHtml($b['location']) : DI::l10n()->t('View Larger')) . '</a>';
 	if (empty($b['mode'])) {
 		$b['html'] = '<iframe style="width:100%; height:300px; border:1px solid #ccc" src="' . $tmsserver .
 				'/export/embed.html?bbox=' . ($lon - 0.01) . '%2C' . ($lat - 0.01) . '%2C' . ($lon + 0.01) . '%2C' . ($lat + 0.01) .
@@ -189,16 +175,16 @@ function openstreetmap_generate_map(&$a, &$b)
 		$b['html'] .= '<br/>' . $cardlink;
 	}
 
-	Logger::log('generate_map: ' . $b['html'], Logger::DATA);
+	Logger::debug('generate_map: ' . $b['html']);
 }
 
-function openstreetmap_addon_admin(&$a, &$o)
+function openstreetmap_addon_admin(App $a, string &$o)
 {
-	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/openstreetmap/");
-	$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);
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/openstreetmap/');
+	$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)) {
@@ -206,25 +192,18 @@ function openstreetmap_addon_admin(&$a, &$o)
 	}
 
 	$o = Renderer::replaceMacros($t, [
-			'$submit' => L10n::t('Submit'),
-			'$tmsserver' => ['tmsserver', L10n::t('Tile Server URL'), $tmsserver, L10n::t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')],
-			'$nomserver' => ['nomserver', L10n::t('Nominatim (reverse geocoding) Server URL'), $nomserver, L10n::t('A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim servers</a>')],
-			'$zoom' => ['zoom', L10n::t('Default zoom'), $zoom, L10n::t('The default zoom level. (1:world, 18:highest, also depends on tile server)')],
-			'$marker' => ['marker', L10n::t('Include marker on map'), $marker, L10n::t('Include a marker on the map.')],
+			'$submit' => DI::l10n()->t('Submit'),
+			'$tmsserver' => ['tmsserver', DI::l10n()->t('Tile Server URL'), $tmsserver, DI::l10n()->t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">public tile servers</a>')],
+			'$nomserver' => ['nomserver', DI::l10n()->t('Nominatim (reverse geocoding) Server URL'), $nomserver, DI::l10n()->t('A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servers</a>')],
+			'$zoom' => ['zoom', DI::l10n()->t('Default zoom'), $zoom, DI::l10n()->t('The default zoom level. (1:world, 18:highest, also depends on tile server)')],
+			'$marker' => ['marker', DI::l10n()->t('Include marker on map'), $marker, DI::l10n()->t('Include a marker on the map.')],
 	]);
 }
 
-function openstreetmap_addon_admin_post(&$a)
+function openstreetmap_addon_admin_post(App $a)
 {
-	$urltms = ($_POST['tmsserver'] ?? '') ?: OSM_TMS;
-	$urlnom = ($_POST['nomserver'] ?? '') ?: OSM_NOM;
-	$zoom = ($_POST['zoom'] ?? '') ?: OSM_ZOOM;
-	$marker = ($_POST['marker'] ?? '') ?: OSM_MARKER;
-
-	Config::set('openstreetmap', 'tmsserver', $urltms);
-	Config::set('openstreetmap', 'nomserver', $urlnom);
-	Config::set('openstreetmap', 'zoom', $zoom);
-	Config::set('openstreetmap', 'marker', $marker);
-
-	info(L10n::t('Settings updated.') . EOL);
+	DI::config()->set('openstreetmap', 'tmsserver', ($_POST['tmsserver'] ?? '') ?: OSM_TMS);
+	DI::config()->set('openstreetmap', 'nomserver', ($_POST['nomserver'] ?? '') ?: OSM_NOM);
+	DI::config()->set('openstreetmap', 'zoom', ($_POST['zoom'] ?? '') ?: OSM_ZOOM);
+	DI::config()->set('openstreetmap', 'marker', ($_POST['marker'] ?? '') ?: OSM_MARKER);
 }