Merge pull request #491 from twpayne/openstreetmap-options

OpenStreetMap options
This commit is contained in:
Tom Payne
2013-04-07 02:09:29 -07:00
4 changed files with 120 additions and 8 deletions

View File

@@ -0,0 +1,55 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link rel="stylesheet" href="../resources/bootstrap/css/bootstrap.min.css" type="text/css">
<link rel="stylesheet" href="../resources/layout.css" type="text/css">
<link rel="stylesheet" href="../resources/bootstrap/css/bootstrap-responsive.min.css" type="text/css">
<title>Localized OpenStreetMap example</title>
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="./">OpenLayers 3 Examples</a>
<ul class="nav pull-right">
<li><iframe class="github-watch-button" src="http://ghbtns.com/github-btn.html?user=openlayers&repo=ol3&type=watch&count=true"
allowtransparency="true" frameborder="0" scrolling="0" height="20" width="90"></iframe></li>
<li><a href="https://twitter.com/share" class="twitter-share-button" data-count="none" data-hashtags="openlayers">&nbsp;</a></li>
<li><div class="g-plusone-wrapper"><div class="g-plusone" data-size="medium" data-annotation="none"></div></div></li>
</ul>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div id="map" class="map"></div>
</div>
</div>
<div class="row-fluid">
<div class="span4">
<h4 id="title">Localized OpenStreetMap example</h4>
<p id="shortdesc">Example of a localized OpenStreetMap map with a custom tile server and a custom attribution.</p>
<div id="docs">
<p>See the <a href="localized-openstreetmap.js" target="_blank">localized-openstreetmap.js source</a> to see how this is done.</p>
</div>
<div id="tags">localized-openstreetmap, openstreetmap</div>
</div>
</div>
</div>
<script src="loader.js?id=localized-openstreetmap" type="text/javascript"></script>
<script src="../resources/social-links.js" type="text/javascript"></script>
</body>
</html>

View File

@@ -0,0 +1,29 @@
goog.require('ol.Attribution');
goog.require('ol.Map');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.layer.TileLayer');
goog.require('ol.source.OpenStreetMap');
var map = new ol.Map({
layers: [
new ol.layer.TileLayer({
source: new ol.source.OpenStreetMap({
attribution: new ol.Attribution(
'All maps &copy; ' +
'<a href="http://www.opencyclemap.org/">OpenCycleMap</a>, ' +
'map data &copy; ' +
'<a href="http://www.openstreetmap.org/">OpenStreetMap</a> ' +
'(<a href="http://www.openstreetmap.org/copyright">ODbL</a>)'),
url: 'http://{a-c}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
})
})
],
renderers: ol.RendererHints.createFromQueryData(),
target: 'map',
view: new ol.View2D({
center: [-172857, 5977746],
zoom: 12
})
});

View File

@@ -150,6 +150,12 @@
@exportObjectLiteralProperty ol.source.DebugTileSourceOptions.projection ol.ProjectionLike
@exportObjectLiteralProperty ol.source.DebugTileSourceOptions.tileGrid ol.tilegrid.TileGrid|undefined
@exportObjectLiteral ol.source.OpenStreetMapOptions
@exportObjectLiteralProperty ol.source.OpenStreetMapOptions.attribution ol.Attribution|undefined
@exportObjectLiteralProperty ol.source.OpenStreetMapOptions.attributions Array.<ol.Attribution>|undefined
@exportObjectLiteralProperty ol.source.OpenStreetMapOptions.maxZoom number|undefined
@exportObjectLiteralProperty ol.source.OpenStreetMapOptions.url string|undefined
@exportObjectLiteral ol.source.SingleImageWMSOptions
@exportObjectLiteralProperty ol.source.SingleImageWMSOptions.attributions Array.<ol.Attribution>|undefined
@exportObjectLiteralProperty ol.source.SingleImageWMSOptions.crossOrigin null|string|undefined

View File

@@ -4,24 +4,46 @@ goog.require('ol.Attribution');
goog.require('ol.source.XYZ');
/**
* @const
* @type {Array.<ol.Attribution>}
*/
ol.source.OPENSTREETMAP_ATTRIBUTIONS = [new ol.Attribution(
'&copy; <a href="http://www.openstreetmap.org">OpenStreetMap</a> ' +
'contributors, ' +
'<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC BY-SA</a>')];
/**
* @constructor
* @extends {ol.source.XYZ}
* @param {ol.source.OpenStreetMapOptions=} opt_options Open Street Map options.
*/
ol.source.OpenStreetMap = function() {
ol.source.OpenStreetMap = function(opt_options) {
var attribution = new ol.Attribution(
'&copy; <a href="http://www.openstreetmap.org">OpenStreetMap</a> ' +
'contributors, ' +
'<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC BY-SA</a>');
var options = goog.isDef(opt_options) ? opt_options : {};
var attributions;
if (goog.isDef(options.attributions)) {
attributions = options.attributions;
} else if (goog.isDef(options.attribution)) {
attributions = [options.attribution];
} else {
attributions = ol.source.OPENSTREETMAP_ATTRIBUTIONS;
}
var maxZoom = goog.isDef(options.maxZoom) ? options.maxZoom : 18;
var url = goog.isDef(options.url) ?
options.url : 'http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png';
goog.base(this, {
attributions: [attribution],
attributions: attributions,
crossOrigin: 'anonymous',
opaque: true,
maxZoom: 18,
url: 'http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png'
maxZoom: maxZoom,
url: url
});
};