From df8618d0f0c7df09a90ecad9ef7885ee4da39e01 Mon Sep 17 00:00:00 2001
From: expo <expo@expobox.potato.hut>
Date: Thu, 1 Aug 2013 17:00:01 +0200
Subject: [PATCH] Prospecting guide and images and few minor other things.
---
.hgignore | 1 +
core/admin.py | 1 +
core/imageposcalc.ods | Bin 0 -> 11110 bytes
core/models.py | 70 +++++++---
core/views_caves.py | 233 +++++++++++++++++++++++++++++++++-
core/views_survex.py | 5 +-
localsettingsubuntu.py | 16 +--
settings.py | 4 +-
templates/cave_entrances.html | 4 +-
templates/prospecting.html | 68 +++++++---
urls.py | 2 +
11 files changed, 354 insertions(+), 50 deletions(-)
create mode 100644 core/imageposcalc.ods
diff --git a/.hgignore b/.hgignore
index ad091eb..cb29426 100644
--- a/.hgignore
+++ b/.hgignore
@@ -6,3 +6,4 @@ db*
localsettings.py
*~
parsing_log.txt
+troggle
diff --git a/core/admin.py b/core/admin.py
index 0192807..0c8b605 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -120,6 +120,7 @@ admin.site.register(LogbookEntry, LogbookEntryAdmin)
admin.site.register(QM, QMAdmin)
admin.site.register(Survey, SurveyAdmin)
admin.site.register(ScannedImage)
+admin.site.register(SurvexStation)
admin.site.register(SurvexScansFolder)
admin.site.register(SurvexScanSingle)
diff --git a/core/imageposcalc.ods b/core/imageposcalc.ods
new file mode 100644
index 0000000000000000000000000000000000000000..0cc2135652981d47a57a5fe8393eed70fd696f38
GIT binary patch
literal 11110
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
C_QK%+
literal 0
HcmV?d00001
diff --git a/core/models.py b/core/models.py
index e064814..a3bd832 100644
--- a/core/models.py
+++ b/core/models.py
@@ -249,7 +249,7 @@ class LogbookEntry(TroggleModel):
filename = models.CharField(max_length=200,null=True)
class Meta:
- verbose_name_plural = "Logbook Entries"
+ verbose_name_plural = "Logbook Entries"
# several PersonTrips point in to this object
ordering = ('-date',)
@@ -397,11 +397,14 @@ class Cave(TroggleModel):
#href = models.CharField(max_length=100)
+
+ class Meta:
+ ordering = ('kataster_code', 'unofficial_number')
def hassurvey(self):
if not self.underground_centre_line:
return "No"
- if (self.underground_centre_line.find("<img") > -1 or self.underground_centre_line.find("<a") > -1):
+ if (self.survey.find("<img") > -1 or self.survey.find("<a") > -1 or self.survey.find("<IMG") > -1 or self.survey.find("<A") > -1):
return "Yes"
return "Missing"
@@ -501,8 +504,17 @@ class Cave(TroggleModel):
u8 = u.encode("utf-8")
f.write(u8)
f.close()
-
-
+
+ def getArea(self):
+ areas = self.area.all()
+ lowestareas = list(areas)
+ for area in areas:
+ if area.parent in areas:
+ try:
+ lowestareas.remove(area.parent)
+ except:
+ pass
+ return lowestareas[0]
def getCaveByReference(reference):
areaname, code = reference.split("-", 1)
@@ -539,7 +551,7 @@ class Entrance(TroggleModel):
('P?', 'Paint (?)'),
('T', 'Tag'),
('T?', 'Tag (?)'),
- ('R', 'Retagged'),
+ ('R', 'Needs Retag'),
('S', 'Spit'),
('S?', 'Spit (?)'),
('U', 'Unmarked'),
@@ -548,7 +560,7 @@ class Entrance(TroggleModel):
marking_comment = models.TextField(blank=True,null=True)
FINDABLE_CHOICES = (
('?', 'To be confirmed ...'),
- ('S', 'Surveyed'),
+ ('S', 'Coordinates'),
('L', 'Lost'),
('R', 'Refindable'))
findability = models.CharField(max_length=1, choices=FINDABLE_CHOICES, blank=True, null=True)
@@ -575,21 +587,46 @@ class Entrance(TroggleModel):
def find_location(self):
+ r = {'': 'To be entered ',
+ '?': 'To be confirmed:',
+ 'S': '',
+ 'L': 'Lost:',
+ 'R': 'Refindable:'}[self.findability]
if self.tag_station:
- s = SurvexStation.objects.lookup(self.tag_station)
- return "%0.0fE %0.0fN %0.0fAlt" % (s.x, s.y, s.z)
+ try:
+ s = SurvexStation.objects.lookup(self.tag_station)
+ return r + "%0.0fE %0.0fN %0.0fAlt" % (s.x, s.y, s.z)
+ except:
+ return r + "%s Tag Station not in dataset" % self.tag_station
if self.exact_station:
- s = SurvexStation.objects.lookup(self.exact_station)
- return "%0.0fE %0.0fN %0.0fAlt" % (s.x, s.y, s.z)
+ try:
+ s = SurvexStation.objects.lookup(self.exact_station)
+ return r + "%0.0fE %0.0fN %0.0fAlt" % (s.x, s.y, s.z)
+ except:
+ return r + "%s Exact Station not in dataset" % self.tag_station
if self.other_station:
- s = SurvexStation.objects.lookup(self.other_station)
- return "%0.0fE %0.0fN %0.0fAlt %s" % (s.x, s.y, s.z, self.other_description)
- if self.bearings:
- return self.bearings
+ try:
+ s = SurvexStation.objects.lookup(self.other_station)
+ return r + "%0.0fE %0.0fN %0.0fAlt %s" % (s.x, s.y, s.z, self.other_description)
+ except:
+ return r + "%s Other Station not in dataset" % self.tag_station
+ if self.FINDABLE_CHOICES == "S":
+ r += "ERROR, Entrance has been surveyed but has no survex point"
+ if self.bearings:
+ return r + self.bearings
+ return r
+
+ def best_station(self):
+ if self.tag_station:
+ return self.tag_station
+ if self.exact_station:
+ return self.exact_station
+ if self.other_station:
+ return self.other_station
def has_photo(self):
if self.photo:
- if (self.photo.find("<img") > -1 or self.photo.find("<a") > -1):
+ if (self.photo.find("<img") > -1 or self.photo.find("<a") > -1 or self.photo.find("<IMG") > -1 or self.photo.find("<A") > -1):
return "Yes"
else:
return "Missing"
@@ -607,6 +644,9 @@ class Entrance(TroggleModel):
def tag(self):
return SurvexStation.objects.lookup(self.tag_station)
+
+ def needs_surface_work(self):
+ return self.findability != "S" or not self.has_photo or self.marking != "T"
def get_absolute_url(self):
diff --git a/core/views_caves.py b/core/views_caves.py
index 16dbaac..7a266b5 100644
--- a/core/views_caves.py
+++ b/core/views_caves.py
@@ -1,4 +1,7 @@
-from troggle.core.models import CaveSlug, Cave, CaveAndEntrance, Survey, Expedition, QM, CaveDescription, EntranceSlug, Entrance, Area
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from troggle.core.models import CaveSlug, Cave, CaveAndEntrance, Survey, Expedition, QM, CaveDescription, EntranceSlug, Entrance, Area, SurvexStation
from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm
import troggle.core.models as models
import troggle.settings as settings
@@ -8,10 +11,13 @@ from django.forms.models import modelformset_factory
from django import forms
from django.core.urlresolvers import reverse
from utils import render_with_context # see views_logbooks for explanation on this.
-from django.http import HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect
from django.conf import settings
import re, urlparse
from django.shortcuts import get_object_or_404
+import settings
+
+import Image, ImageDraw, ImageFont, string, os, sys
def getCave(cave_id):
"""Returns a cave object when given a cave name or number. It is used by views including cavehref, ent, and qm."""
@@ -249,19 +255,21 @@ def get_qms(request, caveslug):
return render_with_context(request,'options.html', {"items": [(e.entrance.slug(), e.entrance.slug()) for e in cave.entrances()]})
areanames = [
- #('', 'Location unclear'),
+ ('', 'Location unclear'),
('1a', '1a – Plateau: around Top Camp'),
('1b', '1b – Western plateau near 182'),
('1c', '1c – Eastern plateau near 204 walk-in path'),
('1d', '1d – Further plateau around 76'),
('2a', '2a – Southern Schwarzmooskogel near 201 path and the Nipple'),
('2b', '2b – Eishöhle area'),
+ ('2b or 4 (unclear)', '2b or 4 (unclear)'),
('2c', '2c – Kaninchenhöhle area'),
('2d', '2d – Steinbrückenhöhle area'),
('3', '3 – Bräuning Alm'),
('4', '4 – Kratzer valley'),
('5', '5 – Schwarzmoos-Wildensee'),
('6', '6 – Far plateau'),
+ ('1626 or 6 (borderline)', '1626 or 6 (borderline)'),
('7', '7 – Egglgrube'),
('8a', '8a – Loser south face'),
('8b', '8b – Loser below Dimmelwand'),
@@ -274,8 +282,221 @@ areanames = [
def prospecting(request):
+ #for key, name in areanames:
+ # print key, Area.objects.get(short_name = key)
+ areas = []
for key, name in areanames:
- print key, Area.objects.get(short_name = key)
- areas = [ (name, Area.objects.get(short_name = key)) for key, name in areanames ]
- return render_with_context(request,'prospecting.html', {"areas": areas})
+ a = Area.objects.get(short_name = key)
+ caves = list(a.cave_set.all())
+ caves.sort(caveCmp)
+ areas.append((name, a, caves))
+ return render_with_context(request, 'prospecting.html', {"areas": areas})
+
+# Parameters for big map and zoomed subarea maps:
+# big map first (zoom factor ignored)
+
+maps = {
+# id left top right bottom zoom
+# G&K G&K G&K G&K factor
+"all": [33810.4, 85436.5, 38192.0, 81048.2, 0.35,
+ "All"],
+"40": [36275.6, 82392.5, 36780.3, 81800.0, 3.0,
+ "Eishöhle"],
+"76": [35440.0, 83220.0, 36090.0, 82670.0, 1.3,
+ "Eislufthöhle"],
+"204": [36354.1, 84154.5, 37047.4, 83300, 3.0,
+ "Steinbrückenhöhle"],
+"tc": [35230.0, 82690.0, 36110.0, 82100.0, 3.0,
+ "Near Top Camp"],
+"grieß":
+ [36000.0, 86300.0, 38320.0, 84400.0, 4.0,
+ "Grießkogel Area"],
+}
+
+for n in maps.keys():
+ L, T, R, B, S, name = maps[n]
+ W = (R-L)/2
+ H = (T-B)/2
+ for i in range(2):
+ for j in range(2):
+ maps["%s%i%i" % (n, i, j)] = [L + i * W, T - j * H, L + (i + 1) * W, T - (j + 1) * H, S, name]
+# Keys in the order in which we want the maps output
+mapcodes = ["all", "grieß","40", "76", "204", "tc"]
+# Field codes
+L = 0
+T = 1
+R = 2
+B = 3
+ZOOM = 4
+DESC = 5
+
+areacolours = {
+ '1a' : '#00ffff',
+ '1b' : '#ff00ff',
+ '1c' : '#ffff00',
+ '1d' : '#ffffff',
+ '2a' : '#ff0000',
+ '2b' : '#00ff00',
+ '2c' : '#008800',
+ '2d' : '#ff9900',
+ '3' : '#880000',
+ '4' : '#0000ff',
+ '6' : '#000000', # doubles for surface fixed pts, and anything else
+ '7' : '#808080'
+ }
+
+
+for FONT in [
+ "/usr/share/fonts/truetype/freefont/FreeSans.ttf",
+ "/usr/X11R6/lib/X11/fonts/truetype/arial.ttf",
+ "C:\WINNT\Fonts\ARIAL.TTF"
+ ]:
+ if os.path.isfile(FONT): break
+TEXTSIZE = 16
+CIRCLESIZE =8
+LINEWIDTH = 2
+myFont = ImageFont.truetype(FONT, TEXTSIZE)
+
+def mungecoord(x, y, mapcode, img):
+ # Top of Zinken is 73 1201 = dataset 34542 81967
+ # Top of Hinter is 1073 562 = dataset 36670 83317
+ # image is 1417 by 2201
+ # FACTOR1 = 1000.0 / (36670.0-34542.0)
+ # FACTOR2 = (1201.0-562.0) / (83317 - 81967)
+ # FACTOR = (FACTOR1 + FACTOR2)/2
+ # The factors aren't the same as the scanned map's at a slight angle. I
+ # can't be bothered to fix this. Since we zero on the Hinter it makes
+ # very little difference for caves in the areas round 76 or 204.
+ # xoffset = (x - 36670)*FACTOR
+ # yoffset = (y - 83317)*FACTOR
+ # return (1073 + xoffset, 562 - yoffset)
+
+ m = maps[mapcode]
+ factorX, factorY = img.size[0] / (m[R] - m[L]), img.size[1] / (m[T] - m[B])
+ return ((x - m[L]) * factorX, (m[T] - y) * factorY)
+
+COL_TYPES = {True: "red",
+ False: "#dddddd",
+ "Reference": "#dddddd"}
+
+def plot(surveypoint, number, point_type, label, mapcode, draw, img):
+ try:
+ ss = SurvexStation.objects.lookup(surveypoint)
+ E, N = ss.x, ss.y
+ shortnumber = number.replace("—","")
+ (x,y) = map(int, mungecoord(E, N, mapcode, img))
+ #imgmaps[maparea].append( [x-4, y-SIZE/2, x+4+draw.textsize(shortnumber)[0], y+SIZE/2, shortnumber, label] )
+ draw.rectangle([(x+CIRCLESIZE, y-TEXTSIZE/2), (x+CIRCLESIZE*2+draw.textsize(shortnumber)[0], y+TEXTSIZE/2)], fill="#ffffff")
+ draw.text((x+CIRCLESIZE * 1.5,y-TEXTSIZE/2), shortnumber, fill="#000000")
+ draw.ellipse([(x-CIRCLESIZE,y-CIRCLESIZE),(x+CIRCLESIZE,y+CIRCLESIZE)], fill=COL_TYPES[point_type], outline="#000000")
+ except:
+ pass
+
+def prospecting_image(request, name):
+
+ mainImage = Image.open(os.path.join(settings.SURVEY_SCANS, "location_maps", "pguidemap.jpg"))
+ if settings.PUBLIC_SITE and not request.user.is_authenticated():
+ mainImage = Image.new("RGB", mainImage.size, '#ffffff')
+ m = maps[name]
+ #imgmaps = []
+ if name == "all":
+ img = mainImage
+ else:
+ M = maps['all']
+ W, H = mainImage.size
+ l = int((m[L] - M[L]) / (M[R] - M[L]) * W)
+ t = int((m[T] - M[T]) / (M[B] - M[T]) * H)
+ r = int((m[R] - M[L]) / (M[R] - M[L]) * W)
+ b = int((m[B] - M[T]) / (M[B] - M[T]) * H)
+ img = mainImage.crop((l, t, r, b))
+ w = int(round(m[ZOOM] * (m[R] - m[L]) / (M[R] - M[L]) * W))
+ h = int(round(m[ZOOM] * (m[B] - m[T]) / (M[B] - M[T]) * H))
+ img = img.resize((w, h), Image.BICUBIC)
+ draw = ImageDraw.Draw(img)
+ draw.setfont(myFont)
+ if name == "all":
+ for maparea in maps.keys():
+ if maparea == "all":
+ continue
+ localm = maps[maparea]
+ l,t = mungecoord(localm[L], localm[T], "all", img)
+ r,b = mungecoord(localm[R], localm[B], "all", img)
+ text = maparea + " map"
+ textlen = draw.textsize(text)[0] + 3
+ draw.rectangle([l, t, l+textlen, t+TEXTSIZE+2], fill='#ffffff')
+ draw.text((l+2, t+1), text, fill="#000000")
+ #imgmaps.append( [l, t, l+textlen, t+SIZE+2, "submap" + maparea, maparea + " subarea map"] )
+ draw.line([l, t, r, t], fill='#777777', width=LINEWIDTH)
+ draw.line([l, b, r, b], fill='#777777', width=LINEWIDTH)
+ draw.line([l, t, l, b], fill='#777777', width=LINEWIDTH)
+ draw.line([r, t, r, b], fill='#777777', width=LINEWIDTH)
+ draw.line([l, t, l+textlen, t], fill='#777777', width=LINEWIDTH)
+ draw.line([l, t+TEXTSIZE+2, l+textlen, t+TEXTSIZE+2], fill='#777777', width=LINEWIDTH)
+ draw.line([l, t, l, t+TEXTSIZE+2], fill='#777777', width=LINEWIDTH)
+ draw.line([l+textlen, t, l+textlen, t+TEXTSIZE+2], fill='#777777', width=LINEWIDTH)
+ #imgmaps[maparea] = []
+ # Draw scale bar
+ m100 = int(100 / (m[R] - m[L]) * img.size[0])
+ draw.line([10, TEXTSIZE*3, 10, TEXTSIZE*2], fill='#000000', width=LINEWIDTH)
+ draw.line([10, TEXTSIZE*2, 10+m100, TEXTSIZE*2], fill='#000000', width=LINEWIDTH)
+ draw.line([10+m100, TEXTSIZE * 3, 10+m100, TEXTSIZE*2], fill='#000000', width=LINEWIDTH)
+ label = "100m"
+ draw.text([10 + (m100 - draw.textsize(label)[0]) / 2, TEXTSIZE/2], label, fill='#000000')
+ plot("laser.0_7", "BNase", "Reference", "Bräuning Nase laser point", name, draw, img)
+ plot("226-96", "BZkn", "Reference", "Bräuning Zinken trig point", name, draw, img)
+ plot("vd1","VD1","Reference", "VD1 survey point", name, draw, img)
+ plot("laser.kt114_96","HSK","Reference", "Hinterer Schwarzmooskogel trig point", name, draw, img)
+ plot("2000","Nipple","Reference", "Nipple (Weiße Warze)", name, draw, img)
+ plot("3000","VSK","Reference", "Vorderer Schwarzmooskogel summit", name, draw, img)
+ plot("topcamp", "TC", "Reference", "Top Camp", name, draw, img)
+ plot("laser.0", "LSR0", "Reference", "Laser Point 0", name, draw, img)
+ plot("laser.0_1", "LSR1", "Reference", "Laser Point 0/1", name, draw, img)
+ plot("laser.0_3", "LSR3", "Reference", "Laser Point 0/3", name, draw, img)
+ plot("laser.0_5", "LSR5", "Reference", "Laser Point 0/5", name, draw, img)
+ plot("225-96", "BAlm", "Reference", "Bräuning Alm trig point", name, draw, img)
+ for entrance in Entrance.objects.all():
+ station = entrance.best_station()
+ if station:
+ #try:
+ areaName = entrance.caveandentrance_set.all()[0].cave.getArea().short_name
+ plot(station, "%s-%s" % (areaName, str(entrance)[5:]), entrance.needs_surface_work(), str(entrance), name, draw, img)
+ #except:
+ # pass
+
+ for (N, E, D, num) in [(35975.37, 83018.21, 100,"177"), # Calculated from bearings
+ (35350.00, 81630.00, 50, "71"), # From Auer map
+ (36025.00, 82475.00, 50, "146"), # From mystery map
+ (35600.00, 82050.00, 50, "35"), # From Auer map
+ (35650.00, 82025.00, 50, "44"), # From Auer map
+ (36200.00, 82925.00, 50, "178"), # Calculated from bearings
+ (35232.64, 82910.37, 25, "181"), # Calculated from bearings
+ (35323.60, 81357.83, 50, "74") # From Auer map
+ ]:
+ (N,E,D) = map(float, (N, E, D))
+ maparea = Cave.objects.get(kataster_number = num).getArea().short_name
+ lo = mungecoord(N-D, E+D, name, img)
+ hi = mungecoord(N+D, E-D, name, img)
+ lpos = mungecoord(N-D, E, name, img)
+ draw.ellipse([lo,hi], outline="#000000")
+ draw.ellipse([lo[0]+1, lo[1]+1, hi[0]-1, hi[1]-1], outline=areacolours[maparea])
+ draw.ellipse([lo[0]+2, lo[1]+2, hi[0]-2, hi[1]-2], outline=areacolours[maparea])
+ draw.rectangle([lpos[0],lpos[1]-TEXTSIZE/2, lpos[0] + draw.textsize(name)[0], lpos[1]+TEXTSIZE/2], fill="#ffffff")
+ draw.text((lpos[0], lpos[1]-TEXTSIZE/2), num, fill="#000000")
+ response = HttpResponse(content_type = "image/png")
+ del draw
+ img.save(response, "PNG")
+ return response
+
+STATIONS = {}
+poslineregex = re.compile("^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$")
+def LoadPos():
+ call([settings.CAVERN, "--output=%s/all.3d" % settings.SURVEX_DATA, "%s/all.svx" % settings.SURVEX_DATA])
+ call([settings.THREEDTOPOS, '%sall.3d' % settings.SURVEX_DATA], cwd = settings.SURVEX_DATA)
+ posfile = open("%sall.pos" % settings.SURVEX_DATA)
+ posfile.readline()#Drop header
+ for line in posfile.readlines():
+ r = poslineregex.match(line)
+ if r:
+ x, y, z, name = r.groups()
+ STATIONS[name] = (x, y, z)
diff --git a/core/views_survex.py b/core/views_survex.py
index cf3b556..3c53625 100644
--- a/core/views_survex.py
+++ b/core/views_survex.py
@@ -243,7 +243,8 @@ def identifycavedircontents(gcavedir):
else:
subsvx.append(nf)
else:
- assert re.match(".*?(?:.3d|.log|.err|.txt|.tmp|.diff|.e?spec|~)$", f), (gcavedir, f)
+ pass
+ #assert re.match(".*?(?:.3d|.log|.err|.txt|.tmp|.diff|.e?spec|~)$", f), (gcavedir, f)
subsvx.sort()
#assert primesvx, (gcavedir, subsvx)
if primesvx:
@@ -317,4 +318,4 @@ def survexcavesingle(request, survex_cave):
-
\ No newline at end of file
+
diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py
index 5a1f944..fcc8a73 100644
--- a/localsettingsubuntu.py
+++ b/localsettingsubuntu.py
@@ -2,13 +2,13 @@ import sys
# link localsettings to this file for use on expo computer in austria
DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME': 'troggle', # Or path to database file if using sqlite3.
- 'USER': 'expo', # Not used with sqlite3.
- 'PASSWORD': 'gosser', # Not used with sqlite3.
- 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ 'default': {
+ 'ENGINE': 'django.db.backends.mysql', # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+ 'NAME' : 'troggle', # Or path to database file if using sqlite3.
+ 'USER' : 'expo', # Not used with sqlite3.
+ 'PASSWORD' : 'gosser', # Not used with sqlite3.
+ 'HOST' : '', # Set to empty string for localhost. Not used with sqlite3.
+ 'PORT' : '', # Set to empty string for default. Not used with sqlite3.
}
}
@@ -30,7 +30,7 @@ SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/'
FILES = REPOS_ROOT_PATH + 'expoimages'
-PYTHON_PATH = REPOS_ROOT_PATH + 'hg/troggle/'
+PYTHON_PATH = REPOS_ROOT_PATH + 'troggle/'
#URL_ROOT = 'http://127.0.0.1:8000'
URL_ROOT = "http://expoweb/"
diff --git a/settings.py b/settings.py
index 47d48ae..0032c2a 100644
--- a/settings.py
+++ b/settings.py
@@ -52,8 +52,8 @@ SECRET_KEY = 'a#vaeozn0)uz_9t_%v5n#tj)m+%ace6b_0(^fj!355qki*v)j2'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
# 'django.template.loaders.eggs.load_template_source',
)
diff --git a/templates/cave_entrances.html b/templates/cave_entrances.html
index 3a75a02..5b70196 100644
--- a/templates/cave_entrances.html
+++ b/templates/cave_entrances.html
@@ -46,13 +46,13 @@
<dt>Location</dt><dd>{{ ent.entrance.northing|safe }}, {{ ent.entrance.easting|safe }}, {{ ent.entrance.alt|safe }}m</dd>
{% endif %}
{% if ent.entrance.tag_station %}
- <dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }}{{ ent.entrance.tag.y|safe }}, {{ ent.entrance.tag.x|safe }}, {{ ent.entrance.tag.z|safe }}m</dd>
+ <dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }} {{ ent.entrance.tag.y|safe }}, {{ ent.entrance.tag.x|safe }}, {{ ent.entrance.tag.z|safe }}m</dd>
{% endif %}
{% if ent.entrance.bearings %}
<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 }} {{ ent.exact_location.tag.y|safe }}, {{ ent.entrance.exact_location.x|safe }}, {{ ent.entrance.exact_location.z|safe }}m</dd>
+ <dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }} {{ ent.entrance.exact_location.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 }}
diff --git a/templates/prospecting.html b/templates/prospecting.html
index 0d7a0d6..a2ab512 100644
--- a/templates/prospecting.html
+++ b/templates/prospecting.html
@@ -11,18 +11,18 @@
<li>For more info on each cave, see the links to detailed description pages.</li>
</ul>
-{% for name, area in areas %}
+{% for name, area, caves in areas %}
<h2>{{name|safe}}</h2>
- <table border=\"1\" width="100%">
- <col><col><col><col><col><col><col><col><col width="45%">
+ <table border="1" width="100%">
+ <col><col><col><col><col><col><col><col><col>
<thead>
- <tr><th>Cave Number</th><th>Name</th><th>Finished</th><th>Survey<br>Data</th><th>Survey<br>Drawn</th><th>Marked</th><th>Photo</th><th>Position</th><th>Location</th></tr>
+ <tr><th>Cave Number</th><th>Name</th><th>Finished</th><th>Survey<br>Data</th><th>Survey<br>Drawn</th><th>Marked</th><th>Photo</th><th>Position</th></tr>
</thead>
<tbody>
- {% for cave in area.cave_set.all %}
+ {% for cave in caves %}
{% if cave.singleentrance %}
<tr{% if cave.ours %} class="ours"{% else %} class="notours"{% endif %}>
- <td>{{ cave }}</td>
+ <td><a href="/{{ cave.url }}">{{ cave }}</a></td>
<td>{{ cave.official_name|safe }}</td>
<td>{{ cave.kataster_code }}</td>
<td>{{ cave.hassurveydata }}</td>
@@ -30,13 +30,32 @@
<td>{{ cave.caveandentrance_set.all.0.entrance.marking_val }}</td>
<td>{{ cave.caveandentrance_set.all.0.entrance.has_photo }} </td>
<td>{{ cave.caveandentrance_set.all.0.entrance.find_location }}</td>
- <td>{% if cave.caveandentrance_set.all.0.entrance.location_description %}Location: {{ cave.caveandentrance_set.all.0.entrance.location_description|safe }}{% endif %}
- {% if cave.caveandentrance_set.all.0.entrance.map_description %}Map: {{ cave.caveandentrance_set.all.0.entrance.map_description|safe }}{% endif %}
- {% if cave.caveandentrance_set.all.0.entrance.approach %}Approach: {{ cave.caveandentrance_set.all.0.entrance.approach|safe }}{% endif %}</td>
</tr>
+ {% if cave.caveandentrance_set.all.0.entrance.location_description %}
+ <tr><th>Location</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.location_description|safe }}</td></tr>
+ {% endif %}
+ {% if cave.caveandentrance_set.all.0.entrance.map_description %}
+ <tr><th>Map</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.map_description|safe }}</td></tr>
+ {% endif %}
+ {% if cave.caveandentrance_set.all.0.entrance.approach %}
+ <tr><th>Approach</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.approach|safe }}</td></tr>
+ {% endif %}
+ {% if cave.caveandentrance_set.all.0.entrance.findability_description %}
+ <tr><th>Findability</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.findability_description|safe }}</td></tr>
+ {% endif %}
+ {% if cave.caveandentrance_set.all.0.entrance.marking_comment %}
+ <tr><th>Marking</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.marking_comment|safe }}</td></tr>
+ {% endif %}
+ {% if cave.caveandentrance_set.all.0.entrance.entrance_description %}
+ <tr><th>Ent Desc</th><td colspan="9">{{ cave.caveandentrance_set.all.0.entrance.entrance_description|safe }}</td></tr>
+ {% endif %}
+ {% if cave.underground_description %}
+ <tr><th>Under Desc</th><td colspan="9">{{ cave.underground_description|truncatewords_html:80 }}</td></tr>
+ {% endif %}
+
{% else %}
<tr{% if cave.ours %} class="ours"{% else %} class="notours"{% endif %}>
- <td>{{ cave }}</td>
+ <td><a href="/{{ cave.url }}">{{ cave }}</a></td>
<td>{{ cave.official_name|safe }}</td>
<td>{{ cave.kataster_code }}</td>
<td>{{ cave.hassurveydata }}</td>
@@ -46,20 +65,39 @@
<td></td>
<td></td>
</tr>
+ {% if cave.underground_description %}
+ <tr><th>Under Desc</th><td colspan="9">{{ cave.underground_description|truncatewords_html:80 }}</td></tr>
+ {% endif %}
{% for caveandentrance in cave.caveandentrance_set.all %}
<tr{% if cave.ours %} class="ours"{% else %} class="notours"{% endif %}>
- <td>{{ caveandentrance.entrance_letter}}</td>
+ <td><a href="/{{ cave.url }}">{{ caveandentrance.entrance_letter}}</a></td>
<td>{{ caveandentrance.entrance.name|safe }}</td>
<td></td>
<td></td>
<td></td>
<td>{{ caveandentrance.entrance.marking_val }}</td>
<td>{{ caveandentrance.entrance.has_photo }} </td>
- <td>{{ caveandentrance.entrance.find_location|safe }}</td>
- <td>{% if cave.caveandentrance_set.all.0.entrance.location_description %}Location: {{ cave.caveandentrance_set.all.0.entrance.location_description|safe }}{% endif %}
- {% if cave.caveandentrance_set.all.0.entrance.map_description %}Map: {{ cave.caveandentrance_set.all.0.entrance.map_description|safe }}{% endif %}
- {% if cave.caveandentrance_set.all.0.entrance.approach %}Approach: {{ cave.caveandentrance_set.all.0.entrance.approach|safe }}{% endif %}</td>
+ <td>{{ caveandentrance.entrance.find_location|safe }}</td>
</tr>
+ <tr>
+ {% if caveandentrance.entrance.location_description %}
+ <tr><td>Location</td><td colspan="9">{{ caveandentrance.entrance.location_description|safe }}</td></tr>
+ {% endif %}
+ {% if caveandentrance.entrance.map_description %}
+ <tr><td>Map</td><td colspan="9">{{ caveandentrance.entrance.map_description|safe }}</td></tr>
+ {% endif %}
+ {% if caveandentrance.entrance.approach %}
+ <tr><td>Approach</td><td colspan="9">{{ caveandentrance.entrance.approach|safe }}</td></tr>
+ {% endif %}
+ {% if caveandentrance.entrance.findability_description %}
+ <tr><th>Findability</th><td colspan="9">{{ caveandentrance.entrance.findability_description|safe }}</td></tr>
+ {% endif %}
+ {% if caveandentrance.entrance.marking_comment %}
+ <tr><th>Marking</th><td colspan="9">{{ caveandentrance.entrance.marking_comment|safe }}</td></tr>
+ {% endif %}
+ {% if cave.caveandentrance_set.all.0.entrance.entrance_description %}
+ <tr><th>Ent Desc</th><td colspan="9">{{ caveandentrance.entrance.entrance_description|safe }}</td></tr>
+ {% endif %}
{% endfor %}
{% endif %}
{% endfor %}
diff --git a/urls.py b/urls.py
index 106195d..fb2f698 100644
--- a/urls.py
+++ b/urls.py
@@ -139,6 +139,8 @@ actualurlpatterns = patterns('',
(r'^photos/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}),
+
+ url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"),
# (r'^gallery/(?P<path>.*)$', 'django.views.static.serve',
# {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}),