Add waffer and hardy and attempt to fix laurel

tr1813 · Feb 16, 2021 · 8a5d8ab · 8a5d8ab
1 parent a7d8c16
commit 8a5d8ab
Show file tree

Hide file tree

Showing 10 changed files with 527 additions and 514 deletions.
diff --git a/configs/overview/vrtnarija.thconfig b/configs/overview/vrtnarija.thconfig
@@ -22,32 +22,35 @@ input "../../layouts/user_label.thl"
 #----------------------------------------------------------------------------------|
 # select the relevant map definitions, and levels within those maps
 #select m-all-p@vrtnarija.vrtnarija_vilinska.system_migovec -map-level 0
+select m-original_entrance_series-p@vrtnarija.vrtnarija_vilinska.system_migovec
 
 #----------------------------------------------------------------------------------|
 # export a PLAN view, using the LAYOUT overview1
 layout plan
 	copy base-p
 	copy colour-by-new
 	copy user_label
-	map-comment "<lang:sl>Občina Tolmin, Slovenija<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Raziskave: 2000-2015<br>Natančmost meritev IV/B<br><br>Vrtnarija<br>kat. št.: XXXX<br><br>Vilinska Jama<br>kat. št.: YYYYY<lang:en>Tolmin, Julian Alps<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Exploration: 2000-2015<br>BCRA grade 4-5b<br><br>Vrtnarija<br>Cadastral number: XXXX<br><br>Vilinska Jama<br>Cadastral number: XXXX<br>"
+	#map-comment "<lang:sl>Občina Tolmin, Slovenija<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Raziskave: 2000-2015<br>Natančmost meritev IV/B<br><br>Vrtnarija<br>kat. št.: XXXX<br><br>Vilinska Jama<br>kat. št.: YYYYY<lang:en>Tolmin, Julian Alps<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Exploration: 2000-2015<br>BCRA grade 4-5b<br><br>Vrtnarija<br>Cadastral number: XXXX<br><br>Vilinska Jama<br>Cadastral number: XXXX<br>"
 	code tex-map
 	\framethickness=0.5mm
 	\def\maplayout{
-	\legendbox{-5}{99}{NW}{\size[26]\the\cavename}
-	\legendbox{-5}{95}{NW}{\size[10]\the\comment}
-	\legendbox{5}{70}{NW}{\scalebar}
-	\legendbox{5}{65}{NW}{\northarrow}
+	# \legendbox{-5}{99}{NW}{\size[26]\the\cavename}
+	# \legendbox{-5}{95}{NW}{\size[10]\the\comment}
+	# \legendbox{5}{70}{NW}{\scalebar}
+	# \legendbox{5}{65}{NW}{\northarrow}
 	}
 	scale 1 2000
 
 	code metapost
     max_label_level("2"); % yeah, now it works!
 	endcode
 endlayout
+
+
 language sl
 #export map -projection plan -o ../../outputs/vrtnarija_plan_SLO.pdf -layout plan
 language en
-#export map -projection plan -o ../../outputs/vrtnarija_plan_ENG.pdf -layout plan
+export map -projection plan -o ../../outputs/vrtnarija_plan_ENG.pdf -layout plan
 
 #----------------------------------------------------------------------------------|
 # export an ELEVATION view
@@ -73,12 +76,12 @@ layout ee
 	endcode
 endlayout
 
-select m-all-e@vrtnarija.vrtnarija_vilinska.system_migovec
+# select m-all-e@vrtnarija.vrtnarija_vilinska.system_migovec
 
-language sl
-export map -projection extended -o ../../outputs/vrtnarija_EE.pdf -layout ee
-#language en
-#export map -projection plan -o ../../outputs/vrtnarija_plan_ENG.pdf -layout plan
+# language sl
+# #export map -projection extended -o ../../outputs/vrtnarija_EE.pdf -layout ee
+# language en
+# export map -projection plan -o ../../outputs/vrtnarija_plan_ENG.pdf -layout plan
 
 #----------------------------------------------------------------------------------|
 # export a .3d model, which can be opened in AVEN and LOCH

diff --git a/data/vrtnarija/2000/hardy/hardy-p.th2 b/data/vrtnarija/2000/hardy/hardy-p.th2
@@ -2,34 +2,59 @@ encoding  utf-8
 ##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000
 ##XTHERION## xth_me_area_zoom_to 100
 
