Merge branch 'master' of github.com:iccaving/migovec-survey-data

tr1813 · Jan 25, 2021 · 8354cfb · 8354cfb
2 parents ad0dc86 + 831867a
commit 8354cfb
Show file tree

Hide file tree

Showing 179 changed files with 1,560 additions and 637 deletions.
diff --git a/configs/automation/system_migovec.thconfig b/configs/automation/system_migovec.thconfig
@@ -67,6 +67,7 @@ export map -projection plan -o ../../outputs/system_migovec_plan_ENG.svg -layout
 layout ee
 	copy base-e
 	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: 1974-2017<br>Natančmost meritev IV/B<br><br>M2 (Kavkna jama)<br>kat. št.: 4465<br><br>M18 (jama strgane strajce)<br>kat. št.: 8284<br><br>M16<br>kat. št.: 6001<br><br>Primadona<br>kat. št.: 8282<br><br>U-Bend 571<br>kat. št.: 12114<br><br>Mona tip<br>kat. št.: 10180<lang:en>Tolmin, Julian Alps<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Exploration: 1974-2017<br>BCRA grade 4-5b<br><br>M2 (Kavkna Jama)<br>Cadastral number: 4465<br><br>M18 (Torn T-Shirt)<br>Cadastral number: 8284<br><br>M16<br>Cadastral number: 6001<br><br>Primadona<br>Cadastral number: 8282<br><br>U-Bend 571<br>Cadastral number: 12114<br><br>Mona tip<br>Cadastral number: 10180"
 
@@ -77,9 +78,17 @@ layout ee
 	symbol-colour point station [70 0 0]
 	grid-size 10 10 100 m
 	fonts-setup 5 8 10 10 10 
+
+	symbol-assign point water-flow MY
+	symbol-colour point water-flow [0 0 70]
+
 	symbol-hide line label
 	symbol-hide point remark
 
