IT translation update jrynn addon THX Sylke Vicious

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

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index a4aafcd..168d3d2 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,14 +9,12 @@
  *
  */
 
-use Friendica\DI;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 const OSM_TMS = 'https://www.openstreetmap.org';
@@ -36,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'));
@@ -82,10 +68,10 @@ 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)) {
@@ -120,7 +106,7 @@ function openstreetmap_location($a, &$item)
 
 function openstreetmap_get_coordinates($a, &$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)) {
@@ -133,7 +119,7 @@ function openstreetmap_get_coordinates($a, &$b)
        $j = DI::cache()->get($cachekey);
 
        if (is_null($j)) {
-               $curlResult = Network::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);
@@ -157,14 +143,14 @@ function openstreetmap_generate_named_map(&$a, &$b)
 
 function openstreetmap_generate_map(&$a, &$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);
@@ -194,10 +180,10 @@ function openstreetmap_generate_map(&$a, &$b)
 function openstreetmap_addon_admin(&$a, &$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);
+       $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,8 +192,8 @@ function openstreetmap_addon_admin(&$a, &$o)
 
        $o = Renderer::replaceMacros($t, [
                        '$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">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">Nominatim servers</a>')],
+                       '$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.')],
        ]);
@@ -220,10 +206,8 @@ function openstreetmap_addon_admin_post(&$a)
        $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(DI::l10n()->t('Settings updated.') . EOL);
+       DI::config()->set('openstreetmap', 'tmsserver', $urltms);
+       DI::config()->set('openstreetmap', 'nomserver', $urlnom);
+       DI::config()->set('openstreetmap', 'zoom', $zoom);
+       DI::config()->set('openstreetmap', 'marker', $marker);
 }