Made the sources of the 3d download files consistent

This commit is contained in:
Martin Green 2023-06-07 23:19:08 +01:00
parent d242a8bb1d
commit e42f0569fd

View File

@ -25,8 +25,8 @@
// Note the special code in views.caves.py to do this. The appropriate .svx/.3d file may not be simply the cave name +.3d
const ui = new CV2.CaveViewUI( viewer );
ui.loadCave('{{svx3d}}.3d');
//ui.loadCave('/cave/3d/{{cave}}');
//ui.loadCave('{{svx3d}}.3d');
ui.loadCave('{% url "cave3d" cave %}');
}
window.onload = onLoad;
</script>
@ -91,6 +91,8 @@
{{ cave.kataster_status|safe }}
{% endif %}
{% endcomment %}
{% comment "Is this underground centre line section ever usefull? I suspect it should be deleted. MJG" %}
{% endcomment %}
{% if cave.underground_centre_line %}
<h2>Underground Centre Line</h2>
{{ cave.underground_centre_line|safe }}
@ -193,9 +195,7 @@
All <a href="/survexfile/{{cave.kataster_number}}">survexfiles</a> for this cave {<br />
{% if cave.survex_file %}
Primary <a href="/survexfile/{{cave.survex_file}}">survex file</a> for this cave
<p>[<a href="https://aardgoose.github.io/CaveView.js/">CaveView</a> display of the .3d file is temporarily disabled while we fix things (Nov.2021).<br> See <a href="/handbook/computing/todo.rst">/handbook/computing/todo.rst</a>.]<br><br>
Download .3d file <a href="/cave/3d/{{cave}}">caves-{{ cave.area.all.0.kat_area }}/{{cave.kataster_number}}/{{svx3d}}.3d</a>
<br>
Download .3d file <a href="{% url "cave3d" cave %}">caves-{{ cave.area.all.0.kat_area }}/{{cave.kataster_number}}/{{svx3d}}.3d</a>
<br>
cave ID '{{cave.reference}}'<br>