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

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index e805632a..1a4a5571 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -8,29 +8,34 @@
  * Author: Klaus Weidenbach
  *
  */
- 
-require_once('include/cache.php');
-
-
-function openstreetmap_install() {
-	register_hook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
-	register_hook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
-	register_hook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
-	register_hook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
+use Friendica\Core\Addon;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Util\Network;
+
+function openstreetmap_install()
+{
+	Addon::registerHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
+	Addon::registerHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
+	Addon::registerHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
+	Addon::registerHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
 	logger("installed openstreetmap");
 }
 
-function openstreetmap_uninstall() {
-	unregister_hook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
-	unregister_hook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
-	unregister_hook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
-	unregister_hook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
+function openstreetmap_uninstall()
+{
+	Addon::unregisterHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
+	Addon::unregisterHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
+	Addon::unregisterHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
+	Addon::unregisterHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
 	logger("removed openstreetmap");
 }
 
-function openstreetmap_alterheader($a, &$navHtml) {
+function openstreetmap_alterheader($a, &$navHtml)
+{
 	$addScriptTag = '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
 	$a->page['htmlhead'] .= $addScriptTag;
 }
@@ -40,105 +45,109 @@ function openstreetmap_alterheader($a, &$navHtml) {
  *
  * If an item has coordinates add link to a tile map server, e.g. openstreetmap.org.
  * If an item has a location open it with the help of OSM's Nominatim reverse geocode search.
- * 
+ *
  * @param mixed $a
  * @param array& $item
  */
 function openstreetmap_location($a, &$item) {
 
-	if(! (strlen($item['location']) || strlen($item['coord'])))
+	if(! (strlen($item['location']) || strlen($item['coord']))) {
 		return;
+	}
 
 	/*
 	 * Get the configuration variables from the config.
-	 * @todo Separate the tile map server from the text-string to map tile server 
+	 * @todo Separate the tile map server from the text-string to map tile server
 	 * since they apparently use different URL conventions.
 	 * We use OSM's current convention of "#map=zoom/lat/lon" and optional
 	 * ?mlat=lat&mlon=lon for markers.
 	 */
 
-	$tmsserver = get_config('openstreetmap', 'tmsserver');
-	if(! $tmsserver)
+	$tmsserver = Config::get('openstreetmap', 'tmsserver');
+	if(! $tmsserver) {
 		$tmsserver = 'http://www.openstreetmap.org';
+	}
 
-	$nomserver = get_config('openstreetmap', 'nomserver');
-	if(! $nomserver)
+	$nomserver = Config::get('openstreetmap', 'nomserver');
+	if(! $nomserver) {
 		$nomserver = 'http://nominatim.openstreetmap.org/search.php';
+	}
 
-	$zoom = get_config('openstreetmap', 'zoom');
-	if(! $zoom)
+	$zoom = Config::get('openstreetmap', 'zoom');
+	if(! $zoom) {
 		$zoom = 16;
+	}
 
-	$marker = get_config('openstreetmap', 'marker');
-	if(! $marker)
+	$marker = Config::get('openstreetmap', 'marker');
+	if(! $marker) {
 		$marker = 0;
+	}
 
-	$location = '';
-	$coord = '';
-
-	$location = $item['location'];
-
-	$location = (($location && (! $item['coord'])) ? '<a target="map" title="' . $item['location'] . '" href="'.$nomserver . '?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : $location);
-
-	if($item['coord']) {
+	if ($item['coord'] != "") {
 		$coords = explode(' ', $item['coord']);
 		if(count($coords) > 1) {
 			$lat = urlencode(round($coords[0], 5));
 			$lon = urlencode(round($coords[1], 5));
-			$coord = '<a target="map" class="OSMMapLink" title="' . $item['coord'] . '" href="'. $tmsserver;
+			$target = $tmsserver;
 			if($marker > 0)
-				$coord .= '?mlat=' . $lat . '&mlon=' . $lon;
-			$coord .= '#map=' . intval($zoom) . '/' . $lat . '/' . $lon .'">Map</a>';
+				$target .= '?mlat='.$lat.'&mlon='.$lon;
+			$target .= '#map='.intval($zoom).'/'.$lat.'/'.$lon;
 		}
 	}
-	if(strlen($coord)) {
-		if($location)
-			$location .= '&nbsp;<span class="smalltext">(' . $coord . ')</span>';
-		else
-			$location = '<span class="smalltext">' . $coord . '</span>';
+
+	if ($target == "") {
+		$target = $nomserver.'?q='.urlencode($item['location']);
 	}
-	$item['html'] = $location;
-}
 
+	if ($item['location'] != "") {
+		$title = $item['location'];
+	} else {
+		$title = $item['coord'];
+	}
 
-function openstreetmap_generate_named_map(&$a,&$b) {
+	$item['html'] = '<a target="map" title="'.$title.'" href= "'.$target.'">'.$title.'</a>';
+}
 
 
-	$nomserver = get_config('openstreetmap', 'nomserver');
+function openstreetmap_generate_named_map(&$a, &$b)
+{
+	$nomserver = Config::get('openstreetmap', 'nomserver');
 	if(! $nomserver)
 		$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);
-		
+
 		if($j && is_array($j) && $j[0]['lat'] && $j[0]['lon']) {
-			$arr = array('lat' => $j[0]['lat'],'lon' => $j[0]['lon'],'location' => $b['location'], 'html' => '');
+			$arr = ['lat' => $j[0]['lat'],'lon' => $j[0]['lon'],'location' => $b['location'], 'html' => ''];
 			openstreetmap_generate_map($a,$arr);
 			$b['html'] = $arr['html'];
 		}
 	}
-	
-	
 }
 
-function openstreetmap_generate_map(&$a,&$b) {
-
-	$tmsserver = get_config('openstreetmap', 'tmsserver');
-	if(! $tmsserver)
+function openstreetmap_generate_map(&$a, &$b)
+{
+	$tmsserver = Config::get('openstreetmap', 'tmsserver');
+	if(! $tmsserver) {
 		$tmsserver = 'http://www.openstreetmap.org';
-	if(strpos(z_root(),'https:') !== false)
+	}
+	if(strpos(z_root(),'https:') !== false) {
 		$tmsserver = str_replace('http:','https:',$tmsserver);
+	}
 
 
-	$zoom = get_config('openstreetmap', 'zoom');
-	if(! $zoom)
+	$zoom = Config::get('openstreetmap', 'zoom');
+	if (!$zoom) {
 		$zoom = 16;
+	}
 
-	$marker = get_config('openstreetmap', 'marker');
-	if(! $marker)
+	$marker = Config::get('openstreetmap', 'marker');
+	if (!$marker) {
 		$marker = 0;
+	}
 
 	$lat = $b['lat']; // round($b['lat'], 5);
 	$lon = $b['lon']; // round($b['lon'], 5);
@@ -149,45 +158,49 @@ 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 = get_config('openstreetmap', 'tmsserver');
-	if(! $tmsserver)
+	$tmsserver = Config::get('openstreetmap', 'tmsserver');
+	if (!$tmsserver) {
 		$tmsserver = 'http://www.openstreetmap.org';
-	$nomserver = get_config('openstreetmap', 'nomserver');
-	if(! $nomserver)
+	}
+	$nomserver = Config::get('openstreetmap', 'nomserver');
+	if (!$nomserver) {
 		$nomserver = 'http://nominatim.openstreetmap.org/search.php';
-	$zoom = get_config('openstreetmap', 'zoom');
-	if(! $zoom)
+	}
+	$zoom = Config::get('openstreetmap', 'zoom');
+	if (!$zoom) {
 		$zoom = 16;
-	$marker = get_config('openstreetmap', 'marker');
-	if(! $marker)
+	}
+	$marker = Config::get('openstreetmap', 'marker');
+	if (!$marker) {
 		$marker = 0;
+	}
 
-	$o = replace_macros($t, array(
-			'$submit' => t('Submit'),
-			'$tmsserver' => array('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' => array('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' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest, also depends on tile server)')),
-			'$marker' => array('marker', t('Include marker on map'), $marker, t('Include a marker on the map.')),
-	));
+	$o = replace_macros($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.')],
+	]);
 }
-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'])) : '');
 	$zoom = ((x($_POST, 'zoom')) ? intval(trim($_POST['zoom'])) : '16');
 	$marker = ((x($_POST, 'marker')) ? intval(trim($_POST['marker'])) : '0');
-	set_config('openstreetmap', 'tmsserver', $urltms);
-	set_config('openstreetmap', 'nomserver', $urlnom);
-	set_config('openstreetmap', 'zoom', $zoom);
-	set_config('openstreetmap', 'marker', $marker);
-	info( t('Settings updated.') . EOL);
+	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);
 }
-
-