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

tr1813 · Jan 18, 2021 · 2b06ef8 · 2b06ef8
2 parents 6e672e4 + 884987f
commit 2b06ef8
Show file tree

Hide file tree

Showing 2 changed files with 216 additions and 23 deletions.
diff --git a/data/vrtnarija/2013/slinging/slinging-e.th2 b/data/vrtnarija/2013/slinging/slinging-e.th2
@@ -2,84 +2,271 @@ 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-e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
+
+scrap slinging-1e -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -projection extended
+
+point -177.39 78.43 station -name 13
+point -188.77 91.97 station -name 14
+point -201.57 96.69 station -name 15
+point -121.38 1.34 station -name 4
+point 23.57 -29.13 station -name 8
+point 6.85 -25.59 station -name 9
+point -4.17 -25.59 station -name 10
+point -34.21 -24.02 station -name 11
+point -92.49 -18.9 station -name 12
+point -80.06 -21.57 station -name 3
+point -53.16 -81.97 station -name 2
+point 27.93 -93.39 station -name 1
+point 206.26 -100.87 station -name 5
+point -206.26 100.87 station -name 16
+line rock-border -close on
+  -78.7435 -97.9493
+  -88.3464 -91.2273 -83.545 -87.3861 -89.3067 -92.1875
+  -95.0684 -96.989 -96.0287 -95.5486 -90.267 -99.8698
+  -84.5053 -104.1911 -85.9457 -106.1117 -82.1045 -104.1911
+  -78.2634 -102.2706 -78.7435 -97.9493 -78.7435 -97.9493
+endline
+
+point 38.3089 -110.2372 water 
+line wall 
+  61.4584 -104.6713
+  54.7364 -94.1081 59.5378 -85.4655 38.4115 -85.4655
+  17.2852 -85.4655 1.9206 -84.5053 -12.4837 -82.5847
+  -26.888 -80.6641 -25.9277 -94.1081 -31.6895 -69.1407
+  -37.4512 -44.1732 -39.3718 -47.0541 -28.8086 -35.5306
+  -18.2455 -24.0072 -5.7617 -28.8086 24.9675 -34.5703
+  55.6966 -40.3321 85.4655 -51.8555 95.0684 -65.2995
+  104.6713 -78.7435 103.711 -80.6641 125.7976 -82.5847
+  147.8842 -84.5053 139.2416 -82.5847 155.5665 -89.3067
+  171.8914 -96.0287 157.4871 -97.9493 190.1368 -103.711
+  222.7866 -109.4727 238.1512 -112.3536 238.1512 -112.3536
+endline
+
+line wall 
+  -193.0177 82.5847
+  -183.4148 39.3718 -185.3354 60.4981 -182.4545 40.3321
+  -179.5737 20.166 -182.4545 -7.6823 -169.0105 -13.444
+  -155.5665 -19.2057 -150.7651 -22.0866 -123.877 -20.166
+  -96.989 -18.2455 -98.9096 -23.0469 -99.8698 -48.9746
+  -100.8301 -74.9024 -110.433 -92.1875 -97.9493 -97.9493
+  -85.4655 -103.711 -79.7038 -112.3536 -50.8952 -108.5124
+  -22.0866 -104.6713 -8.6426 -100.8301 6.722 -109.4727
+  22.0866 -118.1153 18.2455 -117.155 35.5306 -118.1153
+endline
+
+line wall 
+  238.1512 -94.1081
+  238.1512 -94.1081 207.422 -83.545 186.2957 -74.9024
+  165.1694 -66.2598 171.8914 -64.3392 158.4474 -57.6172
+  145.0033 -50.8952 146.9239 -49.9349 133.4799 -48.9746
+  120.0359 -48.0143 137.321 -57.6172 117.155 -48.9746
+  96.989 -40.3321 97.9493 -44.1732 93.1478 -37.4512
+  88.3464 -30.7292 105.6316 -29.7689 81.6244 -29.7689
+  57.6172 -29.7689 68.1804 -26.888 51.8555 -24.0072
+  35.5306 -21.1263 19.2057 -23.0469 -0.9603 -22.0866
+  -21.1263 -21.1263 -32.6498 -29.7689 -30.7292 -13.444
+  -28.8086 2.8809 -20.166 14.4043 -32.6498 16.3249
+  -45.1335 18.2455 -45.1335 11.5234 -63.3789 18.2455
+  -81.6244 24.9675 -86.4258 35.5306 -84.5053 51.8555
+  -82.5847 68.1804 -89.3067 68.1804 -88.3464 71.0612
+  -87.3861 73.9421 -105.6316 66.2598 -123.877 71.0612
+  -142.1225 75.8627 -133.4799 73.9421 -155.5665 80.6641
+  -177.6531 87.3861 -183.4148 90.267 -183.4148 90.267
+endline
+
+line wall -subtype presumed
+  238.6774 -112.5485
+  263.6316 -113.6519
+endline
+
+line wall -subtype presumed
+  265.4989 -96.7611
+  238.7623 -93.9601
+endline
+
+line rock-border -close on
+  -122.9036 -3.3951
+  -129.6939 -8.1483 -126.9778 -12.9015 -127.6568 -12.9015
+  -128.3358 -12.9015 -119.5085 -15.6176 -119.5085 -10.8644
+  -119.5085 -6.1112 -122.9036 -3.3951 -122.9036 -3.3951
+endline
+
+line rock-border -close on
+  218.6462 -95.0635
+  211.5164 -97.7797 206.7632 -95.0635 211.5164 -99.4772
+  216.2696 -103.8909 208.8003 -105.928 216.9486 -105.928
+  225.0969 -105.928 236.9799 -110.0021 233.2452 -104.9094
+  229.5106 -99.8167 233.5847 -97.7797 227.813 -95.7426
+  222.0413 -93.7055 218.6462 -95.0635 218.6462 -95.0635
+endline
+
+line rock-border -close on
+  -135.8806 -12.4837
+  -136.3607 -17.7653 -138.7615 -19.6859 -132.9997 -18.7256
+  -127.238 -17.7653 -125.7976 -16.805 -127.238 -14.4043
+  -128.6784 -12.0036 -135.8806 -12.4837 -135.8806 -12.4837
+endline
+
+line rock-border -close on
+  -157.0069 -3.361
+  -150.2849 -8.6426 -145.4835 -10.5632 -148.8445 -6.2419
+  -152.2055 -1.9206 -157.0069 -3.361 -157.0069 -3.361
+endline
+
+line rock-border -close on
+  -61.9385 -104.1911
+  -64.8194 -106.1117 -63.8591 -109.4727 -60.4981 -107.5521
+  -57.1371 -105.6315 -53.7761 -106.1117 -57.1371 -104.1911
+  -60.4981 -102.2705 -61.9385 -104.1911 -61.9385 -104.1911
+endline
+
+line rock-border -close on
+  -48.9746 -103.2308
+  -41.7725 -101.3103 -43.6931 -98.4294 -41.7725 -101.3103
+  -39.8519 -104.1911 -37.9313 -104.1911 -42.7328 -105.6315
+  -47.5342 -107.072 -48.9746 -103.2308 -48.9746 -103.2308
+endline
+
+line rock-border -close on
+  -72.9818 -103.711
+  -73.9421 -107.5521 -72.0215 -108.0323 -68.1804 -107.5521
+  -64.3392 -107.072 -64.8194 -106.1117 -63.8591 -104.1911
+  -62.8988 -102.2706 -67.2201 -98.9095 -70.1009 -100.35
+  -72.9818 -101.7904 -72.9818 -103.711 -72.9818 -103.711
+endline
+
+line rock-border -close on
+  -73.9421 -99.3897
+  -65.7797 -95.5485 -70.5811 -92.6677 -64.3392 -94.1081
+  -58.0974 -95.5485 -51.8555 -94.5883 -56.6569 -97.4691
+  -61.4584 -100.35 -71.0612 -99.3897 -71.0612 -99.3897
+endline
+
+line rock-border -close on
+  -84.0251 -88.8265
+  -78.7435 -88.3464 -79.7038 -88.3464 -78.7435 -90.267
+  -77.7832 -92.1875 -74.4222 -93.628 -81.6244 -92.6677
+  -88.8265 -91.7074 -84.0251 -88.8265 -84.0251 -88.8265
+endline
+
+line rock-border -close on
+  -72.9818 -87.8663
+  -70.1009 -85.4655 -62.8988 -87.3861 -62.8988 -87.3861
+  -62.8988 -87.3861 -57.6172 -92.1876 -61.9385 -92.1876
+  -66.2598 -92.1876 -72.0215 -90.267 -72.9818 -87.8663
+endline
+
+line rock-border -close on
+  -145.9636 -7.6823
+  -142.1225 -6.7221 -136.3607 -4.3213 -137.8012 -7.6823
+  -139.2416 -11.0433 -141.6423 -14.8845 -141.6423 -14.8845
+endline
+
+line rock-border -close on
+  -140.2019 -17.2852
+  -149.8048 -14.4044 -151.7253 -17.2852 -151.7253 -17.2852
+  -144.5232 -18.7256
+endline
+
+line rock-border -close on
+  -165.1694 -10.5632
+  -160.8481 -7.6823
+  -160.8481 -7.6823 -156.5268 -10.083 -153.1658 -10.083
+  -149.8048 -10.083 -147.4041 -12.9639 -152.2055 -12.9639
+  -157.0069 -12.9639 -158.9275 -14.8845 -163.2488 -13.444
+  -167.5701 -12.0036 -165.1694 -10.5632 -165.1694 -10.5632
+endline
+
+line rock-border -close on
+  -106.5918 7.6823
+  -86.4258 17.2852 -86.4258 17.2852 -86.4258 17.2852
+  -86.4258 17.2852 -81.6244 -6.2419 -81.1442 -9.1227
+  -80.6641 -12.0036 -76.3428 -12.9639 -86.906 -13.9242
+  -97.4691 -14.8844 -104.1911 -13.9242 -108.5124 -12.9639
+  -112.8337 -12.0036 -106.5918 7.6823 -106.5918 7.6823
+endline
+
+endscrap
+
+
+scrap DELETE-ME-survey-legs-e -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -projection extended
+
+point 172.93 -90.0 station -name 6
+point 91.69 -48.66 station -name 7
 line survey 
   -201.57 96.69
   -206.26 100.87
 endline
