Commit Graph

65 Commits

Author SHA1 Message Date
ahocevar
2676050d54 Do not use tiledWMSOptions in closure function
See #269.
2013-03-05 10:50:46 +01:00
ahocevar
19aeb04141 Fixing extent check for undefined extents.
Thanks @marcjansen for spotting this. To make the epsg-4326
example work, I also had to change the WMS version to 1.1.1.
2013-03-05 09:47:52 +01:00
ahocevar
66b790294d Merge branch 'master' of github.com:openlayers/ol3 into wms-improvements
Conflicts:
	src/ol/source/tiledwmssource.js
	test/spec/ol/tileurlfunction.test.js
2013-03-05 00:55:52 +01:00
ahocevar
586f393492 Support tile sources without configured projection
This change adds a lot of flexibility to working with tile
layers: Sources where the server projection or tile grid do not
matter can now be constructed without specifying a projection or
tile grid.

The tileUrlFunction/imageUrlFunction now also creates updated
URLs when the params of the layer change, so things like
mergeNewParams in ol2 will be possible.

A nice side effect of this whole change is that there is no more
duplicated code between tiled and single image WMS layers.

While I was at it, I also fixed a WMS 1.1.1 axis order issue
and incorrect STYLES params (STYLES=& instead of STYLES&).
2013-03-05 00:46:58 +01:00
Tom Payne
1bac674eca Merge pull request #263 from twpayne/canvas-renderer-optimizations
Canvas renderer optimizations
2013-03-04 15:21:38 -08:00
Tom Payne
fb668a7fc6 Add opaque flag to ol.source.TileSource 2013-03-04 21:07:17 +01:00
Frederic Junod
eec1aec0e6 Remove ol.BingMapsStyle 2013-03-04 15:14:22 +01:00
Bruno Binet
2816e3256c Add support for multiple tileSizes in the tilegrid.
This is needed by WMTS.
2013-03-03 20:43:46 +01:00
Tom Payne
fcc620af7d Separate ol.projection module from ol.Projection class 2013-03-03 13:09:13 +01:00
Tom Payne
17bd715495 Cope with axis orientation in single image WMS sources 2013-03-03 12:22:24 +01:00
Tom Payne
66e5b1d736 Cope with axis orientation for tiled WMS sources 2013-03-03 12:22:24 +01:00
Tom Payne
6ce3ebba5b Merge pull request #226 from twpayne/preserve-low-resolution-tiles
Preserve low resolution tiles
2013-02-22 02:14:41 -08:00
Tom Payne
c36de098bd Avoid creating a TileCoord object when marking used tiles 2013-02-21 16:52:52 +01:00
Tom Payne
4c9b70fa5c Move useLowResolutionTiles from layer renderer to tile source 2013-02-21 16:47:10 +01:00
Tom Payne
b139757987 Merge pull request #224 from twpayne/jslint-clean-ups
Satisfy JSLint
2013-02-21 07:23:56 -08:00
Tom Payne
57b446fa0a Implement useTile for image tile sources with caches 2013-02-21 16:14:15 +01:00
Tom Payne
e68c1adbae Add ol.source.TileSource.useTile 2013-02-21 16:13:34 +01:00
Tom Payne
fabcb313f1 Satisfy JSLint
JSLint complains about functions being declared in blocks.
2013-02-21 15:13:33 +01:00
Éric Lemoine
68844007b8 Add missing goog.require's 2013-02-20 11:53:54 +01:00
Tim Schaub
80dc7b5bf7 Accept custom isLoaded method in findLoadedTiles method 2013-02-19 12:13:58 -07:00
Tim Schaub
b061e23606 Merge branch 'master' of github.com:openlayers/ol3 into interim-tiles 2013-02-19 08:59:23 -07:00
Éric Lemoine
f540dd8689 Image layer renderers add attributions to frame state 2013-02-19 15:19:44 +01:00
Tim Schaub
6aa4e99fe5 Fix return from findLoadedTiles
Previously, the findInterimTiles method was returning undefined if the min x/y coord for a tile range was already in the lookup.  The return says it indicates whether all tiles for the given z are loaded.  This change corrects the return.

