X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=openstreetmap%2Fopenstreetmap.php;h=1a4a55714f8fe4b76f08b37d4d530f9ffdd480c7;hb=83425a7f269e57cf9d3959da59bfd4191e86ee91;hp=d61d0020ddfa2cdc636dce3493f2b64695a3c430;hpb=0afd633346b517894ff8e92c705bd5d052dd06a2;p=friendica-addons.git

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index d61d0020..1a4a5571 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -11,7 +11,8 @@
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
-
+use Friendica\Core\L10n;
+use Friendica\Util\Network;
 
 function openstreetmap_install()
 {
@@ -115,7 +116,7 @@ function openstreetmap_generate_named_map(&$a, &$b)
 		$nomserver = 'http://nominatim.openstreetmap.org/search.php';
 	$args = '?q=' . urlencode($b['location']) . '&format=json';
 
-	$x = z_fetch_url($nomserver . $args);
+	$x = Network::curl($nomserver . $args);
 	if($x['success']) {
 		$j = json_decode($x['body'],true);
 
@@ -139,12 +140,12 @@ function openstreetmap_generate_map(&$a, &$b)
 
 
 	$zoom = Config::get('openstreetmap', 'zoom');
-	if(! $zoom) {
+	if (!$zoom) {
 		$zoom = 16;
 	}
 
 	$marker = Config::get('openstreetmap', 'marker');
-	if(! $marker) {
+	if (!$marker) {
 		$marker = 0;
 	}
 
@@ -157,42 +158,41 @@ function openstreetmap_generate_map(&$a, &$b)
 
 	$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) ;
 
-	$b['html'] .=  '&amp;layer=mapnik&amp;marker=' . $lat . '%2C' . $lon . '" style="border: 1px solid black"></iframe><br/><small><a href="' . $tmsserver . '/?mlat=' . $lat . '&mlon=' . $lon . '#map=16/' . $lat . '/' . $lon . '">' . (($b['location']) ? escape_tags($b['location']) : t('View Larger')) . '</a></small>';
+	$b['html'] .=  '&amp;layer=mapnik&amp;marker=' . $lat . '%2C' . $lon . '" style="border: 1px solid black"></iframe><br/><small><a href="' . $tmsserver . '/?mlat=' . $lat . '&mlon=' . $lon . '#map=16/' . $lat . '/' . $lon . '">' . (($b['location']) ? escape_tags($b['location']) : L10n::t('View Larger')) . '</a></small>';
 
 	logger('generate_map: ' . $b['html'], LOGGER_DATA);
-
 }
 
-function openstreetmap_plugin_admin(&$a, &$o)
+function openstreetmap_addon_admin(&$a, &$o)
 {
 	$t = get_markup_template("admin.tpl", "addon/openstreetmap/");
 	$tmsserver = Config::get('openstreetmap', 'tmsserver');
-	if(! $tmsserver) {
+	if (!$tmsserver) {
 		$tmsserver = 'http://www.openstreetmap.org';
 	}
 	$nomserver = Config::get('openstreetmap', 'nomserver');
-	if(! $nomserver) {
+	if (!$nomserver) {
 		$nomserver = 'http://nominatim.openstreetmap.org/search.php';
 	}
 	$zoom = Config::get('openstreetmap', 'zoom');
-	if(! $zoom) {
+	if (!$zoom) {
 		$zoom = 16;
 	}
 	$marker = Config::get('openstreetmap', 'marker');
-	if(! $marker) {
+	if (!$marker) {
 		$marker = 0;
 	}
 
 	$o = replace_macros($t, [
-			'$submit' => t('Submit'),
-			'$tmsserver' => ['tmsserver', t('Tile Server URL'), $tmsserver, t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')],
-			'$nomserver' => ['nomserver', t('Nominatim (reverse geocoding) Server URL'), $nomserver, t('A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim servers</a>')],
-			'$zoom' => ['zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest, also depends on tile server)')],
-			'$marker' => ['marker', t('Include marker on map'), $marker, t('Include a marker on the map.')],
+			'$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.')],
 	]);
 }
 
-function openstreetmap_plugin_admin_post(&$a)
+function openstreetmap_addon_admin_post(&$a)
 {
 	$urltms = ((x($_POST, 'tmsserver')) ? notags(trim($_POST['tmsserver'])) : '');
 	$urlnom = ((x($_POST, 'nomserver')) ? notags(trim($_POST['nomserver'])) : '');
@@ -202,5 +202,5 @@ function openstreetmap_plugin_admin_post(&$a)
 	Config::set('openstreetmap', 'nomserver', $urlnom);
 	Config::set('openstreetmap', 'zoom', $zoom);
 	Config::set('openstreetmap', 'marker', $marker);
-	info( t('Settings updated.') . EOL);
+	info(L10n::t('Settings updated.') . EOL);
 }