- Eislufthöhle +
- Gemshöhle
- Kaninchenhöhle
- Schwarzmooskogeleishöhle
- Steinbrückenhöhle
diff --git a/map/ents.gpx b/map/ents.gpx
new file mode 100644
index 000000000..08c570e6b
--- /dev/null
+++ b/map/ents.gpx
@@ -0,0 +1,387 @@
+
+
+ diff --git a/map/index.html b/map/index.html new file mode 100644 index 000000000..027d4c121 --- /dev/null +++ b/map/index.html @@ -0,0 +1,120 @@ + + + +1675.46 103.1 1702.30 113.sumpf.8_10 1660.32 142.45 1757.62 143.canyon.b0 1757.83 143.p143 1734.28 145.p145a 1731.76 145.p145b 1813.22 2002-03to2004-15.6 1841.33 2002-03to2004-15.p2002-03 1807.24 2002-03to2004-15.p2004-15a 1802.63 2004-15to2004-14.p2004-14 1807.24 2004-15to2004-14.p2004-15a 1867.14 2004-18to2006-09.p2004-18 1912.43 2004-18to2006-09.p2006-09 1905.08 2004-18to2006-09.p258a 1910.23 2004-18to2006-09.p258b 1738.38 2006-06.4 1731.12 2006-06.7 1726.84 2007-neu.1 1909.80 2010-03.1 1919.28 2012-ns-03.1 1905.27 2012-ns-10.1 1940.80 233.1 1830.48 234to2002-03.1 1838.80 234to2002-03.3 1843.05 234to2002-03.5 1841.33 234to2002-03.9 1807.96 243.5 1946.79 bs16 1925.79 bs17 1936.79 bs19 1976.79 casino.0 1941.80 e02.0 1956.80 e09.0 1931.80 e10.0 1876.81 e28.0 1946.81 gps02.p2002-10 1906.81 gps02.p2002-ad-01 1903.81 gps02.p2002-ad-02 1924.81 gps02.p2002-ad-03 1948.81 gps02.p2002-ad-04 1946.81 gps02.p2002-x09 1946.81 gps02.p2002-x09b 1846.80 gps02.p2002-x15 1846.81 gps02.p2002-x16 1846.81 gps02.p2002-x17 1846.81 gps02.p2002-x18 1946.80 gps02.p2005-05 1946.80 gps02.p2005-06 1946.80 gps02.p2005-08 1781.82 gps02olly.2001-06 1795.83 gps02olly.2001-07 1794.83 gps02olly.2001-08 1773.83 gps02olly.2001-09 1768.83 gps02olly.2001-10 1749.83 gps02olly.2001-11 1732.83 gps02olly.2001-12 1746.82 gps02olly.2002-ob-01 1746.82 gps02olly.2002-w-01 1773.82 gps02olly.235 1798.83 gps02olly.236 1823.83 gps02olly.237 1781.82 gps02olly.238 1777.82 gps02olly.88f 1796.82 gps02olly.cliffhole 1772.83 gps02olly.hfg-ka88 1821.81 gps03.2003-07 2046.81 gps03_bis.p2003-x11 2046.81 gps03_bis.p2003-x12 2046.81 gps03_bis.p2003-x13 2046.81 gps03_bis.p2003-x14 2046.81 gps03_bis.p2003-x15 2046.81 gps03_bis.p2003-x16 2046.81 gps03_bis.p2003-x17 2046.81 gps03_bis.p2003-x18 1846.81 gps04.p2004-10 1750.81 gps04.p2004-12 1741.81 gps04.p2004-13 1877.81 gps04.p2004-16 1880.81 gps04.p2004-17 1867.14 gps04.p2004-18 1806.81 gps04.p2004-21 1918.81 gps04.p247 1819.82 gps06.2006-01 1753.82 gps06.2006-02 1752.82 gps06.2006-03 1847.81 gps06.2006-05 1914.81 gps06.2006-07 46.82 gps98.1996_05 1646.83 gruenstein.1 1922.80 haldenloch.eingang.0 1871.79 lou-toti.lt-eingang.1 1885.79 lunge.ent 1726.84 neuerschacht.12 840.86 p1 1686.89 p100 1674.70 p101a 1707.20 p104 1692.89 p105 1693.66 p106 1708.07 p107 1681.40 p108 1643.29 p109 1727.26 p111 1726.60 p112 1688.33 p113 1535.12 p115 1458.06 p115b 1544.97 p115c 1709.83 p116 1656.80 p131 1830.61 p135 1842.43 p136 1836.31 p136b 1837.68 p136c 1839.33 p136d 1842.07 p138 1873.97 p139 1669.95 p141 1758.27 p144 1745.56 p144b 1700.35 p148 1649.18 p150 1646.07 p151 1639.24 p152 1790.51 p153 1817.87 p154 1809.65 p154b 1797.23 p155 1841.01 p156 1731.12 p157 1761.32 p158 1684.70 p160 1834.54 p161 1799.32 p161b 1799.47 p161c 1661.04 p161d 1706.53 p161e 1707.02 p161f 1764.89 p161g 1735.50 p161h 1794.24 p162 1800.51 p162b 1773.37 p163 1672.52 p164rig 1839.46 p165 1682.76 p171b 1677.85 p172 1706.11 p174 1706.45 p175 1715.21 p176 1486.86 p18 1813.46 p180 1643.89 p182 1638.58 p183 1638.33 p184 1810.28 p185 1748.08 p186 1676.30 p188 1811.14 p191 1791.05 p193 1809.58 p194 1825.67 p195 1837.71 p196 1700.63 p1976_b4 1746.61 p1987-02 1848.42 p199 1678.65 p1998-x01 1861.38 p2000-08 1856.82 p2001-02 1849.61 p2001-03 1907.58 p2002-05 1907.81 p2002-06 1875.94 p2002-07 1863.31 p2002-08 1699.01 p2002-w-02 1911.81 p2003-01 1689.13 p2004-01 1692.63 p2004-02 1677.59 p2004-03 1697.55 p2004-07 1695.07 p2004-08 1710.37 p2004-13 1802.63 p2004-14 1867.14 p2004-18 1810.53 p2004-19a 1813.39 p2004-19b 1816.02 p2004-19c 1860.70 p2004-20 1764.04 p2005-01 1802.05 p2005-02 1731.04 p2005-03 1846.80 p2005-07 1695.14 p2005-91 1682.07 p2005-92 1678.85 p2005-93 1681.80 p2005-94 1682.13 p2005-95 1680.45 p2005-96 1683.39 p2005-97 1682.71 p2005-98 1675.43 p2005-99 1837.25 p2006-08 1697.64 p2006-70 1694.09 p2006-71 1747.45 p2006-72 1689.93 p2006-73 1907.81 p2007-01 1892.81 p2007-02 1793.82 p2007-03 1915.81 p2007-04 1796.81 p2007-04a 1804.81 p2007-05 1856.81 p2007-06 1919.81 p2007-07 1955.80 p2007-11 1829.81 p2007-12 1688.06 p2007-70 1688.40 p2007-71 1692.87 p2007-72 1934.81 p2009-01 1918.80 p2009-02 1933.80 p2009-03 1932.81 p2009-04 1826.29 p201 1820.02 p2010-01 1905.80 p2010-02 1912.80 p2010-03 1906.80 p2010-04 1931.80 p2010-05 1896.79 p2010-06 1984.80 p2011-01 1725.75 p2012-70 1715.77 p2012-70b 1726.91 p2012-70c 1935.80 p2012-dd-01 1925.80 p2012-dd-02 1925.80 p2012-dd-03 2003.80 p2012-dd-04 1940.79 p2012-dd-05 1927.79 p2012-dd-06 1930.79 p2012-dd-07 1948.80 p2012-dd-08 1973.80 p2012-dd-09 1932.79 p2012-dd-10 1877.79 p2012-dd-11 1948.81 p2012-hw-01 1919.81 p2012-hw-02 1861.81 p2012-ns-01 1922.80 p2012-ns-02 1921.80 p2012-ns-03 1913.80 p2012-ns-05 1916.80 p2012-ns-06 1922.80 p2012-ns-07 1928.80 p2012-ns-08 1934.80 p2012-ns-09 1909.80 p2012-ns-10 1923.80 p2012-ns-11 1925.80 p2012-ns-12 1931.80 p2012-ns-13 1934.80 p2012-ns-14 1921.80 p2012-ns-15 1939.80 p2012-ok-01 1944.80 p2012-ok-02 1925.79 p2012-ok-03 1682.51 p202 1757.96 p203 1859.21 p204a 1877.93 p204c 1861.44 p204e 1865.61 p204f 1823.45 p204g 1833.74 p204h 1834.08 p204i 1811.69 p205 1745.82 p206 1711.05 p207 1707.80 p208 1839.71 p209 1869.23 p214 1691.98 p215a 1696.63 p215b 1697.78 p216 1695.09 p217 1826.00 p218 1832.44 p219 1733.83 p220 1854.03 p222 1860.46 p223 1849.77 p224 1784.83 p225 1671.61 p226a 1669.81 p226b 1672.32 p227 1646.80 p228 1710.10 p229 1851.82 p230 1861.93 p231a 1862.00 p231b 1870.00 p231c 1861.90 p231d 1864.00 p231e 1866.03 p231f 1866.83 p231g 1861.85 p231h 1858.56 p231i 1946.80 p232 1830.48 p234a 1838.80 p234b 1879.33 p239 1837.81 p240 1890.31 p241 1881.87 p242 1877.90 p244 1781.71 p245 1834.81 p246 1911.81 p248 1843.05 p249 1684.65 p250 1905.08 p258a 1910.23 p258b 1629.13 p31 1614.77 p32 1705.51 p36 1736.31 p40a 1689.11 p40e 1735.46 p40f 1693.72 p40h 1698.72 p40s 1668.43 p41a 1682.02 p41b 1700.61 p75 1693.66 p76 1692.36 p76a 1694.10 p76b 1713.13 p78a 1706.42 p78b 1713.05 p78d 1729.20 p78e 1713.09 p80 1703.86 p81 1702.02 p81b 1704.69 p82 1710.55 p82b 1717.34 p83 1704.14 p85 1589.31 p87 1692.84 p88 1716.44 p90 1687.16 p91 1685.02 p93 1677.28 p94 1645.84 p95 1641.84 p96 1685.17 p97 1721.77 p98 1688.32 p99 1677.43 p99ob02 1810.68 pmi5 1869.61 pquarriesd 1714.14 pwk12 1881.79 raetsel.ent 1896.79 sternloch.ent 1676.28 t101 1675.26 t102 1675.46 t103 1820.84 t147 1841.08 t156 1694.09 t159 1677.78 t171 1683.39 t173 1674.00 t189 1672.76 t190 1685.37 t197 1677.51 t198 1690.89 t200 1807.24 t2004-15a 1813.99 t2004-15b 1858.19 t204b 1819.08 t204d 1673.25 t210 1799.25 t251 1546.82 tantalus 1906.80 upsidedown.8 Loser cave map + + + + + + + + + + + + + + +Show map information+Expo prototype slippy map+ +
Please mouseover
the pin markers.+ + diff --git a/map/javascript b/map/javascript new file mode 120000 index 000000000..e3b95b482 --- /dev/null +++ b/map/javascript @@ -0,0 +1 @@ +/usr/share/javascript \ No newline at end of file diff --git a/map/map.css b/map/map.css new file mode 100644 index 000000000..cff1c602b --- /dev/null +++ b/map/map.css @@ -0,0 +1,102 @@ +@charset "utf-8"; + +html,body { + background-color: #FFF; + height: 100%; + width: 100%; + margin: 0; + padding: 0; + font-family: Verdana, Arial, sans-serif; + font-size: 1em; + overflow: hidden; + color: #000; +} + +a { + color: #0000FF; + text-decoration: none; +} + +a:hover { + color: #000011; + text-decoration: underline; +} + +#map { + height: 100%; + width: 100%; + padding: 0; + margin: 0; + font-family: Arial, sans-serif; + font-size: 1em; + color: #000; +} +.olFramedCloudPopupContent { + font-size: 0.8em; + font-family: Verdana, sans-serif; +} +#descriptionToggle { + position: absolute; + font-size: 1em; + z-index: 10000; + left: 80px; + height: 14px; + border-left: 1px solid #000040; + border-bottom: 1px solid #000040; + border-right: 1px solid #000040; + padding: 2px 10px; + margin-right: 200px; + background-color: #EEE; + font-size: 12px; + cursor: default; + opacity: 0.7; +} +#descriptionToggle:hover { + background-color: #FFF; + opacity: 1; +} +#description { + position: absolute; + z-index: 10000; + left: 80px; + top: 18px; + border: 1px solid #000040; + padding: 10px 10px; + margin-right: 200px; + background-color: #FFF; + font-size: 12px; +} + +#attribution { + bottom: 0; + left: 0; + padding: 5px 8px 1px 8px; + position: absolute; + font-size: 11px; + font-style: italic; + z-index: 1000; +} + +#layer { + position: absolute; + top: 60px; + right: 10px; + z-index: 10002; +} + +#layer > div { + border: 1px solid #000; + background-color: #FFF; + padding: 4px 5px; + font-size: 0.7em; + cursor: default; + margin-bottom: 4px; + +} +#layer div:hover { +} +#layer .active { + background-color: #EEF; +} + +.hide { display: none; } diff --git a/map/util.js b/map/util.js new file mode 100644 index 000000000..dbb27c3af --- /dev/null +++ b/map/util.js @@ -0,0 +1,277 @@ +/* + * Einige Funktionen die ursprünglich von http://wiki.openstreetmap.org/wiki/DE:Karte_in_Webseite_einbinden stammen, + * teilweise modifiziert + * + * Some functions from the example at http://wiki.openstreetmap.org/wiki/DE:Karte_in_Webseite_einbinden, some + * slightly modified + */ +function jumpTo(lon, lat, zoom) { + var x = Lon2Merc(lon); + var y = Lat2Merc(lat); + map.setCenter(new OpenLayers.LonLat(x, y), zoom); + return false; +} + +function Lon2Merc(lon) { + return 20037508.34 * lon / 180; +} + +function Lat2Merc(lat) { + var PI = 3.14159265358979323846; + lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / (PI / 180); + return 20037508.34 * lat / 180; +} + +function addMarker(layer, lon, lat, popupContentHTML, showPopupOnLoad, iconId) { + + // Koordinaten in LonLat umwandeln + var ll = new OpenLayers.LonLat(Lon2Merc(lon), Lat2Merc(lat)); + + // Feature erstellen und konfigurieren (Popup und Marker) + var feature = new OpenLayers.Feature(layer, ll); + feature.closeBox = true; + feature.popupClass = OpenLayers.Class(OpenLayers.Popup.FramedCloud, {minSize: new OpenLayers.Size(200, 120) } ); + feature.data.popupContentHTML = popupContentHTML; + feature.data.overflow = "auto"; + feature.data.icon = makeIcon(iconId); + + // Marker erstellen + var marker = feature.createMarker(); + + /* + * Handler Funktionen für die Mouse-Events + */ + // Click + var markerClick = function(evt) { + // Wenn das Popup nicht sichtbar ist, dann kann es nicht fest sichtbar sein + if (!this.popup.visible()) + this.popup.clicked = false; + if (this.popup.clicked == true) { + this.popup.clicked = false; + this.popup.hide(); + } + else { + this.popup.clicked = true; + if (!this.popup.visible()) + this.popup.show(); + } + OpenLayers.Event.stop(evt); + }; + // Hover + var markerHover = function(evt) { + // Wenn das Popup nicht sichtbar ist, dann kann es nicht fest sichtbar sein + if (!this.popup.visible()) + this.popup.clicked = false; + if (!this.popup.clicked) + this.popup.show(); + + OpenLayers.Event.stop(evt); + } + // Hover End + var markerHoverEnd = function(evt) { + if (!this.popup.clicked) { + this.popup.hide(); + } + OpenLayers.Event.stop(evt); + } + + // Events auf den Marker registrieren und als Objekt das Feature übergeben + marker.events.register("mousedown", feature, markerClick); + if (showPopupOnHover) { + marker.events.register("mouseover", feature, markerHover); + marker.events.register("mouseout", feature, markerHoverEnd); + } + + // Erstellten Marker der Ebene hinzufügen + layer.addMarker(marker); + + // Popup erstellen, der Karte hinzufügen und anzeigen, falls gewünscht + map.addPopup(feature.createPopup(feature.closeBox)); + + if (showPopupOnLoad != true) { + // Wenn das Popup nicht angezeigt werden soll, verstecken und auf 'nicht angeklickt' setzen + feature.popup.hide(); + feature.popup.clicked = false; + } else { + // Das Popup wird direkt angezeigt und zwar solange bis man es explizit schließt + feature.popup.clicked = true; + } + + return marker; +} + +/* + * + * Creates a new marker icon + * + * using the icons-array (defined in the html-file) + * + * index + * 0 address to the image + * 1 width of the image + * 2 height + * 3 factor by which the image should be offset horizontally + * 4 factor by which the image should be offset vertically + * + * please see the icon array itself for examples of values + */ +function makeIcon(iconId) { + var size = new OpenLayers.Size(icons[iconId][1],icons[iconId][2]); + var offset = new OpenLayers.Pixel(-(size.w*icons[iconId][3]), -(size.h*icons[iconId][4])); + var icon = new OpenLayers.Icon(icons[iconId][0],size,offset); + return icon; +} + +function getCycleTileURL(bounds) { + var res = this.map.getResolution(); + var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w)); + var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h)); + var z = this.map.getZoom(); + var limit = Math.pow(2, z); + + if (y < 0 || y >= limit) + { + return null; + } + else + { + x = ((x % limit) + limit) % limit; + + return this.url + z + "/" + x + "/" + y + "." + this.type; + } +} + +/* + * Funktion zum Zerlegen der URL um die Parameter zu erhalten (für den Permalink) + * Splits the URL in its parameters + */ +function get_parameters() { + // erzeugt für jeden in der url übergebenen parameter einen wert + // bsp: x.htm?nachname=Munch&vorname=Alex&bildfile=wasserfall.jpg erzeugt + // variable nachname mit wert Munch und + // variable vorname mit wert Alex + // variable bildfile mit wert wasserfall.jpg + var hier = document.URL; + var parameterzeile = hier.substr((hier.indexOf("?")+1)); + var trennpos; + var endpos; + var paramname; + var paramwert; + var parameters = new Object(); + while (parameterzeile != "") { + trennpos = parameterzeile.indexOf("="); + endpos = parameterzeile.indexOf("&"); + if (endpos < 0) { endpos = 500000; } + paramname = parameterzeile.substr(0,trennpos); + paramwert = parameterzeile.substring(trennpos+1,endpos); + parameters[paramname] = paramwert; + //eval (paramname + " = \"" + paramwert + "\""); + parameterzeile = parameterzeile.substr(endpos+1); + } + return parameters; +} + +/* + * Wie der Name schon sagt ebenfalls für den Permalink, überprüft ob die Parameter in der URL gefunden wurden und überschreibt + * sie gegebenenfalls. + * Checks the url for parameters of the permalink and overwrites the default values if necessary. + */ +function checkForPermalink() { + var parameters = get_parameters(); + + if (parameters['zoom'] != null) + zoom = parseInt(parameters['zoom']); + if (parameters['lat'] != null) + lat = parseFloat(parameters['lat']); + if (parameters['lon'] != null) + lon = parseFloat(parameters['lon']); +} +/* + * Debugging Funktion + */ +function var_dump(obj) { + if(typeof obj == "object") { + return "Type: "+typeof(obj)+((obj.constructor) ? "\nConstructor: "+obj.constructor : "")+"\nValue: " + obj; + } else { + return "Type: "+typeof(obj)+"\nValue: "+obj; + } +}//end function var_dump + + + +/* + * Für den Layer-Switcher mit Buttons + */ +function setLayer(id) { + if (document.getElementById("layer") != null) { + for (var i=0;iIf you see this text, you opened the map HTML-File without the necessary files.
False 1623-2001-03 -+ Unamed 1623 2d -? +1/T= 2001-03 @@ -21,7 +21,7 @@CUCC 2001 MikeTA -No description extant +A short (~5m) downclimb with passage going off 2001 logbook diff --git a/noinfo/cave_data/1623-2002-05.html b/noinfo/cave_data/1623-2002-05.html index ca37d1ec5..778d22e13 100644 --- a/noinfo/cave_data/1623-2002-05.html +++ b/noinfo/cave_data/1623-2002-05.html @@ -24,14 +24,14 @@ Climb down shakehole leads to meandering stream canyon sloping steeply down to cobble choke. Attempts to dig this failed to make progress. There is no noticeable draught. - Drawn up straight into Tunnel by Phil. +Drawn up straight into Tunnel by Phil. Shown on 204 area survey In dataset - + caves/2002-05/2002-05.svx smkridge/2002-05/2002-05.html smkridge/2002-05/2002-05.html diff --git a/noinfo/cave_data/1623-2002-06.html b/noinfo/cave_data/1623-2002-06.html index 0a9d6d94e..a19492bbd 100644 --- a/noinfo/cave_data/1623-2002-06.html +++ b/noinfo/cave_data/1623-2002-06.html @@ -24,14 +24,14 @@Greasy 3m climb into rift chamber. Way on is too tight. - Drawn up straight into Tunnel by DL. +Drawn up straight into Tunnel by DL. This tunnel file appears to be lost. In dataset - + caves/2002-06/2002-06.svx smkridge/2002-06/2002-06.html smkridge/2002-06/2002-06.html diff --git a/noinfo/cave_data/1623-2002-AD-01.html b/noinfo/cave_data/1623-2002-AD-01.html index ee8a278ea..1715adbc6 100644 --- a/noinfo/cave_data/1623-2002-AD-01.html +++ b/noinfo/cave_data/1623-2002-AD-01.html @@ -8,7 +8,7 @@False 1623-2002-AD-01 -+ Unamed 1623 2d1/S = @@ -24,7 +24,7 @@Short drop (~4m) to snow plug. There is a gap above the snow plug and there may be a way on, though it is probably choked. Brief description in 2002#12 -+ Sketch in 2002#12 diff --git a/noinfo/cave_data/1623-2012-HW-01.html b/noinfo/cave_data/1623-2012-HW-01.html index 64b8820bc..17e6fd3ce 100644 --- a/noinfo/cave_data/1623-2012-HW-01.html +++ b/noinfo/cave_data/1623-2012-HW-01.html @@ -11,7 +11,6 @@ Unamed 1623 2d -1T- 2012-HW-01 @@ -22,7 +21,7 @@- diff --git a/noinfo/cave_data/1623-238.html b/noinfo/cave_data/1623-238.html index 2102a6b4d..b11a817fd 100644 --- a/noinfo/cave_data/1623-238.html +++ b/noinfo/cave_data/1623-238.html @@ -29,14 +29,14 @@ An approximately 20m deep shaft with snow at the bottom. If snow levels allow, a way on can found down the left side of the snow plug, through an awkward squeeze over a large rock into a chamber with a snow and ice slope. A second short pitch leads off to the left, but soon ends. A second small entrance leads via an awkward crawl to a sloping ledge on the right hand wall of the shaft a couple of metres down.
- 
Survey of 238 from 2001. The cave was resurveyed in 2002 (notes in 2002#06) but not drawn up.
Survey of 238 from 2001. The cave was further explored in 2002 (notes in 2002#06) but not drawn up.
2002 logbook (2002-08-05) In dataset - + caves/238/238.svx smkridge/238/238.html smkridge/238/238.html 
(drawn up partly from sketch in 2003 logbook and partly from memory)
Form prepared 06/03/2005, sent May 2005, number issued August. -+ caves/247/247.svx ~20m diff --git a/noinfo/cave_data/1623-249.html b/noinfo/cave_data/1623-249.html index 4546f99cd..208c9fbef 100644 --- a/noinfo/cave_data/1623-249.html +++ b/noinfo/cave_data/1623-249.html @@ -31,7 +31,7 @@- + caves/249/249.svx smkridge/249/249.html smkridge/249/249.html diff --git a/noinfo/cave_data/1623-258.html b/noinfo/cave_data/1623-258.html index 672f39b83..3be79e836 100644 --- a/noinfo/cave_data/1623-258.html +++ b/noinfo/cave_data/1623-258.html @@ -25,7 +25,7 @@b -CUCC 2006, 2007 +CUCC 2006-13 See underground description page See underground description diff --git a/noinfo/cavestats b/noinfo/cavestats deleted file mode 100755 index 80efc1d96..000000000 Binary files a/noinfo/cavestats and /dev/null differ diff --git a/noinfo/cavestats b/noinfo/cavestats new file mode 120000 index 000000000..d4713b324 --- /dev/null +++ b/noinfo/cavestats @@ -0,0 +1 @@ +cavestats_i386 \ No newline at end of file diff --git a/noinfo/cavestats.build b/noinfo/cavestats.build index c33e99c61..370abf3a9 100644 --- a/noinfo/cavestats.build +++ b/noinfo/cavestats.build @@ -2,8 +2,7 @@ apt-get source survex sudo apt-get build-dep survex -pushd -cd survex-* +pushd survex-* dpkg-buildpackage cp cavestats.c survex-*/src cd src @@ -12,4 +11,4 @@ gcc -DHAVE_CONFIG_H -I. -I.. -DIMG_HOSTED -Wall -W -Wunused -Wshadow -Wredundant-decls -Wnested-externs -Wcast-align -g -O2 -O2 -MT 3dtopos.o -MD -MP namecmp.o img.o useful.o cmdline.o message.o filename.o osdepend.o z_getopt.o getopt1.o -o cavestats cavestats.c -lm -mv cavestats ../../ \ No newline at end of file +mv cavestats ../../ diff --git a/noinfo/cavestats_amd64 b/noinfo/cavestats_amd64 new file mode 100755 index 000000000..80efc1d96 Binary files /dev/null and b/noinfo/cavestats_amd64 differ diff --git a/noinfo/cavestats_i386 b/noinfo/cavestats_i386 index 9496f3ef2..eaa8025fc 100755 Binary files a/noinfo/cavestats_i386 and b/noinfo/cavestats_i386 differ diff --git a/noinfo/entrance_data/1623-107.html b/noinfo/entrance_data/1623-107.html index b130d4a37..15354a75b 100644 --- a/noinfo/entrance_data/1623-107.html +++ b/noinfo/entrance_data/1623-107.html @@ -38,8 +38,8 @@ - gps98.107 -pre selective availability GPS +p107 +from surface survey diff --git a/noinfo/entrance_data/1623-145a.html b/noinfo/entrance_data/1623-145a.html index f068a747b..315b898e5 100644 --- a/noinfo/entrance_data/1623-145a.html +++ b/noinfo/entrance_data/1623-145a.html @@ -38,8 +38,8 @@ - gps00.145 -post selective availability GPS +p145 +from surface survey diff --git a/noinfo/entrance_data/1623-162b.html b/noinfo/entrance_data/1623-162b.html index 15e463104..9c5c22590 100644 --- a/noinfo/entrance_data/1623-162b.html +++ b/noinfo/entrance_data/1623-162b.html @@ -36,10 +36,10 @@ - + p162b - p1999-10 -post selective availability GPS ++ diff --git a/noinfo/entrance_data/1623-1999-OB-01.html b/noinfo/entrance_data/1623-1999-OB-01.html index 99d832d37..bcecc26c7 100644 --- a/noinfo/entrance_data/1623-1999-OB-01.html +++ b/noinfo/entrance_data/1623-1999-OB-01.html @@ -32,11 +32,11 @@ L = Lost, R = Refindable" --> R -+ Coordinates need translating from wgs84. See loser/fixedpts/gps12. - p99ob01 +p99ob01 commented out of database diff --git a/noinfo/entrance_data/1623-2002-05.html b/noinfo/entrance_data/1623-2002-05.html index dda2a6d88..d85126a63 100644 --- a/noinfo/entrance_data/1623-2002-05.html +++ b/noinfo/entrance_data/1623-2002-05.html @@ -25,13 +25,13 @@ S? = Spit (?), U = Unmarked, ? = Unknown" --> - + T - + S diff --git a/noinfo/entrance_data/1623-2002-06.html b/noinfo/entrance_data/1623-2002-06.html index aa0886b41..f002616df 100644 --- a/noinfo/entrance_data/1623-2002-06.html +++ b/noinfo/entrance_data/1623-2002-06.html @@ -25,13 +25,13 @@ S? = Spit (?), U = Unmarked, ? = Unknown" --> - + T - + S diff --git a/noinfo/entrance_data/1623-2004-18.html b/noinfo/entrance_data/1623-2004-18.html index ec5eefce9..68ad396ab 100644 --- a/noinfo/entrance_data/1623-2004-18.html +++ b/noinfo/entrance_data/1623-2004-18.html @@ -36,7 +36,7 @@ - gps04.p2004-18 +p2004-18 diff --git a/noinfo/entrance_data/1623-2012-HW-02.html b/noinfo/entrance_data/1623-2012-HW-02.html index a4ac343c2..50cf3dd7e 100644 --- a/noinfo/entrance_data/1623-2012-HW-02.html +++ b/noinfo/entrance_data/1623-2012-HW-02.html @@ -42,8 +42,8 @@ Discovered 2012 - - + p2012-HW-02 +gps smkridge/2012-HW-02_entrance.html diff --git a/noinfo/entrance_data/1623-2012-OK-01.html b/noinfo/entrance_data/1623-2012-OK-01.html index d45715ffc..6e9e34216 100644 --- a/noinfo/entrance_data/1623-2012-OK-01.html +++ b/noinfo/entrance_data/1623-2012-OK-01.html @@ -33,7 +33,7 @@ S = Surveyed, L = Lost, R = Refindable" --> -+ S diff --git a/noinfo/entrance_data/1623-2012-OK-02.html b/noinfo/entrance_data/1623-2012-OK-02.html index 234ab1326..5335b5810 100644 --- a/noinfo/entrance_data/1623-2012-OK-02.html +++ b/noinfo/entrance_data/1623-2012-OK-02.html @@ -32,7 +32,7 @@ S = Surveyed, L = Lost, R = Refindable" --> - + S diff --git a/noinfo/entrance_data/1623-2012-OK-03.html b/noinfo/entrance_data/1623-2012-OK-03.html index da46cfab0..ef75e8229 100644 --- a/noinfo/entrance_data/1623-2012-OK-03.html +++ b/noinfo/entrance_data/1623-2012-OK-03.html @@ -32,7 +32,7 @@ S = Surveyed, L = Lost, R = Refindable" --> - + S diff --git a/noinfo/entrance_data/1623-207.html b/noinfo/entrance_data/1623-207.html index 6c80fdede..165346cb7 100644 --- a/noinfo/entrance_data/1623-207.html +++ b/noinfo/entrance_data/1623-207.html @@ -38,8 +38,8 @@ - gps00.wk2 -post selective availability GPS +p207 +from surface survey VSK (obvious point = Nipple ?) 103°, HSK (leftmost top) 052°, Schönberg 346° diff --git a/noinfo/entrance_data/1623-208.html b/noinfo/entrance_data/1623-208.html index db61913ec..f3c7f9367 100644 --- a/noinfo/entrance_data/1623-208.html +++ b/noinfo/entrance_data/1623-208.html @@ -38,8 +38,8 @@ - gps00.wk3 -post selective availability GPS +p208 +from surface survey B.Nase 161°, VSK (obvious point = Nipple ?) 104°, HSK (leftmost top) 054°, Schönberg 346°, Wildkogel (L&R ends of obvious summit ridge) 007-011° diff --git a/noinfo/entrance_data/1623-215a.html b/noinfo/entrance_data/1623-215a.html index 9f294ff45..ab22e5596 100644 --- a/noinfo/entrance_data/1623-215a.html +++ b/noinfo/entrance_data/1623-215a.html @@ -31,7 +31,7 @@ S = Surveyed, L = Lost, R = Refindable" --> - + S diff --git a/noinfo/entrance_data/1623-215b.html b/noinfo/entrance_data/1623-215b.html index ae65dccc6..f0fd91898 100644 --- a/noinfo/entrance_data/1623-215b.html +++ b/noinfo/entrance_data/1623-215b.html @@ -31,7 +31,7 @@ S = Surveyed, L = Lost, R = Refindable" --> - + S diff --git a/noinfo/entrance_data/1623-218.html b/noinfo/entrance_data/1623-218.html index f85792f34..a268c86a2 100644 --- a/noinfo/entrance_data/1623-218.html +++ b/noinfo/entrance_data/1623-218.html @@ -36,10 +36,10 @@ - + p218 - gps00.218 -post selective availability GPS ++ Grießkogel: 354°, HSK (rightmost peak) 018° diff --git a/noinfo/entrance_data/1623-222.html b/noinfo/entrance_data/1623-222.html index fadc18d66..efe3bd18c 100644 --- a/noinfo/entrance_data/1623-222.html +++ b/noinfo/entrance_data/1623-222.html @@ -36,10 +36,10 @@ - + p222 - gps00.96_04 gps00.96_04a -post selective availability GPS ++ VSK (probably true summit): 213°, ?? (not Hollweiser - nearest peak across Hochklapf valley): 114° diff --git a/noinfo/entrance_data/1623-238a.html b/noinfo/entrance_data/1623-238a.html index 863d21774..2cf5676a8 100644 --- a/noinfo/entrance_data/1623-238a.html +++ b/noinfo/entrance_data/1623-238a.html @@ -31,7 +31,7 @@ S = Surveyed, L = Lost, R = Refindable" --> - + S diff --git a/noinfo/entrance_data/1623-238b.html b/noinfo/entrance_data/1623-238b.html index bb89f4d88..fe3a07045 100644 --- a/noinfo/entrance_data/1623-238b.html +++ b/noinfo/entrance_data/1623-238b.html @@ -31,8 +31,8 @@ S = Surveyed, L = Lost, R = Refindable" --> - - + R +Very near 238A diff --git a/noinfo/entrance_data/1623-80.html b/noinfo/entrance_data/1623-80.html index 6b861fd37..2504efaaa 100644 --- a/noinfo/entrance_data/1623-80.html +++ b/noinfo/entrance_data/1623-80.html @@ -38,8 +38,8 @@ - gps00.80 -post selective availability GPS +p80 +Nils survey (1996) VSK nipple: 135°, BW pt 1835: 043° (this cannot possibly be right), Grieskogel: 007°, HSK: 043° diff --git a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py index f371741c3..2a3427078 100644 --- a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py +++ b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py @@ -337,11 +337,7 @@ surfacecolour = "#808080" repath = re.compile(r'^(?:182to(?:tc|184)|tctocol|82to97|vd1to161d|161ftod|161etof|161etog|40entlink2|surfnr161|surf161|kansurf)$') for fnm in ("../all.3d", "../alltracks.3d"): for mapcode in draws.keys(): - try: - file3d = os.popen(dump3d_binary + " " + fnm) - except: - #dump3d doesn't return an error code on "Couldn’t open data file". It should. - print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d) + file3d = os.popen(dump3d_binary + " " + fnm) draw = draws[mapcode] lastx, lasty = 0, 0 for l in file3d: @@ -364,6 +360,7 @@ for fnm in ("../all.3d", "../alltracks.3d"): $ #end of the line ''', l, re.VERBOSE) if not match: + print "Unknown: " + l continue @@ -389,6 +386,10 @@ for fnm in ("../all.3d", "../alltracks.3d"): else: draw.line([lastx, lasty, x, y], fill="#800080") lastx,lasty = x,y + if not file3d.close(): + # FIXME: If dump3d can't gives an error and exits with non-zero status, this + # doesn't get triggered... + print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d) surfacecolour = "#008000" repath = re.compile(r'^') print "Done" @@ -414,7 +415,7 @@ for cave in cavetab: area = re.sub(r' .*', "", area) if area == '1626' or area == 'nonexistent': continue - try: + try: loctuple = find_location(cave) except: print "Unable to find location for %s" % (number)
