X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fevent.php;h=bc9467dc80217a1c352277ebaf94ef91c4fe6c3d;hb=b4cf27e76731556c2b4d2941f51b74e1935e0ba7;hp=ce974bd50258293865b126210838f269f169ee74;hpb=6e5471def3477e84473bc237e10c7c75c9e6e853;p=friendica.git

diff --git a/include/event.php b/include/event.php
index ce974bd502..bc9467dc80 100644
--- a/include/event.php
+++ b/include/event.php
@@ -5,13 +5,13 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Features;
+use Friendica\Content\Feature;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Util\Map;
 
 require_once 'include/bbcode.php';
-require_once 'include/map.php';
 require_once 'include/datetime.php';
 require_once "include/conversation.php";
 
@@ -75,7 +75,7 @@ function format_event_html($ev, $simple = false) {
 
 		// Include a map of the location if the [map] BBCode is used.
 		if (strpos($ev['location'], "[map") !== false) {
-			$map = generate_named_map($ev['location']);
+			$map = Map::byLocation($ev['location']);
 			if ($map !== $ev['location']) {
 				$o.= $map;
 			}
@@ -967,9 +967,9 @@ function format_event_item($item) {
 	}
 	// Construct the map HTML.
 	if (isset($evloc['address'])) {
-		$location['map'] = '<div class="map">' . generate_named_map($evloc['address']) . '</div>';
+		$location['map'] = '<div class="map">' . Map::byLocation($evloc['address']) . '</div>';
 	} elseif (isset($evloc['coordinates'])) {
-		$location['map'] = '<div class="map">' . generate_map(str_replace('/', ' ', $evloc['coordinates'])) . '</div>';
+		$location['map'] = '<div class="map">' . Map::byCoordinates(str_replace('/', ' ', $evloc['coordinates'])) . '</div>';
 	}
 
 	// Construct the profile link (magic-auth).