'),new ol.Attribution('Data © OpenStreetMap contributors, CC BY-SA')];ol.source.XYZ.call(this,{attributions:a,opaque:!0,maxZoom:28,url:"http://otile{1-4}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg"})};
goog.inherits(ol.source.MapQuestOSM,ol.source.XYZ);ol.source.MapQuestOpenAerial=function(){var a=[new ol.Attribution('Tiles Courtesy of MapQuest '),new ol.Attribution("Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency")];ol.source.XYZ.call(this,{attributions:a,maxZoom:18,opaque:!0,url:"http://oatile{1-4}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg"})};
-goog.inherits(ol.source.MapQuestOpenAerial,ol.source.XYZ);ol.source.OpenStreetMap=function(){var a=new ol.Attribution('© OpenStreetMap contributors, CC BY-SA');ol.source.XYZ.call(this,{attributions:[a],opaque:!0,maxZoom:18,url:"http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png"})};goog.inherits(ol.source.OpenStreetMap,ol.source.XYZ);ol.source.SingleImageWMS=function(a){var b=goog.isDef(a.url)?ol.ImageUrlFunction.createWMSParams(a.url,a.params,a.version):ol.ImageUrlFunction.nullImageUrlFunction;ol.source.ImageSource.call(this,{attributions:a.attributions,crossOrigin:a.crossOrigin,extent:a.extent,projection:a.projection,resolutions:a.resolutions,imageUrlFunction:b});this.image_=null;this.ratio_=1.5};goog.inherits(ol.source.SingleImageWMS,ol.source.ImageSource);
-ol.source.SingleImageWMS.prototype.getImage=function(a,b,c){var b=this.findNearestResolution(b),d=this.image_;if(!goog.isNull(d)&&d.getResolution()==b&&d.getExtent().containsExtent(a))return d;a=new ol.Extent(a.minX,a.minY,a.maxX,a.maxY);a.scaleFromCenter(this.ratio_);var d=a.getWidth()/b,e=a.getHeight()/b,d=new ol.Size(d,e);return this.image_=this.createImage(a,b,d,c)};ol.source.StamenFlavor={TERRAIN_BACKGROUND:"background",TERRAIN_LABELS:"labels",TERRAIN_LINES:"lines",TONER_2010:"2010",TONER_2011:"2011",TONER_2011_LABELS:"2011-labels",TONER_2011_LINES:"2011-lines",TONER_2011_LITE:"2011-lite",TONER_BACKGROUND:"background",TONER_HYBRID:"hybrid",TONER_LABELS:"labels",TONER_LINES:"lines",TONER_LITE:"lite"};ol.source.StamenProvider={TERRAIN:"terrain",TONER:"toner",WATERCOLOR:"watercolor"};ol.source.StamenProviderConfig={};
-ol.source.StamenProviderConfig[ol.source.StamenProvider.TERRAIN]={type:"jpg",minZoom:4,maxZoom:18};ol.source.StamenProviderConfig[ol.source.StamenProvider.TONER]={type:"png",minZoom:0,maxZoom:20};ol.source.StamenProviderConfig[ol.source.StamenProvider.WATERCOLOR]={type:"jpg",minZoom:3,maxZoom:16};
-ol.source.Stamen=function(a){var b=new ol.Attribution('Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA.'),c=a.provider;goog.isDef(a.flavor)&&(c+="-"+a.flavor);a=ol.source.StamenProviderConfig[a.provider];ol.source.XYZ.call(this,{attributions:[b],maxZoom:a.maxZoom,opaque:!1,url:"http://{a-d}.tile.stamen.com/"+
-c+"/{z}/{x}/{y}."+a.type})};goog.inherits(ol.source.Stamen,ol.source.XYZ);ol.source.StaticImage=function(a){var b=ol.source.StaticImage.createImageFunction(a.url),c=a.imageExtent,d=a.imageSize,e=c.getHeight()/d.height,f=goog.isDef(a.projection)?a.projection:null;ol.source.ImageSource.call(this,{attributions:a.attributions,crossOrigin:a.crossOrigin,extent:a.extent,projection:a.projection,imageUrlFunction:b,resolutions:[e]});this.image_=this.createImage(c,e,d,f)};goog.inherits(ol.source.StaticImage,ol.source.ImageSource);
+goog.inherits(ol.source.MapQuestOpenAerial,ol.source.XYZ);ol.source.OpenStreetMap=function(){var a=new ol.Attribution('© OpenStreetMap contributors, CC BY-SA');ol.source.XYZ.call(this,{attributions:[a],opaque:!0,maxZoom:18,url:"http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png"})};goog.inherits(ol.source.OpenStreetMap,ol.source.XYZ);ol.source.SingleImageWMS=function(a){var b=goog.isDef(a.url)?ol.ImageUrlFunction.createWMSParams(a.url,a.params):ol.ImageUrlFunction.nullImageUrlFunction;ol.source.ImageSource.call(this,{attributions:a.attributions,crossOrigin:a.crossOrigin,extent:a.extent,projection:a.projection,resolutions:a.resolutions,imageUrlFunction:b});this.image_=null;this.ratio_=1.5};goog.inherits(ol.source.SingleImageWMS,ol.source.ImageSource);
+ol.source.SingleImageWMS.prototype.getImage=function(a,b,c){var b=this.findNearestResolution(b),d=this.image_;if(!goog.isNull(d)&&d.getResolution()==b&&d.getExtent().containsExtent(a))return d;a=new ol.Extent(a.minX,a.minY,a.maxX,a.maxY);a.scaleFromCenter(this.ratio_);var d=a.getWidth()/b,e=a.getHeight()/b,d=new ol.Size(d,e);return this.image_=this.createImage(a,b,d,c)};ol.source.StamenLayerConfig={terrain:{extension:"jpg",opaque:!0},"terrain-background":{extension:"jpg",opaque:!0},"terrain-labels":{extension:"png",opaque:!1},"terrain-lines":{extension:"png",opaque:!1},"toner-background":{extension:"png",opaque:!0},toner:{extension:"png",opaque:!0},"toner-hybrid":{extension:"png",opaque:!1},"toner-labels":{extension:"png",opaque:!1},"toner-lines":{extension:"png",opaque:!1},"toner-lite":{extension:"png",opaque:!0},watercolor:{extension:"jpg",opaque:!0}};
+ol.source.StamenProviderConfig={terrain:{minZoom:4,maxZoom:18},toner:{minZoom:0,maxZoom:20},watercolor:{minZoom:3,maxZoom:16}};
+ol.source.Stamen=function(a){var b=new ol.Attribution('Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA.'),c=a.layer.indexOf("-"),c=-1==c?a.layer:a.layer.slice(0,c);goog.asserts.assert(c in ol.source.StamenProviderConfig);c=ol.source.StamenProviderConfig[c];goog.asserts.assert(a.layer in
+ol.source.StamenLayerConfig);var d=ol.source.StamenLayerConfig[a.layer],a=goog.isDef(a.url)?a.url:"http://{a-d}.tile.stamen.com/"+a.layer+"/{z}/{x}/{y}."+d.extension;ol.source.XYZ.call(this,{attributions:[b],maxZoom:c.maxZoom,opaque:d.opaque,url:a})};goog.inherits(ol.source.Stamen,ol.source.XYZ);ol.source.StaticImage=function(a){var b=ol.source.StaticImage.createImageFunction(a.url),c=a.imageExtent,d=a.imageSize,e=c.getHeight()/d.height,f=goog.isDef(a.projection)?a.projection:null;ol.source.ImageSource.call(this,{attributions:a.attributions,crossOrigin:a.crossOrigin,extent:a.extent,projection:a.projection,imageUrlFunction:b,resolutions:[e]});this.image_=this.createImage(c,e,d,f)};goog.inherits(ol.source.StaticImage,ol.source.ImageSource);
ol.source.StaticImage.prototype.getImage=function(a){return a.intersects(this.image_.getExtent())?this.image_:null};ol.source.StaticImage.createImageFunction=function(a){return function(){return a}};ol.tilejson={};ol.tilejson.grids_=[];var grid=function(a){ol.tilejson.grids_.push(a)};goog.exportSymbol("grid",grid);ol.source.TileJSON=function(a){ol.source.ImageTileSource.call(this,{projection:ol.projection.getFromCode("EPSG:3857")});this.ready_=!1;this.deferred_=goog.net.jsloader.load(a.uri,{cleanupWhenDone:!0});this.deferred_.addCallback(this.handleTileJSONResponse,this)};goog.inherits(ol.source.TileJSON,ol.source.ImageTileSource);
ol.source.TileJSON.prototype.handleTileJSONResponse=function(){var a=ol.tilejson.grids_.pop(),b=ol.projection.getFromCode("EPSG:4326"),c,d;goog.isDef(a.bounds)?(c=a.bounds,c=new ol.Extent(c[0],c[1],c[2],c[3]),d=c.transform(ol.projection.getTransform(b,this.getProjection())),this.setExtent(d)):d=c=null;goog.isDef(a.scheme);goog.isDef(a.scheme)&&goog.asserts.assert("xyz"==a.scheme);var e=a.minzoom||0;goog.asserts.assert(0===e);var f=a.maxzoom||22,g=new ol.tilegrid.XYZ({maxZoom:f});this.tileGrid=g;this.tileUrlFunction=
ol.TileUrlFunction.withTileCoordTransform(function(a){if(a.z'),new re('Data © OpenStreetMap contributors, CC BY-SA')],X:i,maxZoom:28,url:"http://otile{1-4}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg"})}B(si,ri);
-function ti(){ri.call(this,{attributions:[new re('Tiles Courtesy of MapQuest '),new re("Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency")],maxZoom:18,X:i,url:"http://oatile{1-4}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg"})}B(ti,ri);function ui(){ri.call(this,{attributions:[new re('© OpenStreetMap contributors, CC BY-SA')],X:i,maxZoom:18,url:"http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png"})}B(ui,ri);function vi(a){Ag.call(this,{attributions:a.attributions,crossOrigin:a.crossOrigin,extent:a.extent,projection:a.projection,resolutions:a.resolutions,Fa:x(a.url)?yg(a.url,a.params,a.version):zg});this.b=k;this.f=1.5}B(vi,Ag);
-vi.prototype.I=function(a,b,c){this.a===k||(b=this.a[nf(this.a,b)]);var d=this.b,e;if(e=d!==k)if(e=d.e==b)e=d.H(),e=e.h<=a.h&&a.m<=e.m&&e.i<=a.i&&a.k<=e.k;if(e)return d;var d=a=new Zd(a.h,a.i,a.m,a.k),f=this.f;e=d.da()/2*(f-1);f=d.$()/2*(f-1);d.h-=e;d.i-=f;d.m+=e;d.k+=f;return this.b=Bg(this,a,b,new Wd(a.da()/b,a.$()/b),c)};var wi={ve:"background",we:"labels",xe:"lines",ze:"2010",Ae:"2011",Be:"2011-labels",Ce:"2011-lines",De:"2011-lite",Ee:"background",Fe:"hybrid",Ge:"labels",He:"lines",Ie:"lite"},xi={ue:"terrain",ye:"toner",Qe:"watercolor"},yi={terrain:{type:"jpg",sc:4,maxZoom:18},toner:{type:"png",sc:0,maxZoom:20},watercolor:{type:"jpg",sc:3,maxZoom:16}};
-function zi(a){var b=new re('Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA.'),c=a.provider;x(a.flavor)&&(c+="-"+a.flavor);a=yi[a.provider];ri.call(this,{attributions:[b],maxZoom:a.maxZoom,X:l,url:"http://{a-d}.tile.stamen.com/"+c+"/{z}/{x}/{y}."+a.type})}B(zi,ri);function Ai(a){var b=a.imageExtent,c=a.imageSize,d=b.$()/c.height,e=x(a.projection)?a.projection:k,f=a.url;Ag.call(this,{attributions:a.attributions,crossOrigin:a.crossOrigin,extent:a.extent,projection:a.projection,Fa:function(){return f},resolutions:[d]});this.b=Bg(this,b,d,c,e)}B(Ai,Ag);Ai.prototype.I=function(a){return Yd(a,this.b.H())?this.b:k};var Bi=[];A("grid",function(a){Bi.push(a)});function Ci(a){mi.call(this,{projection:Me("EPSG:3857")});this.g=l;a=this.t=Xh(a.uri,{cc:i});a.a.push([this.A,k,this]);a.ia&&Th(a)}B(Ci,mi);
-Ci.prototype.A=function(){var a=Bi.pop(),b=Me("EPSG:4326"),c,d;x(a.bounds)?(c=a.bounds,c=new Zd(c[0],c[1],c[2],c[3]),this.l=d=c.transform(Ce(b,this.j))):d=c=k;var e=a.minzoom||0,f=a.maxzoom||22,g=new ni({maxZoom:f});this.tileGrid=g;this.ca=ji(function(a){if(a.n'),new se('Data © OpenStreetMap contributors, CC BY-SA')],opaque:i,maxZoom:28,url:"http://otile{1-4}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg"})}B(wi,vi);
+function xi(){vi.call(this,{attributions:[new se('Tiles Courtesy of MapQuest '),new se("Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency")],maxZoom:18,opaque:i,url:"http://oatile{1-4}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg"})}B(xi,vi);function yi(){vi.call(this,{attributions:[new se('© OpenStreetMap contributors, CC BY-SA')],opaque:i,maxZoom:18,url:"http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png"})}B(yi,vi);function zi(a){Eg.call(this,{attributions:a.attributions,crossOrigin:a.crossOrigin,extent:a.extent,projection:a.projection,resolutions:a.resolutions,Ga:x(a.url)?Cg(a.url,a.params):Dg});this.b=k;this.f=1.5}B(zi,Eg);
+zi.prototype.I=function(a,b,c){this.a===k||(b=this.a[pf(this.a,b)]);var d=this.b,e;if(e=d!==k)if(e=d.e==b)e=d.H(),e=e.i<=a.i&&a.l<=e.l&&e.j<=a.j&&a.k<=e.k;if(e)return d;var d=a=new $d(a.i,a.j,a.l,a.k),f=this.f;e=d.ea()/2*(f-1);f=d.aa()/2*(f-1);d.i-=e;d.j-=f;d.l+=e;d.k+=f;return this.b=Fg(this,a,b,new Xd(a.ea()/b,a.aa()/b),c)};var Ai={terrain:{T:"jpg",opaque:i},"terrain-background":{T:"jpg",opaque:i},"terrain-labels":{T:"png",opaque:l},"terrain-lines":{T:"png",opaque:l},"toner-background":{T:"png",opaque:i},toner:{T:"png",opaque:i},"toner-hybrid":{T:"png",opaque:l},"toner-labels":{T:"png",opaque:l},"toner-lines":{T:"png",opaque:l},"toner-lite":{T:"png",opaque:i},watercolor:{T:"jpg",opaque:i}},Bi={terrain:{minZoom:4,maxZoom:18},toner:{minZoom:0,maxZoom:20},watercolor:{minZoom:3,maxZoom:16}};
+function Ci(a){var b=new se('Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA.'),c=a.layer.indexOf("-"),c=-1==c?a.layer:a.layer.slice(0,c),d=Ai[a.layer];vi.call(this,{attributions:[b],maxZoom:Bi[c].maxZoom,opaque:d.opaque,url:x(a.url)?a.url:"http://{a-d}.tile.stamen.com/"+a.layer+
+"/{z}/{x}/{y}."+d.T})}B(Ci,vi);function Di(a){var b=a.imageExtent,c=a.imageSize,d=b.aa()/c.height,e=x(a.projection)?a.projection:k,f=a.url;Eg.call(this,{attributions:a.attributions,crossOrigin:a.crossOrigin,extent:a.extent,projection:a.projection,Ga:function(){return f},resolutions:[d]});this.b=Fg(this,b,d,c,e)}B(Di,Eg);Di.prototype.I=function(a){return Zd(a,this.b.H())?this.b:k};var Ei=[];A("grid",function(a){Ei.push(a)});function Fi(a){qi.call(this,{projection:Ne("EPSG:3857")});this.g=l;a=this.t=ai(a.uri,{cc:i});a.a.push([this.w,k,this]);a.ja&&Xh(a)}B(Fi,qi);
+Fi.prototype.w=function(){var a=Ei.pop(),b=Ne("EPSG:4326"),c,d;x(a.bounds)?(c=a.bounds,c=new $d(c[0],c[1],c[2],c[3]),this.h=d=c.transform(De(b,this.o))):d=c=k;var e=a.minzoom||0,f=a.maxzoom||22,g=new ri({maxZoom:f});this.tileGrid=g;this.da=ni(function(a){if(a.m
+
+
+
+
+
diff --git a/master/examples/stamen.js b/master/examples/stamen.js
new file mode 100644
index 0000000000..3c947baf84
--- /dev/null
+++ b/master/examples/stamen.js
@@ -0,0 +1,31 @@
+goog.require('ol.Collection');
+goog.require('ol.Coordinate');
+goog.require('ol.Map');
+goog.require('ol.RendererHints');
+goog.require('ol.View2D');
+goog.require('ol.layer.TileLayer');
+goog.require('ol.source.Stamen');
+
+
+var layers = new ol.Collection([
+ new ol.layer.TileLayer({
+ source: new ol.source.Stamen({
+ layer: 'watercolor'
+ })
+ }),
+ new ol.layer.TileLayer({
+ source: new ol.source.Stamen({
+ layer: 'terrain-labels'
+ })
+ })
+]);
+var map = new ol.Map({
+ layers: layers,
+ renderers: ol.RendererHints.createFromQueryData(),
+ scaleLineControl: true,
+ target: 'map',
+ view: new ol.View2D({
+ center: new ol.Coordinate(0, 0),
+ zoom: 3
+ })
+});
diff --git a/master/examples/wms-custom-proj.js b/master/examples/wms-custom-proj.js
index 19d03ca493..6aae577534 100644
--- a/master/examples/wms-custom-proj.js
+++ b/master/examples/wms-custom-proj.js
@@ -19,19 +19,6 @@ var epsg21781 = new ol.Projection('EPSG:21781', ol.ProjectionUnits.METERS,
new ol.Extent(485869.5728, 76443.1884, 837076.5648, 299941.7864));
ol.projection.addProjection(epsg21781);
-// We could give the single image source a set of resolutions. This prevents the
-// source from requesting images of arbitrary resolutions. To try it, uncomment
-// the block below and the resolutions option in the SingleImageWMS config.
-/*
-var projectionExtent = epsg21781.getExtent();
-var maxResolution = Math.max(projectionExtent.getWidth(),
- projectionExtent.getHeight()) / 256;
-var resolutions = new Array(10);
-for (var i = 0; i < 10; ++i) {
- resolutions[i] = maxResolution / Math.pow(2.0, i);
-}
-*/
-
var extent = new ol.Extent(420000, 30000, 900000, 350000);
var layers = new ol.Collection([
new ol.layer.TileLayer({
@@ -50,7 +37,6 @@ var layers = new ol.Collection([
}),
new ol.layer.ImageLayer({
source: new ol.source.SingleImageWMS({
- //resolutions: resolutions,
url: 'http://wms.geo.admin.ch/',
attributions: [new ol.Attribution(
'© ' +
+
+ Stamen example
+Example of a Stamen tile source.
+
+
+ See the + stamen.js source + to see how this is done.
+