Merge pull request #1027 from MrPetovan/task/9328-add-range-percent-template

[friendica-addons.git] / openstreetmap / openstreetmap.php

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 370eb9104a15513f2e457c256c4049b006d1e3d9..168d3d2ff4bb71b5dc507d9045cad2f32ab256ac 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -14,7 +14,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Network\HTTPRequest;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
@@ -35,18 +34,6 @@ function openstreetmap_install()
        Logger::log("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)
 {
        $a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
@@ -132,7 +119,7 @@ function openstreetmap_get_coordinates($a, &$b)
        $j = DI::cache()->get($cachekey);
 
        if (is_null($j)) {
-               $curlResult = HTTPRequest::curl($nomserver . $args);
+               $curlResult = DI::httpRequest()->get($nomserver . $args);
                if ($curlResult->isSuccess()) {
                        $j = json_decode($curlResult->getBody(), true);
                        DI::cache()->set($cachekey, $j, Duration::MONTH);
@@ -223,6 +210,4 @@ function openstreetmap_addon_admin_post(&$a)
        DI::config()->set('openstreetmap', 'nomserver', $urlnom);
        DI::config()->set('openstreetmap', 'zoom', $zoom);
        DI::config()->set('openstreetmap', 'marker', $marker);
-
-       info(DI::l10n()->t('Settings updated.') . EOL);
 }