xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

working, but very faint

Browse Source
This commit is contained in:
Philip Sargent 2021-04-16 21:47:40 +01:00
parent eca0bcc6d8
commit 4ad7033285
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/views/prospect.py
View File

@ -107,7 +107,7 @@ class MapLocations(object):
# Parameters for big map and zoomed subarea maps: # Parameters for big map and zoomed subarea maps:
# big map first (zoom factor ignored) # big map first (zoom factor ignored)
# These are the values for the url? /prospecting/[mapcode].png ?? # These are the values for the url /prospecting/[mapcode].png
maps = { maps = {
# id left top right bottom zoom # id left top right bottom zoom
@ -210,23 +210,23 @@ def plot(surveypoint, number, point_type, label, mapcode, draw, img):
def prospecting_image(request, name): def prospecting_image(request, name):
# We should replace all this with something that exports an overlay for Google Maps and OpenStreetView # We should replace all this with something that exports an overlay for Google Maps and OpenStreetView
test = os.path.join(settings.EXPOFILES, "location_maps", "testmap.png") # test = os.path.join(settings.EXPOFILES, "location_maps", "testmap.png")
response = HttpResponse(content_type = "image/png") # response = HttpResponse(content_type = "image/png")
with Image.open(test) as im: # with Image.open(test) as im:
draw = ImageDraw.Draw(im) # draw = ImageDraw.Draw(im)
draw.line((0, 0) + im.size, fill=128) # draw.line((0, 0) + im.size, fill=128)
draw.line((0, im.size[1], im.size[0], 0), fill=128) # draw.line((0, im.size[1], im.size[0], 0), fill=128)
# write to stdout # # write to stdout
#im.save(sys.stdout, "PNG") # #im.save(sys.stdout, "PNG")
img.save(response, "PNG") # img.save(response, "PNG")
return response # return response
mainImage = Image.open(os.path.join(settings.EXPOFILES, "location_maps", "pguidemap.jpg")) mainImage = Image.open(os.path.join(settings.EXPOFILES, "location_maps", "pguidemap.jpg"))
if settings.PUBLIC_SITE and not request.user.is_authenticated: # if settings.PUBLIC_SITE and not request.user.is_authenticated:
mainImage = Image.new("RGB", mainImage.size, '#ffffff') # mainImage = Image.new("RGB", mainImage.size, '#ffffff')
m = maps[name] m = maps[name]
#imgmaps = [] #imgmaps = []
if name == "all": if name == "all":

12
templates/prospecting.html
View File

@ -14,6 +14,18 @@
<p>The sub-areas names: '1a', '2a' etc. have not been in active use for some years as all exploration for at least the past two decades has been on the mid- to far-plateau. <p>The sub-areas names: '1a', '2a' etc. have not been in active use for some years as all exploration for at least the past two decades has been on the mid- to far-plateau.
<p>To see the old prospecting guide maps, follow this links (but wait - can take 2 minutes per map),
and you can't see any annotations unless you zoom in:
<ul>
<!-- mapcodes = ["all", "grieß","40", "76", "204", "tc"] -->
<li><a href="/prospecting/all.png">/prospecting/all.png</a>
<li><a href="/prospecting/tc.png">/prospecting/tc.png</a>
<li><a href="/prospecting/204.png">/prospecting/204.png</a>
<li><a href="/prospecting/76.png">/prospecting/76.png</a>
<li><a href="/prospecting/40.png">/prospecting/40.png</a>
<li><a href="/prospecting/grieß.png">/prospecting/grieß.png</a>
</ul>
<p><b>Notes:</b></p> <p><b>Notes:</b></p>
<ul><li>A marking status of "Retag" means a tag is in place but it carries a provisional number, or in some cases an incorrect number, and needs replacing with a new tag.</li> <ul><li>A marking status of "Retag" means a tag is in place but it carries a provisional number, or in some cases an incorrect number, and needs replacing with a new tag.</li>
<li>Kataster status codes indicate the size of a cave, its character and its exploration status, as described <a href="../katast.htm">here</a>.</li> <li>Kataster status codes indicate the size of a cave, its character and its exploration status, as described <a href="../katast.htm">here</a>.</li>