From 29c2c5f88de2da894230018903a0d7d16afc3858 Mon Sep 17 00:00:00 2001
From: Martin <devnull@localhost>
Date: Tue, 14 Aug 2012 15:08:08 +0200
Subject: [PATCH] added entrance locations

---
 core/models.py                | 6 ++++++
 templates/cave_entrances.html | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/models.py b/core/models.py
index 1c86dd5..f0ce909 100644
--- a/core/models.py
+++ b/core/models.py
@@ -568,6 +568,12 @@ class Entrance(TroggleModel):
     def __unicode__(self):
         return unicode(self.slug())
 
+    def exact_location(self):
+        return SurvexStation.objects.lookup(self.exact_station)
+    def other_location(self):
+        return SurvexStation.objects.lookup(self.other_station)
+
+
     def find_location(self):
         if self.tag_station:
             s = SurvexStation.objects.lookup(self.tag_station)
diff --git a/templates/cave_entrances.html b/templates/cave_entrances.html
index 6468ebc..b61d1ab 100644
--- a/templates/cave_entrances.html
+++ b/templates/cave_entrances.html
@@ -52,13 +52,13 @@
             <dt>Bearings</dt><dd>{{ ent.entrance.bearings|safe }}</dd>
         {% endif %}
         {% if ent.entrance.exact_station %}
-            <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }}</dd>
+            <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }} {{ ent.exact_location.tag.y|safe }}, {{ ent.entrance.exact_location.x|safe }}, {{ ent.entrance.exact_location.z|safe }}m</dd>
         {% endif %}
         {% if ent.entrance.other_station %}
             <dt>Other Station</dt><dd>{{ ent.entrance.other_station|safe }}
 		{% if ent.entrance.other_description %}
 			- {{ ent.entrance.other_description|safe }}
-		{% endif %}
+		{% endif %} {{ ent.entrance.other_location.y|safe }}, {{ ent.entrance.other_location.x|safe }}, {{ ent.entrance.other_location.z|safe }}m
 		</dd>
         {% endif %}
           </dl>