From 119289040ff8b539a0b2642b3270a38e2ba2fd12 Mon Sep 17 00:00:00 2001 From: Pol Dell'Aiera Date: Wed, 15 Oct 2014 05:54:46 +0200 Subject: [PATCH 1/2] Issue #2802: Update OSM attribution --- src/ol/source/osmsource.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/ol/source/osmsource.js b/src/ol/source/osmsource.js index 2d757c306a..605d512149 100644 --- a/src/ol/source/osmsource.js +++ b/src/ol/source/osmsource.js @@ -52,10 +52,9 @@ goog.inherits(ol.source.OSM, ol.source.XYZ); * @api */ ol.source.OSM.DATA_ATTRIBUTION = new ol.Attribution({ - html: 'Data © ' + - 'OpenStreetMap ' + - 'contributors, ' + - 'ODbL' + html: '© ' + + 'OpenStreetMap ' + + 'contributors.' }); @@ -65,10 +64,9 @@ ol.source.OSM.DATA_ATTRIBUTION = new ol.Attribution({ * @api */ ol.source.OSM.TILE_ATTRIBUTION = new ol.Attribution({ - html: 'Tiles © ' + - 'OpenStreetMap ' + - 'contributors, ' + - 'CC BY-SA' + html: '© ' + + 'OpenStreetMap ' + + 'contributors.' }); @@ -77,6 +75,5 @@ ol.source.OSM.TILE_ATTRIBUTION = new ol.Attribution({ * @type {Array.} */ ol.source.OSM.ATTRIBUTIONS = [ - ol.source.OSM.TILE_ATTRIBUTION, - ol.source.OSM.DATA_ATTRIBUTION + ol.source.OSM.TILE_ATTRIBUTION ]; From 3f5dd4531079799da59b47cc5522af1c3870146c Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 21 Oct 2014 23:00:10 -0600 Subject: [PATCH 2/2] One OSM attribution --- examples/igc.js | 2 +- examples/localized-openstreetmap.js | 4 ++-- examples/xyz.js | 2 +- src/ol/attribution.js | 2 +- src/ol/source/mapquestsource.js | 4 ++-- src/ol/source/osmsource.js | 25 ++----------------------- src/ol/source/stamensource.js | 2 +- 7 files changed, 10 insertions(+), 31 deletions(-) diff --git a/examples/igc.js b/examples/igc.js index d3d48381bd..afb3e004bd 100644 --- a/examples/igc.js +++ b/examples/igc.js @@ -73,7 +73,7 @@ var map = new ol.Map({ html: 'All maps © ' + 'OpenCycleMap' }), - ol.source.OSM.DATA_ATTRIBUTION + ol.source.OSM.ATTRIBUTION ], url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' }) diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js index 4f9edd9e27..41e41f22d9 100644 --- a/examples/localized-openstreetmap.js +++ b/examples/localized-openstreetmap.js @@ -16,7 +16,7 @@ var openCycleMapLayer = new ol.layer.Tile({ html: 'All maps © ' + 'OpenCycleMap' }), - ol.source.OSM.DATA_ATTRIBUTION + ol.source.OSM.ATTRIBUTION ], url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' }) @@ -29,7 +29,7 @@ var openSeaMapLayer = new ol.layer.Tile({ html: 'All maps © ' + 'OpenSeaMap' }), - ol.source.OSM.DATA_ATTRIBUTION + ol.source.OSM.ATTRIBUTION ], crossOrigin: null, url: 'http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png' diff --git a/examples/xyz.js b/examples/xyz.js index a29ebd6092..041e6d983f 100644 --- a/examples/xyz.js +++ b/examples/xyz.js @@ -27,7 +27,7 @@ var map = new ol.Map({ html: 'Tiles © ' + 'OpenCycleMap' }), - ol.source.OSM.DATA_ATTRIBUTION + ol.source.OSM.ATTRIBUTION ], url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' }) diff --git a/src/ol/attribution.js b/src/ol/attribution.js index eb0dd8a656..da38e4a388 100644 --- a/src/ol/attribution.js +++ b/src/ol/attribution.js @@ -16,7 +16,7 @@ goog.require('ol.TileRange'); * html: 'All maps © ' + * 'OpenCycleMap' * }), - * ol.source.OSM.DATA_ATTRIBUTION + * ol.source.OSM.ATTRIBUTION * ], * .. * diff --git a/src/ol/source/mapquestsource.js b/src/ol/source/mapquestsource.js index aa16933764..6b9f7f59f3 100644 --- a/src/ol/source/mapquestsource.js +++ b/src/ol/source/mapquestsource.js @@ -59,7 +59,7 @@ ol.source.MapQuestConfig = { maxZoom: 28, attributions: [ ol.source.MapQuest.TILE_ATTRIBUTION, - ol.source.OSM.DATA_ATTRIBUTION + ol.source.OSM.ATTRIBUTION ] }, 'sat': { @@ -76,7 +76,7 @@ ol.source.MapQuestConfig = { maxZoom: 18, attributions: [ ol.source.MapQuest.TILE_ATTRIBUTION, - ol.source.OSM.DATA_ATTRIBUTION + ol.source.OSM.ATTRIBUTION ] } }; diff --git a/src/ol/source/osmsource.js b/src/ol/source/osmsource.js index 605d512149..b100bbbcdf 100644 --- a/src/ol/source/osmsource.js +++ b/src/ol/source/osmsource.js @@ -23,7 +23,7 @@ ol.source.OSM = function(opt_options) { if (goog.isDef(options.attributions)) { attributions = options.attributions; } else { - attributions = ol.source.OSM.ATTRIBUTIONS; + attributions = [ol.source.OSM.ATTRIBUTION]; } var crossOrigin = goog.isDef(options.crossOrigin) ? @@ -51,29 +51,8 @@ goog.inherits(ol.source.OSM, ol.source.XYZ); * @type {ol.Attribution} * @api */ -ol.source.OSM.DATA_ATTRIBUTION = new ol.Attribution({ +ol.source.OSM.ATTRIBUTION = new ol.Attribution({ html: '© ' + 'OpenStreetMap ' + 'contributors.' }); - - -/** - * @const - * @type {ol.Attribution} - * @api - */ -ol.source.OSM.TILE_ATTRIBUTION = new ol.Attribution({ - html: '© ' + - 'OpenStreetMap ' + - 'contributors.' -}); - - -/** - * @const - * @type {Array.} - */ -ol.source.OSM.ATTRIBUTIONS = [ - ol.source.OSM.TILE_ATTRIBUTION -]; diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamensource.js index 78d0279126..2980756c2b 100644 --- a/src/ol/source/stamensource.js +++ b/src/ol/source/stamensource.js @@ -128,5 +128,5 @@ ol.source.Stamen.ATTRIBUTIONS = [ 'under CC BY' + ' 3.0.' }), - ol.source.OSM.DATA_ATTRIBUTION + ol.source.OSM.ATTRIBUTION ];