1 files changed, 11 insertions, 17 deletions

diff --git a/lib/d2/app/controllers/index.py b/lib/d2/app/controllers/index.py
index 1c6ae66..f8756c2 100644
--- a/lib/d2/app/controllers/index.py
+++ b/lib/d2/app/controllers/index.py
@@ -1,4 +1,4 @@
-from d2.app.controllers import BaseController 
+from d2.app.controllers import BaseController
 from d2.app.adapters.search import SearchAdapter
 from d2.app.adapters.forge import ForgeAdapter
 from d2.app.adapters.detail import DetailAdapter
@@ -31,24 +31,19 @@ class IndexController(BaseController):
         return self._plot_
 
     def _show_map(self, occupant_id, plot_id):
-        if plot_id:
-            forges = self._forge.get_forge_by_plot_id(plot_id)
-            details = self._detail.details(plot_id, occupant_id)
-            plots = self._plot.get_all([plot_id])
-        else: 
-            forges = self._forge.get_forge_by_occupant_id(occupant_id)
-            details = self._detail.details(plot_id, occupant_id)
-            plots = []
-            if len(forges) > 0:
-                plot_ids = [forge.plot_id for forge in forges]
-                plots = self._plot.get_all(plot_ids)
+        details = self._detail.details(plot_id, occupant_id)
+        forges = self._forge.get_forge_by_occupant_id(details.occupant_id)
+        plots = self._plot.get_all_from_forges(forges)
+        center_plot = None
+        for plot in plots:
+            if plot.id == details.plot_id:
+                center_plot=plot
 
-        self.render('index.html', 
-                mode="map", 
+        self.render('index.html',
+                mode="map",
                 details=details,
                 plots=plots,
-                forges=forges)
-
+                center_plot=center_plot)
 
     def get(self, type_1=None, id_1=None, type_2=None, id_2=None):
         if type_1 and id_1:
@@ -66,7 +61,6 @@ class IndexController(BaseController):
             self._show_map(occupant_id, plot_id)
         else:
             self.render('index.html', mode="get")
-        
 
     def post(self):
         name = self.get_argument('name')