diff --git a/src/Util/Map.php b/src/Util/Map.php
index e2398b2fd1..6ca0b1b4c0 100644
--- a/src/Util/Map.php
+++ b/src/Util/Map.php
@@ -1,18 +1,24 @@
 <?php
+/**
+ * @file src/Util/Map.php
+ */
+namespace Friendica\Util;
 
 /**
  * Leaflet Map related functions
  */
- 
- function generate_map($coord) {
-	$coord = trim($coord);
-	$coord = str_replace(array(',','/','  '),array(' ',' ',' '),$coord);
-	$arr = array('lat' => trim(substr($coord,0,strpos($coord,' '))), 'lon' => trim(substr($coord,strpos($coord,' ')+1)), 'html' => '');
-	call_hooks('generate_map',$arr);
-	return (($arr['html']) ? $arr['html'] : $coord);
-}
-function generate_named_map($location) {
-	$arr = array('location' => $location, 'html' => '');
-	call_hooks('generate_named_map',$arr);
-	return (($arr['html']) ? $arr['html'] : $location);
+class Map {
+	public static function byCoordinates($coord) {
+		$coord = trim($coord);
+		$coord = str_replace(array(',','/','  '),array(' ',' ',' '),$coord);
+		$arr = array('lat' => trim(substr($coord,0,strpos($coord,' '))), 'lon' => trim(substr($coord,strpos($coord,' ')+1)), 'html' => '');
+		call_hooks('generate_map',$arr);
+		return ($arr['html']) ? $arr['html'] : $coord;
+	}
+
+	public static function byLocation($location) {
+		$arr = array('location' => $location, 'html' => '');
+		call_hooks('generate_named_map',$arr);
+		return ($arr['html']) ? $arr['html'] : $location;
+	}
 }