ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

One OSM attribution

Browse Source
This commit is contained in:
Tim Schaub
2014-10-21 23:00:10 -06:00
parent 119289040f
commit 3f5dd45310
7 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/igc.js
View File

@@ -73,7 +73,7 @@ var map = new ol.Map({
html: 'All maps © ' + html: 'All maps © ' +
'<a href="http://www.opencyclemap.org/">OpenCycleMap</a>' '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
}), }),
ol.source.OSM.DATA_ATTRIBUTION ol.source.OSM.ATTRIBUTION
], ],
url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
}) })

4
examples/localized-openstreetmap.js
View File

@@ -16,7 +16,7 @@ var openCycleMapLayer = new ol.layer.Tile({
html: 'All maps &copy; ' + html: 'All maps &copy; ' +
'<a href="http://www.opencyclemap.org/">OpenCycleMap</a>' '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
}), }),
ol.source.OSM.DATA_ATTRIBUTION ol.source.OSM.ATTRIBUTION
], ],
url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' 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 &copy; ' + html: 'All maps &copy; ' +
'<a href="http://www.openseamap.org/">OpenSeaMap</a>' '<a href="http://www.openseamap.org/">OpenSeaMap</a>'
}), }),
ol.source.OSM.DATA_ATTRIBUTION ol.source.OSM.ATTRIBUTION
], ],
crossOrigin: null, crossOrigin: null,
url: 'http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png' url: 'http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png'

2
examples/xyz.js
View File

@@ -27,7 +27,7 @@ var map = new ol.Map({
html: 'Tiles &copy; <a href="http://www.opencyclemap.org/">' + html: 'Tiles &copy; <a href="http://www.opencyclemap.org/">' +
'OpenCycleMap</a>' 'OpenCycleMap</a>'
}), }),
ol.source.OSM.DATA_ATTRIBUTION ol.source.OSM.ATTRIBUTION
], ],
url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png' url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
}) })

2
src/ol/attribution.js
View File

@@ -16,7 +16,7 @@ goog.require('ol.TileRange');
* html: 'All maps &copy; ' + * html: 'All maps &copy; ' +
* '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>' * '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
* }), * }),
* ol.source.OSM.DATA_ATTRIBUTION * ol.source.OSM.ATTRIBUTION
* ], * ],
* .. * ..
* *

4
src/ol/source/mapquestsource.js
View File

@@ -59,7 +59,7 @@ ol.source.MapQuestConfig = {
maxZoom: 28, maxZoom: 28,
attributions: [ attributions: [
ol.source.MapQuest.TILE_ATTRIBUTION, ol.source.MapQuest.TILE_ATTRIBUTION,
ol.source.OSM.DATA_ATTRIBUTION ol.source.OSM.ATTRIBUTION
] ]
}, },
'sat': { 'sat': {
@@ -76,7 +76,7 @@ ol.source.MapQuestConfig = {
maxZoom: 18, maxZoom: 18,
attributions: [ attributions: [
ol.source.MapQuest.TILE_ATTRIBUTION, ol.source.MapQuest.TILE_ATTRIBUTION,
ol.source.OSM.DATA_ATTRIBUTION ol.source.OSM.ATTRIBUTION
] ]
} }
}; };

25
src/ol/source/osmsource.js
View File

@@ -23,7 +23,7 @@ ol.source.OSM = function(opt_options) {
if (goog.isDef(options.attributions)) { if (goog.isDef(options.attributions)) {
attributions = options.attributions; attributions = options.attributions;
} else { } else {
attributions = ol.source.OSM.ATTRIBUTIONS; attributions = [ol.source.OSM.ATTRIBUTION];
} }
var crossOrigin = goog.isDef(options.crossOrigin) ? var crossOrigin = goog.isDef(options.crossOrigin) ?
@@ -51,29 +51,8 @@ goog.inherits(ol.source.OSM, ol.source.XYZ);
* @type {ol.Attribution} * @type {ol.Attribution}
* @api * @api
*/ */
ol.source.OSM.DATA_ATTRIBUTION = new ol.Attribution({ ol.source.OSM.ATTRIBUTION = new ol.Attribution({
html: '&copy; ' + html: '&copy; ' +
'<a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> ' + '<a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> ' +
'contributors.' 'contributors.'
}); });
/**
* @const
* @type {ol.Attribution}
* @api
*/
ol.source.OSM.TILE_ATTRIBUTION = new ol.Attribution({
html: '&copy; ' +
'<a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> ' +
'contributors.'
});
/**
* @const
* @type {Array.<ol.Attribution>}
*/
ol.source.OSM.ATTRIBUTIONS = [
ol.source.OSM.TILE_ATTRIBUTION
];

2
src/ol/source/stamensource.js
View File

@@ -128,5 +128,5 @@ ol.source.Stamen.ATTRIBUTIONS = [
'under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY' + 'under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY' +
' 3.0</a>.' ' 3.0</a>.'
}), }),
ol.source.OSM.DATA_ATTRIBUTION ol.source.OSM.ATTRIBUTION
]; ];