+	code metapost
+    max_label_level("1"); % yeah, now it works!
+	endcode
+
 	code tex-map
 	\def\maplayout{
 	\legendbox{0}{99}{NW}{\the\cavename}

diff --git a/configs/overview/vrtnarija.thconfig b/configs/overview/vrtnarija.thconfig
@@ -65,17 +65,15 @@ layout ee
 
 	copy show-centreline
 	colour map-fg [95 95 82]
-	scale 1 1000
+	scale 1 4000
 	grid-size 10 10 100 m
 	map-header 0 0 off
 	code metapost
     max_label_level("2"); % yeah, now it works!
 	endcode
 endlayout
 
-#select m-kangaroo_branch-e@vrtnarija.vrtnarija_vilinska.system_migovec
-#select m-s_extensions-e@vrtnarija.vrtnarija_vilinska.system_migovec
-#select m-friendship-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

diff --git a/data/M16/1996/rockroll/rockroll-e.th2 b/data/M16/1996/rockroll/rockroll-e.th2
@@ -70,7 +70,7 @@ endscrap
 
 scrap rockroll-1e -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -projection extended
 
-point 63.1494 -26.482 u:label_MY -attr lvl 2 -attr text "Rock&Roll" -align r -scale l
+point 63.1494 -26.482 u:label_MY -attr lvl 2 -attr text "Rock\&Roll" -align r -scale l
 point 57.5878 -62.8841 water-flow -orientation 255.81295
 line wall 
   -13.9242 -66.7399

diff --git a/data/primadona/2000/prima1/prima1-e.th2 b/data/primadona/2000/prima1/prima1-e.th2
@@ -36,15 +36,15 @@ endline
 
 point 419.7174 485.8213 dig -scale xl
 point 283.4825 576.6812 entrance -align l -scale xl -orientation 90.0
-point 248.7948 580.6166 label -text PRIMADONA -align l -scale s
-point 577.4813 387.731 label -text "<lang:end>Bear Pitch<lang:fr>M+" -align r -scale m
+point 248.7948 580.6166 u:label_MY -attr lvl 1 -attr text PRIMADONA -align l -scale s
+point 577.4813 387.731 u:label_MY -attr lvl 1 -attr text "<lang:end>Bear Pitch<lang:fr>M+" -align r -scale m
 line wall -subtype invisible
   329.0563 565.9603
   305.0 557.75
 endline
 
-point 538.5 213.75 label -text "Spiral Climb" -align t -scale s
-point 689.5 119.25 label -text "Lost and Found" -align bl -scale s
+point 538.5 213.75 u:label_MY -attr lvl 1 -attr text "Spiral Climb" -align t -scale s
+point 689.5 119.25 u:label_MY -attr lvl 1 -attr text "Lost and Found" -align bl -scale s
 point 309.0 560.75 station -name 35
 point 319.25 561.5 station -name 34
 point 384.25 500.75 station -name 33
@@ -157,17 +157,17 @@ line wall -id p_e1_l4
   527.094 417.7935 526.0271 420.8443 526.0271 420.8443
 endline
 
-line label -text "Bear pitch" -scale s
+line u:label_MY -attr lvl 1 -attr text "Bear pitch" -scale s
   470.0 362.75
   470.0 362.75 515.0 325.75 555.0 312.75
 endline
 
-line label -text "Entrance chamber" -scale s
+line u:label_MY -attr lvl 1 -attr text "Entrance chamber" -scale s
   280.0 495.75
   280.0 495.75 345.0 473.75 384.0 460.75
 endline
 
-line label -text "Entrance series" -scale s
+line u:label_MY -attr lvl 1 -attr text "Entrance series" -scale s
   493.0 529.75
   493.0 529.75 666.0 397.75 785.0 281.75
 endline
@@ -667,7 +667,7 @@ point 741.25 217.5 station -name 4
 point 750.0 165.25 station -name 3
 point 778.5 165.5 station -name 2
 point 793.5 168.5 station -name 1
-line label -text "Lost and Found Junction" -scale s
+line u:label_MY -attr lvl 1 -attr text "Lost and Found Junction" -scale s
   704.0 139.5
   704.0 139.5 741.25 134.0 792.5 140.5
 endline

diff --git a/data/primadona/2000/prima1/prima1-p.th2 b/data/primadona/2000/prima1/prima1-p.th2
@@ -158,7 +158,7 @@ line pit -scale l -clip off
   2257.5 2310.75 2286.2961 2311.4257 2297.2961 2328.1757
 endline
 
-line label -text "Entrance Series" -scale xl
+line u:label_MY -attr lvl 1 -attr text "Entrance Series" -scale xl
   1840.0 2200.0
   1728.67 1470.19 2212.0 964.0 2212.0 964.0
 endline
@@ -593,7 +593,7 @@ line wall -subtype blocks
   2248.5 1853.5 2260.5 1860.0 2262.5 1860.5
 endline
 
-point 1942.0 2374.0 label -text PRIMADONA -align l -scale l
+point 1942.0 2374.0 u:label_MY -attr lvl 1 -attr text PRIMADONA -align l -scale l
 point 2188.0001 2327.4999 entrance -scale xl -orientation 120.6
 line wall 
   2201.5 2262.5
@@ -1189,8 +1189,8 @@ scrap prima1-3p -scale [0 0 90 0 0 0 250 0 inch]
 
 point 2605.4999 1154.0 water-flow -orientation 203.9
 point 2435.5 1268.0 archeo-material -scale s
-point 2362.0 1294.0 label -text "M +" -align l -scale l
-line label -text "Bear Pitch" -scale l
+point 2362.0 1294.0 u:label_MY -attr lvl 1 -attr text "M +" -align l -scale l
+line u:label_MY -attr lvl 1 -attr text "Bear Pitch" -scale l
   2380.5 1288.0
   2380.5 1288.0 2411.5 1350.0 2447.0 1388.0
 endline
@@ -1428,7 +1428,7 @@ line wall -subtype invisible
   2671.0 693.0
 endline
 
-line label -text "Spiral Climb" -scale l
+line u:label_MY -attr lvl 1 -attr text "Spiral Climb" -scale l
   2488.25 663.0
   2488.25 663.0 2521.5 742.25 2580.5 772.5
 endline
@@ -2456,7 +2456,7 @@ endline
 
 point 2788.0 223.5 station -name 1
 point 2774.0 513.0 dig -scale xl -clip off
-line label -text "Lost and Found"
+line u:label_MY -attr lvl 1 -attr text "Lost and Found"
   2688.0 252.0
   2688.0 252.0 2712.0 174.0 2783.0 132.0
 endline

diff --git a/data/primadona/2000/prima2/prima2.th2 b/data/primadona/2000/prima2/prima2.th2
@@ -97,7 +97,7 @@ endline
 
 point 1960 -3520 label -scale l -align l -text "Stara jama"
 
-line label -text "Stara jama" -scale xl
+line u:label_MY -attr lvl 1 -attr text "Stara jama" -scale xl
   1969.0 -3524.0
   1969.0 -3524.0 1981.0 -3121.0 2155.0 -2821.0
   smooth off

diff --git a/data/primadona/2000/ttt/ttt-e.th2 b/data/primadona/2000/ttt/ttt-e.th2
@@ -16,7 +16,7 @@ line wall -subtype invisible
   517.5234 682.411
 endline
 
-point 733.4898 605.7604 label -text TTT -align r -scale xl
+point 733.4898 605.7604 u:label_MY -attr lvl 1 -attr text TTT -align r -scale xl
 line wall:invisible 
   502.25 653.75
   514.2562 650.0131
@@ -84,7 +84,7 @@ line wall
   522.6913 676.6799 522.1699 674.6455 522.9471 681.0572
 endline
 
-point 502.0 618.25 label -text Mandare -align t -scale xl
+point 502.0 618.25 u:label_MY -attr lvl 1 -attr text Mandare -align t -scale xl
 line wall -close on -outline in
   651.5 612.0
   658.25 611.5
@@ -332,7 +332,7 @@ line wall
   357.5 727.0 357.5 729.25 357.5 729.25
 endline
 
-point 154.75 772.75 label -text "Stara jama" -align l -scale l
+point 154.75 772.75 u:label_MY -attr lvl 1 -attr text "Stara jama" -align l -scale l
 line wall 
   182.25 796.75
   182.25 796.75 181.0 787.75 180.75 786.25
@@ -395,6 +395,6 @@ point 435.75 675.75 station -name 18
 point 443.0 673.25 station -name 17
 point 464.25 665.25 station -name 16
 point 492.0 671.0 station -name 15
-point 308.25 690.75 label -text "Bat pitch<lang:fr>Netopirjev<br>dvorana" -align bl -scale l
+point 308.25 690.75 u:label_MY -attr lvl 1 -attr text "Netopirjev dvorana" -align bl -scale l
 endscrap
 
diff --git a/data/primadona/2000/ttt/ttt-p.th2 b/data/primadona/2000/ttt/ttt-p.th2
@@ -457,7 +457,7 @@ line wall -subtype unsurveyed
   2541.0 1463.5
 endline
 
-point 3005.0 990.5 label -text "Manđare" -align r -scale s
+point 3005.0 990.5 u:label_MY -attr lvl 1 -attr text "Manđare" -align r -scale s
 point 2855.0 990.5 station -name 14
 point 2740.0 1086.5 station -name 15
 point 2642.0 1262.5 station -name 16
@@ -559,7 +559,7 @@ line floor-step
 endline
 
 point 2985.0 895.5 continuation -align br
-line label -text "Manđare"
+line u:label_MY -attr lvl 1 -attr text "Manđare"
   2787.5 672.5
   2790.0 673.0 3040.5 817.0 3122.5 942.5
 endline

diff --git a/data/primadona/2000/zima00/zima00-e.th2 b/data/primadona/2000/zima00/zima00-e.th2
@@ -6,7 +6,7 @@ encoding  utf-8
 
 scrap zima00_1e -scale [249.0 -714.0 545.0 -713.0 0.0 0.0 80 0.0 m] -projection extended
 
-point -1045.6038 2273.2382 label -text TTT -align r -scale xl
+point -1045.6038 2273.2382 u:label_MY -attr lvl 1 -attr text TTT -align r -scale xl
 line wall 
   481.1465 820.342
   479.368 813.6635 473.25 813.0 467.75 811.0
@@ -183,10 +183,10 @@ line wall -close on -outline in
   479.0 747.5 480.5 755.5 480.5 755.5
 endline
 
-point 543.6788 348.2436 label -text Spodnji -align t -scale xl
-point 788.5798 614.5688 label -text Snakebite -align t -scale xl
-point 833.977 490.8442 label -text "Freudian Slip" -align t -scale xl
-point 529.5 503.75 label -text Pivnica -align t -scale xl
+point 543.6788 348.2436 u:label_MY -attr lvl 1 -attr text Spodnji -align t -scale xl
+point 788.5798 614.5688 u:label_MY -attr lvl 1 -attr text Snakebite -align t -scale xl
+point 833.977 490.8442 u:label_MY -attr lvl 1 -attr text "Freudian Slip" -align t -scale xl
+point 529.5 503.75 u:label_MY -attr lvl 1 -attr text Pivnica -align t -scale xl
 line wall 
   422.5 806.5
   430.5 800.5

diff --git a/data/primadona/2000/zima00/zima00-p.th2 b/data/primadona/2000/zima00/zima00-p.th2
@@ -7,7 +7,7 @@ encoding  utf-8
 
 scrap zima00p_1 -scale [2594.0 -5192.0 3382.0 -5186.0 0.0 0.0 5 0.0 m]
 
-line label -text "Brezno TTT" -scale xl
+line u:label_MY -attr lvl 1 -attr text "Brezno TTT" -scale xl
   194.25 325.25
   194.25 325.25 295.5 387.0 346.0 490.0
   368.92 536.74 364.0 550.5 364.0 550.5
@@ -592,7 +592,7 @@ line wall
   smooth off
 endline
 
-line label -text "The Manger"
+line u:label_MY -attr lvl 1 -attr text "The Manger"
   -183.75 394.25
   -183.75 394.25 -173.75 353.25 -131.75 332.25
   smooth off
@@ -673,7 +673,7 @@ line floor-step
   smooth off
 endline
 
-point 62.5 406.75 label -text "P4" -scale s -align br
+point 62.5 406.75 u:label_MY -attr lvl 1 -attr text "P4" -scale s -align br
 
 line pit
   -22.75 392.25

diff --git a/data/primadona/2001/drugi/drugi-e.th2 b/data/primadona/2001/drugi/drugi-e.th2
@@ -5,7 +5,7 @@ encoding  utf-8
 
 scrap drugi-1e -scale [328.0 -734.0 499.0 -734.0 0.0 0.0 15 0.0 m] -projection extended
 
-point 898.562 776.1126 label -text "Drugi vhod" -align br -scale m
+point 898.562 776.1126 u:label_MY -attr lvl 1 -attr text "Drugi vhod" -align br -scale m
 line wall -subtype invisible
   1875.1541 681.9155
   1987.3056 967.8259

diff --git a/data/primadona/2001/galerija/galerija-e1.th2 b/data/primadona/2001/galerija/galerija-e1.th2
@@ -44,12 +44,12 @@ line wall
   1181.6567 3165.0
 endline
 
-line label -text "Knot Very Good" -scale xl
+line u:label_MY -attr lvl 1 -attr text "Knot Very Good" -scale xl
   1454.0 3052.0
   2172.0 3040.0
 endline
 
-point 2835.0 2290.0 label -text Karstaway -align t -scale xl
+point 2835.0 2290.0 u:label_MY -attr lvl 1 -attr text Karstaway -align t -scale xl
 line rock-border -close on -clip off
   1365.0 2681.0
   1348.0 2664.0
@@ -204,7 +204,7 @@ line wall
   427.0 3428.0
 endline
 
-line label -text "Sejna soba" -scale xl
+line u:label_MY -attr lvl 1 -attr text "Sejna soba" -scale xl
   696.0 3450.0
   696.0 3450.0 853.0 3441.0 1218.0 3378.0
 endline

diff --git a/data/primadona/2001/galerija/galerija-e2.th2 b/data/primadona/2001/galerija/galerija-e2.th2
@@ -5,10 +5,10 @@ encoding  utf-8
 
 scrap galerija-2e -scale [1382.0 -3962.0 2948.0 -3976.0 0.0 0.0 100 0.0 m] -projection extended
 
-point 2140.3306 677.7112 label -text "Quantum State" -align bl -scale s
+point 2140.3306 677.7112 u:label_MY -attr lvl 1 -attr text "Quantum State" -align bl -scale s
 
-point 1518.8726 903.2959 label -text "Knot Very Good" -align tr -scale m
-point 2718.8726 913.2959 label -text Galerija -align tr -scale m
+point 1518.8726 903.2959 u:label_MY -attr lvl 1 -attr text "Knot Very Good" -align tr -scale m
+point 2718.8726 913.2959 u:label_MY -attr lvl 1 -attr text Galerija -align tr -scale m
 line wall 
   2095.0 836.0
   2095.0 836.0 2084.0 838.0 2073.0 832.0

diff --git a/data/primadona/2001/galerija/galerijap.th2 b/data/primadona/2001/galerija/galerijap.th2
@@ -102,7 +102,7 @@ point 541.0 898.0 station -name 26
 point 491.0 927.0 station -name 27
 point 478.0 907.0 station -name 28
 point 498.0 894.0 station -name 29
-point 429.0 894.0 label -text "Sejna<br>soba" -align l -scale l
+point 429.0 894.0 u:label_MY -attr lvl 1 -attr text "Sejna<br>soba" -align l -scale l
 endscrap
 
 
@@ -244,7 +244,7 @@ endscrap
 
 scrap galerijap_4 -scale [326.0 -736.0 547.0 -735.0 0.0 0.0 35 0.0 m]
 
-line label -text "Knot Very Good"
+line u:label_MY -attr lvl 1 -attr text "Knot Very Good"
   549.25 627.0
   549.25 627.0 637.5 673.0 708.75 734.5
 endline

diff --git a/data/primadona/2001/pov/pov-e.th2 b/data/primadona/2001/pov/pov-e.th2
@@ -80,7 +80,7 @@ line wall
   1644.2464 2987.7558
 endline
 
-point 950.0 3236.0 label -text Mlinotest -align tr -scale xl
+point 950.0 3236.0 u:label_MY -attr lvl 1 -attr text Mlinotest -align tr -scale xl
 line wall 
   1434.0 3105.0
   1410.0 3109.0 1385.0 3115.0 1377.0 3115.0

diff --git a/data/primadona/2001/pov/pov-p.th2 b/data/primadona/2001/pov/pov-p.th2
@@ -70,7 +70,7 @@ endscrap
 
 scrap pov-2p -scale [326.0 -736.0 532.0 -735.0 0.0 0.0 5 0.0 m]
 
-point 437.75 737.75 label -text Mlinotest -align r -scale xl
+point 437.75 737.75 u:label_MY -attr lvl 1 -attr text Mlinotest -align r -scale xl
 area water
   l37-286-218
 endarea
@@ -300,7 +300,7 @@ line wall
   425.0 538.25
 endline
 
-line label -text Povezava
+line u:label_MY -attr lvl 1 -attr text Povezava
   365.25 482.75
   365.25 482.75 380.75 533.0 401.25 573.25
 endline

diff --git a/data/primadona/2001/risa2/risa2-p.th2 b/data/primadona/2001/risa2/risa2-p.th2
@@ -7,7 +7,7 @@ encoding  utf-8
 
 scrap risa2p_1 -scale [326.0 -736.0 520.0 -736.0 0.0 0.0 15 0.0 m]
 
-line label -text "Risanke"
+line u:label_MY -attr lvl 1 -attr text "Risanke"
   207.0 -63.0
   207.0 -63.0 284.0 -177.0 335.0 -323.0
   smooth off

diff --git a/data/primadona/2001/risanke/risanke-e.th2 b/data/primadona/2001/risanke/risanke-e.th2
@@ -6,7 +6,7 @@ encoding  utf-8
 
 scrap risanke-e1 -scale [1366.0 -3966.0 2800.0 -3968.0 0.0 0.0 10 0.0 m] -projection extended
 
-point 1604.6481 2665.8247 label -text Risanke -align bl -scale l
+point 1604.6481 2665.8247 u:label_MY -attr lvl 1 -attr text Risanke -align bl -scale l
 line rock-border -close on -clip off
   2388.0 944.0
   2340.0 872.0

diff --git a/data/primadona/2002/milanova/milanova-e.th2 b/data/primadona/2002/milanova/milanova-e.th2
@@ -67,7 +67,7 @@ line wall -subtype invisible
   2248.4382 2482.0
 endline
 
-point 2261.7182 3002.7387 label -text "Donji Milanovac" -align r -scale xl
+point 2261.7182 3002.7387 u:label_MY -attr lvl 1 -attr text "Donji Milanovac" -align r -scale xl
 line wall -subtype invisible
   2124.5998 3405.001
   1936.8322 3411.9888

diff --git a/data/primadona/2002/smer0/smer0-e.th2 b/data/primadona/2002/smer0/smer0-e.th2
@@ -424,8 +424,8 @@ line wall:invisible
   5070.4021 2536.7307
 endline
 
-point 3122.8515 3486.1919 label -text "Salome Viados" -align tr -scale xl
-point 4690.3423 2365.0415 label -text Smer0 -align bl -scale xl
+point 3122.8515 3486.1919 u:label_MY -attr lvl 1 -attr text "Salome Viados" -align tr -scale xl
+point 4690.3423 2365.0415 u:label_MY -attr lvl 1 -attr text Smer0 -align bl -scale xl
 line wall 
   1570.0 4176.0
   1570.0 4176.0 1572.0 4150.0 1582.0 4114.0