From 2e11012ddc908a6a67391e45ed0202af158c6281 Mon Sep 17 00:00:00 2001
From: expo on server <devnull@localhost>
Date: Mon, 5 Aug 2019 22:20:41 +0100
Subject: [PATCH] Edited pubs.htm so logbook link for 2019 points the right
 way.

---
 map/index.html | 30 +++++++++++++++---------------
 pubs.htm       |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/map/index.html b/map/index.html
index 30d7a1780..0835a834f 100644
--- a/map/index.html
+++ b/map/index.html
@@ -8,8 +8,8 @@
 <meta http-equiv="content-language" content="en" />
 
 <script src="/javascript/openlayers/OpenLayers.js"></script>
-<script src="/javascript/openstreetmap/OpenStreetMap.js"></script>
-<script src="util.js"></script>
+<!-- <script src="/javascript/openstreetmap/OpenStreetMap.js"></script> -->
+<!-- <script src="util.js"></script> -->
  
 <script type="text/javascript">
 //<![CDATA[
@@ -51,15 +51,15 @@ function drawmap() {
 
 //checkForPermalink();
 
-icons = new Array();
-icons[0] = new Array('http://openlayers.org/api/img/marker.png','21','25','0.5','1');
+//icons = new Array();
+//icons[0] = new Array('http://openlayers.org/api/img/marker.png','21','25','0.5','1');
 
 // Display layers
 
-layer_markers = new OpenLayers.Layer.Markers("Marker", { projection: new OpenLayers.Projection("EPSG:4326"),visibility: true, displayInLayerSwitcher: false });
+//layer_markers = new OpenLayers.Layer.Markers("Marker", { projection: new OpenLayers.Projection("EPSG:4326"),visibility: true, displayInLayerSwitcher: false });
 //layer_vectors = new OpenLayers.Layer.Vector("Zeichnungen", { displayInLayerSwitcher: true } );
 //map.addLayer(layer_vectors);
-map.addLayer(layer_markers)
+//map.addLayer(layer_markers)
 //layers = new Array();
 //layer_layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
 //map.addLayer(layer_layerMapnik);
@@ -68,15 +68,15 @@ map.addLayer(layer_markers)
 //map.addLayer(layer_layerCyclemap);
 //layers.push(new Array(layer_layerCyclemap,'layer_layerCyclemap'));
 
-layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
+var layerMapnik = new OpenLayers.Layer.OSM();
 map.addLayer(layerMapnik);
 
-layerCycleMap = new OpenLayers.Layer.OSM.CycleMap("CycleMap");
-map.addLayer(layerCycleMap);
+//layerCycleMap = new OpenLayers.Layer.OSM("CycleMap");
+//map.addLayer(layerCycleMap);
 
-layers = new Array();
-layers.push(new Array(layerMapnik,'layerMapnik'));
-layers.push(new Array(layerCycleMap,'layerCycleMap'));
+//layers = new Array();
+//layers.push(new Array(layerMapnik,'layerMapnik'));
+//layers.push(new Array(layerCycleMap,'layerCycleMap'));
 
 //this isn't right yet - GPX points are not appearing
 map.addLayer(
@@ -135,7 +135,7 @@ var layerGPX = new OpenLayers.Layer.Vector("Entrances", {
 
 
 map.addLayer(layerGPX);
-layers.push(new Array(layerGPX,'layerGPX'));
+//layers.push(new Array(layerGPX,'layerGPX'));
 			
 				// fit map to bounds of window and add start, finish pins (finish not working)
 layerGPX.events.register("loadend", layerGPX, function() {
@@ -153,9 +153,9 @@ layerGPX.events.register("loadend", layerGPX, function() {
 // Markers layer must be last up if you want the hover over dialouge to work
 layerMarkers = new OpenLayers.Layer.Markers("Marker", { projection: new OpenLayers.Projection("EPSG:4326"), visibility: true, displayInLayerSwitcher: false });
 map.addLayer(layerMarkers);
-layers.push(new Array(layerMarkers,'layerMarkers'));
+//layers.push(new Array(layerMarkers,'layerMarkers'));
 
-setLayer(1);
+//setLayer(1);
 
 // Jump to the right location
 jumpTo(lon,lat,zoom);
diff --git a/pubs.htm b/pubs.htm
index a93a12cee..1cfdadf5e 100644
--- a/pubs.htm
+++ b/pubs.htm
@@ -113,7 +113,7 @@ or the reference has not been looked up:</p>
 <a href="years/2016/logbook.html">2016</a> <b>|</b>
 <a href="years/2017/logbook.html">2017</a>&nbsp;(graphics&nbsb;incomplete)<b>|</b>
 <a href="years/2018/logbook.html">2018 (missing, hopefully in Austria...)</a> <b>|</b>
-<a href="years/2016/logbook.html">2019</a>
+<a href="years/2019/logbook.html">2019</a>
 </p>
 <hr />
 <h4>Accounts following CUCC <a id="pubs1976" href="years/1976/" name="pubs1976">Austria 1976</a></h4>