diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js index 458f92bc04..ea16d35a53 100644 --- a/examples/localized-openstreetmap.js +++ b/examples/localized-openstreetmap.js @@ -10,12 +10,12 @@ var map = new ol.Map({ layers: [ new ol.layer.TileLayer({ source: new ol.source.OpenStreetMap({ - attribution: new ol.Attribution( - 'All maps © ' + - 'OpenCycleMap, ' + - 'map data © ' + - 'OpenStreetMap ' + - '(ODbL)'), + attributions: [ + new ol.Attribution( + 'All maps © ' + + 'OpenCycleMap'), + ol.source.OpenStreetMap.DATA_ATTRIBUTION + ], url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' }) }) diff --git a/src/ol/source/mapquestsource.js b/src/ol/source/mapquestsource.js index 10827beff2..6c4ef2c249 100644 --- a/src/ol/source/mapquestsource.js +++ b/src/ol/source/mapquestsource.js @@ -2,6 +2,7 @@ goog.provide('ol.source.MapQuestOSM'); goog.provide('ol.source.MapQuestOpenAerial'); goog.require('ol.Attribution'); +goog.require('ol.source.OpenStreetMap'); goog.require('ol.source.XYZ'); @@ -16,11 +17,7 @@ ol.source.MapQuestOSM = function() { new ol.Attribution( 'Tiles Courtesy of ' + 'MapQuest'), - new ol.Attribution( - 'Data © ' + - 'OpenStreetMap ' + - 'contributors, ' + - 'CC BY-SA') + ol.source.OpenStreetMap.DATA_ATTRIBUTION ]; goog.base(this, { diff --git a/src/ol/source/openstreetmapsource.exports b/src/ol/source/openstreetmapsource.exports index a2b205a252..e64a17bb31 100644 --- a/src/ol/source/openstreetmapsource.exports +++ b/src/ol/source/openstreetmapsource.exports @@ -1,2 +1,4 @@ @exportSymbol ol.source.OpenStreetMap +@exportProperty ol.source.OpenStreetMap.DATA_ATTRIBUTION +@exportProperty ol.source.OpenStreetMap.TILE_ATTRIBUTION diff --git a/src/ol/source/openstreetmapsource.js b/src/ol/source/openstreetmapsource.js index 5f73770068..6a27b2ce45 100644 --- a/src/ol/source/openstreetmapsource.js +++ b/src/ol/source/openstreetmapsource.js @@ -4,16 +4,6 @@ goog.require('ol.Attribution'); goog.require('ol.source.XYZ'); -/** - * @const - * @type {Array.