This change also reveals a misunderstanding of the tile range returned by `getTileRangeForExtentAndZ`.  The previous findInterimTiles method was treating max values as inclusive.  This is intuitive.  It looks like the method returns a range where max values are exclusive.
2013-02-18 14:51:39 -07:00
Tim Schaub
ddf993f0c9 Factor out common code and test
The findInterimTiles method was used in three renderers.  This change makes it available on the tile source and adds some basic tests.
2013-02-18 14:18:08 -07:00
Éric Lemoine
1e4229497d Do not sort resolutions array
We assert that the resolutions array is sorted instead of sorting it ourselves. This is to consistent with ol.TileGrid.
2013-02-15 17:52:06 +01:00
Éric Lemoine
e1505abe0d Rename ol.Rectangle scale to scaleFromCenter 2013-02-15 17:43:27 +01:00
Éric Lemoine
8ae25684f9 Add ol.source.StaticImage 2013-02-14 23:36:36 +01:00
Éric Lemoine
62b10cf878 Add ol.source.SingleImageWMS 2013-02-14 23:36:36 +01:00
Tom Payne
5a0adf2345 Add ol.source.ImageSource 2013-02-14 23:36:36 +01:00
Tom Payne
e6eb401e36 Add missing goog.requires 2013-01-30 23:47:13 +01:00
Tom Payne
b6f856f962 Remove unused goog.requires 2013-01-30 22:48:03 +01:00
Tom Payne
ace0728e8a Merge pull request #151 from twpayne/tile-cache-expiry
Tile cache expiry
2013-01-24 07:24:33 -08:00
Éric Lemoine
d04b2bb2bd Fix typo 2013-01-24 10:28:28 +01:00
Tom Payne
0f3d708525 Use ol.TileCache in ol.source.DebugTileSource 2013-01-23 17:22:01 +01:00
Tom Payne
09ec444958 Use ol.TileCache in ol.source.ImageTileSource 2013-01-23 17:22:01 +01:00
Tom Payne
b770aaa2f5 Add tile cache expiry infrastructure 2013-01-23 14:31:24 +01:00
Tom Payne
386bb636bb Add missing dependencies on goog.array 2013-01-21 14:20:11 +01:00
Tom Payne
bff8a2bb1e Add DebugTileSource exports 2013-01-18 01:16:14 +01:00
Tom Payne
76e600d5f6 Fix Stamen exports 2013-01-18 00:19:06 +01:00
Tom Payne
04b18a8a83 Merge pull request #121 from twpayne/attribution-control-refactoring
Attribution control refactoring
2013-01-17 04:46:57 -08:00
Tom Payne
9fbabc3696 Refactor attribution control 2013-01-16 16:34:31 +01:00
ahocevar
87ce763ccb Use validity extent to generate default resolutions
Previously, the TiledWMS source generated a resolutions array
derived from the world extent in meters, to match the default
Web Mercator resolutions of the map. This wouldn't work for
projections with distance units different than meters. It is
better to commit to a default resolutions array where zoom level
0 is the validity extent of the projection (not the Web Mercator
world extent!) at a 256 pixel tile size.
2013-01-14 16:10:55 +01:00
Tom Payne
b4da378a33 Don't attempt to share canvases between renderers, fixes #101 2013-01-11 17:43:31 +01:00
Tom Payne
6984fbb9b9 Add ol.source.DebugTileSource 2013-01-11 01:18:57 +01:00
Tom Payne
97d83666a6 Factor out ImageTile and ImageTileSource 2013-01-11 01:18:57 +01:00
Tom Payne
7ad273082a Correct Stamen source options 2013-01-05 18:35:14 +01:00
Éric Lemoine
dd014a3b79 Avoid unneeded parameter concatenations (thanks @twpayne, refs #85) 2012-11-04 19:31:20 +01:00
Éric Lemoine
529c3e8b6a Add ol.TileUrlFunction.createBboxParam 2012-11-03 22:55:54 +01:00
ahocevar
eb4a8683e2 Projection handling improvements
* The Map's private createProjection_ method is now a public
  method of the Projection. It is also used by TiledWMSSource
  to calculate the appropriate projection from the user
  configuration.
* ol.Projection.addProjection now adds the transformation for
  the source == target case. This makes it easy for the user
  to create custom projection maps without including proj4js and
  without adding a custom transformation, as long as the
  userProjection equals the projection.
* The TiledWMSSource now uses the same default resolutions as
  the map (i.e. the OSM resolutions)
* The modulo calculation for wrapping extents now works for all
  grid configurations, by not calculating the number of columns
  based on an assumption about the way the zoom levels relate to
  resolutions.
* The wms-custom-proj example now shows how to properly
  configure a custom resolution, i.e. by using the validity
  extent of the projection as its extent.
2012-10-31 13:17:58 +01:00
ahocevar
e157d17ab7 Addressing review comments regarding typeDef 2012-10-29 09:44:25 +01:00