+
 line survey 
   -188.77 91.97
   -201.57 96.69
 endline
+
 line survey 
   -188.77 91.97
   -177.39 78.43
 endline
+
 line survey 
   -177.39 78.43
   -121.38 1.34
 endline
+
 line survey 
   -121.38 1.34
-  -92.49 -18.90
+  -92.49 -18.9
 endline
+
 line survey 
-  -92.49 -18.90
+  -92.49 -18.9
   -34.21 -24.02
 endline
+
 line survey 
   -34.21 -24.02
   -4.17 -25.59
 endline
+
 line survey 
   -4.17 -25.59
   6.85 -25.59
 endline
+
 line survey 
   6.85 -25.59
   23.57 -29.13
 endline
+
 line survey 
   23.57 -29.13
   91.69 -48.66
 endline
+
 line survey 
   91.69 -48.66
-  172.93 -90.00
+  172.93 -90.0
 endline
+
 line survey 
-  172.93 -90.00
+  172.93 -90.0
   206.26 -100.87
 endline
+
 line survey 
   -121.38 1.34
   -80.06 -21.57
 endline
+
 line survey 
   -80.06 -21.57
   -53.16 -81.97
 endline
+
 line survey 
   -53.16 -81.97
   27.93 -93.39
 endline
-endscrap
 