-scrap DELETE-ME-survey-legs -projection plan -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-line wall 
-  45.31 40.59
-  9.88 32.40
-endline
-line wall 
-  9.88 32.40
-  -27.83 31.14
+
+scrap hardy-1p -projection plan -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
+
+line pit 
+  661.7723 1110.4883
+  661.7723 1110.4883 678.6974 1118.6507 691.6612 1118.5307
 endline
-line wall 
-  -27.83 31.14
-  -78.15 2.09
+
+line rock-border -close on
+  544.0365 1096.7377
+  540.8536 1094.9128 540.6414 1091.8996 541.1931 1091.1357
+  541.7448 1090.3718 546.5608 1088.5576 546.5608 1088.5576
+  546.5608 1088.5576 553.9248 1091.3055 554.0097 1092.8757
+  554.0946 1094.446 554.6682 1097.0451 552.4395 1097.6713
+  550.2108 1098.2976 544.0365 1096.7377 544.0365 1096.7377
 endline
+
 line wall 
-  -78.15 2.09
-  -79.80 -9.65
+  713.9456 1041.7938
+  722.6308 1050.5991 712.17 1071.1888 711.1169 1073.1356
+  705.5304 1083.463 705.6351 1096.7181 700.3504 1103.0027
+  694.0694 1110.4719 688.6372 1118.2807 688.6372 1119.1295
+  688.6372 1119.9783 688.8069 1119.469 692.2021 1123.0339
+  695.5972 1126.5988 683.5445 1144.2535 682.0167 1145.951
+  680.4889 1147.6486 680.9981 1150.1949 677.2635 1146.9696
+  673.5289 1143.7442 676.4147 1140.1793 669.1152 1141.0281
+  661.8157 1141.8769 658.7601 1141.3676 654.8557 1140.8583
+  650.9513 1140.3491 639.2381 1140.5188 633.4664 1141.8769
+  627.6946 1143.2349 626.6761 1148.8369 611.9073 1143.9139
+  597.1385 1138.991 586.4439 1135.4261 583.0487 1133.0495
+  579.6536 1130.6729 568.9589 1123.2037 562.8477 1119.8085
+  556.7365 1116.4134 547.3999 1108.2651 543.4955 1105.549
+  539.5911 1102.8329 537.7238 1099.947 536.5355 1096.3822
+  535.3472 1092.8173 540.0201 1088.3042 540.0201 1088.3042
 endline
+
 line wall 
-  79.80 -40.59
-  45.31 40.59
+  551.8136 1087.7246
+  558.7736 1095.0241 566.4126 1096.8914 573.2029 1097.91
+  579.9931 1098.9285 604.2683 1107.0768 614.1141 1108.2651
+  623.96 1109.4534 649.084 1114.2066 654.0069 1115.0554
+  658.9298 1115.9041 658.4206 1119.469 663.5132 1116.0739
+  668.6059 1112.6788 678.9611 1090.95 679.9796 1086.706
+  680.9982 1082.4621 685.9211 1074.3138 687.6187 1067.5236
+  688.6521 1063.3897 691.5828 1047.4308 698.8831 1041.306
+  703.5743 1037.3702 713.9456 1041.7938 713.9456 1041.7938
 endline
-endscrap
 
-scrap hardy-1p -projection plan -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-point 9.88 32.40 station -name 6
-point -27.83 31.14 station -name 5
-point -79.80 -9.65 station -name 3
-point -78.15 2.09 station -name 4
-point 45.31 40.59 station -name 2
-point 79.80 -40.59 station -name 1
+point 634.0665 1129.0477 station -name 6
+point 596.3565 1127.7877 station -name 5
+point 544.3865 1086.9977 station -name 3
+point 546.0365 1098.7377 station -name 4
+point 669.4965 1137.2377 station -name 2
+point 703.9865 1056.0577 station -name 1
 endscrap
+
diff --git a/data/vrtnarija/2000/hardy/hardy.th b/data/vrtnarija/2000/hardy/hardy.th
@@ -1,12 +1,16 @@
-
 survey hardy -title "Hardy pitch, following pitch and rift in Gardener's World (aka BCL)"
-
-input hardy-e.th2
-
-map m-all-e -projection extended
-    hardy-1e
-endmap
-
+
+	input hardy-e.th2
+
+	map m-all-e -projection extended
+		hardy-1e
+	endmap
+
+	input hardy-p.th2
+	map m-all-p -projection plan
+		hardy-1p
+	endmap
+
 	centreline
 		team "Martin McGowan" insts
 		team "Ben Ogborne" insts