use Friendica\DI;
use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
* ?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)) {
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)) {
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);
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)) {
$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.')],
]);
$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);
+ DI::config()->set('openstreetmap', 'tmsserver', $urltms);
+ 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);
}