From d8330d56a01c87cfa50712d7fb15565400b8921b Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 2 Feb 2016 13:42:05 +0100
Subject: [PATCH 1/3] Add opaque option to olx.source.OSMOptions

---
 externs/olx.js             | 9 +++++++++
 src/ol/source/osmsource.js | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/externs/olx.js b/externs/olx.js
index c06867e93e..9689d9e241 100644
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -4573,6 +4573,7 @@ olx.source.TileDebugOptions.prototype.wrapX;
  * @typedef {{attributions: (Array.<ol.Attribution>|undefined),
  *     crossOrigin: (null|string|undefined),
  *     maxZoom: (number|undefined),
+ *     opaque: (boolean|undefined),
  *     reprojectionErrorThreshold: (number|undefined),
  *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
  *     url: (string|undefined),
@@ -4612,6 +4613,14 @@ olx.source.OSMOptions.prototype.crossOrigin;
 olx.source.OSMOptions.prototype.maxZoom;
 
 
+/**
+ * Whether the layer is opaque. Default is `true`.
+ * @type {boolean|undefined}
+ * @api
+ */
+olx.source.OSMOptions.prototype.opaque;
+
+
 /**
  * Maximum allowed reprojection error (in pixels). Default is `0.5`.
  * Higher values can increase reprojection performance, but decrease precision.
diff --git a/src/ol/source/osmsource.js b/src/ol/source/osmsource.js
index 52f7816ec6..91d9c69c93 100644
--- a/src/ol/source/osmsource.js
+++ b/src/ol/source/osmsource.js
@@ -33,7 +33,7 @@ ol.source.OSM = function(opt_options) {
   goog.base(this, {
     attributions: attributions,
     crossOrigin: crossOrigin,
-    opaque: true,
+    opaque: options.opaque !== undefined ? options.opaque : true,
     maxZoom: options.maxZoom !== undefined ? options.maxZoom : 19,
     reprojectionErrorThreshold: options.reprojectionErrorThreshold,
     tileLoadFunction: options.tileLoadFunction,

From 44e17c440d131ceea5e949083f86b283c8672156 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 2 Feb 2016 13:44:06 +0100
Subject: [PATCH 2/3] Remove crossOrigin null option for OpenSeaMap source

---
 examples/localized-openstreetmap.html | 5 ++---
 examples/localized-openstreetmap.js   | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/localized-openstreetmap.html b/examples/localized-openstreetmap.html
index aa70a35793..620d9c834a 100644
--- a/examples/localized-openstreetmap.html
+++ b/examples/localized-openstreetmap.html
@@ -3,8 +3,7 @@ layout: example.html
 title: Localized OpenStreetMap
 shortdesc: Example of a localized OpenStreetMap map with a custom tile server and a custom attribution.
 docs: >
-  <p>The base layer is <a href="http://www.opencyclemap.org/">OpenCycleMap</a> with an overlay from <a href="http://www.openseamap.org/">OpenSeaMap</a>. The OpenSeaMap tile server
-  does not support <a href="http://enable-cors.org/">CORS</a> headers.</p>
-tags: "cors, localized-openstreetmap, openseamap, openstreetmap"
+  <p>The base layer is <a href="http://www.opencyclemap.org/">OpenCycleMap</a> with an overlay from <a href="http://www.openseamap.org/">OpenSeaMap</a>.
+tags: "localized-openstreetmap, openseamap, openstreetmap"
 ---
 <div id="map" class="map"></div>
diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js
index 0459d45d22..5b8f79dbe7 100644
--- a/examples/localized-openstreetmap.js
+++ b/examples/localized-openstreetmap.js
@@ -28,7 +28,6 @@ var openSeaMapLayer = new ol.layer.Tile({
       }),
       ol.source.OSM.ATTRIBUTION
     ],
-    crossOrigin: null,
     url: 'http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png'
   })
 });

From 7b202c41129249a5256a4dbef273a8d1699e95c5 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 2 Feb 2016 13:44:37 +0100
Subject: [PATCH 3/3] Add opaque option for OpenSeaMap source

---
 examples/localized-openstreetmap.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js
index 5b8f79dbe7..f02b27a019 100644
--- a/examples/localized-openstreetmap.js
+++ b/examples/localized-openstreetmap.js
@@ -28,6 +28,7 @@ var openSeaMapLayer = new ol.layer.Tile({
       }),
       ol.source.OSM.ATTRIBUTION
     ],
+    opaque: false,
     url: 'http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png'
   })
 });