@@ -306,1 +336,3 @@
-        });
+        foreach($joins as $value) {
+            list($joinQueryFragment, $paramsFragment) = $this->generateTable($value[1], true);
+            array_push($joinQueries, $value[0] . ' JOIN ' . $joinQueryFragment . ' ON ' . $this->generateColumn($value[2]) . ' ' . $value[3] . ' ' . $this->generateColumn($value[4]));

@@ -304,3 +336,1 @@
-        array_walk($joins, function (&$value, $key) {
-            $value = $value[0] . ' JOIN ' . $this->generateTable($value[1], true) . ' ON ' . $this->generateColumn($value[2]) . ' ' . $value[3] . ' ' . $this->generateColumn($value[4]);
-        });
+        foreach($joins as $value) {

@@ -31,2 +41,4 @@
+    }
+
     //TODO: use Map instead of id
     public function getRandomNForMapWithValidPano(int $mapId, int $n, array $exclude = []): array

@@ -34,2 +46,4 @@
         $places = [];
 
+        $select = new Select(\Container::$dbConnection, 'places');
+        $select->where('id', 'NOT IN', $exclude);

@@ -45,3 +62,2 @@
 
-    //TODO: use Map instead of id
-    public function getRandomForMapWithValidPano(int $mapId, array $exclude = []): Place
+    private function getRandomForMapWithValidPano($numberOfPlaces, $select, array &$exclude, ?callable $pickRandomInt = null): ?Place

@@ -51,3 +72,3 @@
 
             $panoId = $place->getFreshPanoId();
-            if ($panoId === null) {
+            if($panoId === null) {

@@ -31,0 +35,4 @@
+            return $this->getRandomNForMapWithValidPano($mapId, $n);
+        } else { // authorized user or multiplayer game with selection based on what the host played before
+            $unvisitedPlaces = $this->getRandomUnvisitedNForMapWithValidPano($mapId, $n, $userId);
+            $oldPlaces = $this->getRandomOldNForMapWithValidPano($mapId, $n - count($unvisitedPlaces), $userId);