 		return mapView
 	}
 
+	func show(mapEntry: MapEntry, animated: Bool = true) {
+		guard let map = mapEntry.Map, map.IsBrowseable else {
+			print("MapEntry without associated map or non-browsable map!")
+			return
+		}
+
+		self.mapEntry = mapEntry
+		show(map: map, animated: animated)
+	}
+
     /// Switches the view to map. Will do reload map if
     /// given map is already being displayed.
     /// - parameters:
-    ///   - map: map to be displayed
+    ///		- map: map to be displayed
+	///		- animated: should zooming and panning the new map to fit be animated?
 	func show(map: Map?, animated: Bool = false) {
         mapContainerView.subviews.forEach({ $0.removeFromSuperview() })
 		mapView = createMapView(for: MapViewController.imagePlaceholder)


		mapEntry = nil
		disposables.dispose()
		disposables = CompositeDisposable()
	}

	private func getMapEntryTargetRect() -> CGRect? {

			}
        } else if segmentedControl.selectedSegmentIndex <= maps.count {
			show(map: maps[segmentedControl.selectedSegmentIndex])
            currentMapEntryRadiusMultiplier = 1.0
            navigationItem.leftBarButtonItems = [burgerMenuItem]
        }