-scrap slinging-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-point -206.26 100.87 station -name 16
-point -201.57 96.69 station -name 15
-point -188.77 91.97 station -name 14
-point -177.39 78.43 station -name 13
-point -121.38 1.34 station -name 4
-point -92.49 -18.90 station -name 12
-point -34.21 -24.02 station -name 11
-point -4.17 -25.59 station -name 10
-point 6.85 -25.59 station -name 9
-point 23.57 -29.13 station -name 8
-point 91.69 -48.66 station -name 7
-point 172.93 -90.00 station -name 6
-point 206.26 -100.87 station -name 5
-point -80.06 -21.57 station -name 3
-point -53.16 -81.97 station -name 2
-point 27.93 -93.39 station -name 1
 endscrap
+
diff --git a/data/vrtnarija/vrtnarija-e.thm b/data/vrtnarija/vrtnarija-e.thm
@@ -8,6 +8,8 @@ map m-all-e -projection extended
 	m-kangaroo_branch-e
 	m-s_extensions-e
 	m-watership-e
+	m-yorkshire_extensions-e
+
 endmap
 
 map m-entrance-e -projection extended
@@ -109,6 +111,10 @@ map m-watership-e -projection extended
 	m-all-e@watershipdown
 endmap
 
+map m-yorkshire_extensions-e -projection extended
+	m-all-e@slinging
+endmap
+
 centreline
 	# Entrance series
 	extend start 0@bclent2