Commit Graph

476 Commits

Author SHA1 Message Date
Bruno Binet 54dfca3419 Move factorizable code in ol.TileUrlFunction.expandUrl 2013-03-13 16:48:22 +01:00
Bruno Binet 86c05b4d21 Be more consistent with useTile abstract method 2013-03-12 17:58:29 +01:00
ahocevar fad036aa53 Merge branch 'master' of github.com:openlayers/ol3 into vector
Conflicts:
	src/objectliterals.exports
2013-03-12 08:39:16 +01:00
Bruno Binet 837aa7512b Merge pull request #342 from bbinet/wmts
Add WMTS support.
2013-03-11 08:05:25 -07:00
ahocevar a66f26f839 Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-03-11 15:21:01 +01:00
Tom Payne 58f1c929ac Merge pull request #324 from twpayne/fix-canvas-renderer-clear
Canvas renderer is not properly cleared
2013-03-11 05:08:54 -07:00
Bruno Binet 9e370bf6af Implement ol.source.WMTS.optionsFromCapabilities
and remove related ol.source.WMTS.createFromCapabilities function.
2013-03-11 12:42:14 +01:00
Bruno Binet c67e67ee12 Single tileUrlFunction in createFromTileUrlFunctions
In that case, simply return the single tileUrlFunction.
2013-03-11 11:29:40 +01:00
Bruno Binet 13d0b36a08 Add a ol.source.WMTS.createFromCapabilities function
so that we can create a wmts source directly from a getCapabilities response
(parsed by the wmts parser)
2013-03-11 10:42:37 +01:00
Bruno Binet 877ce3adcf Add a WMTS source 2013-03-11 10:42:37 +01:00
Éric Lemoine 56f86ae512 Fix SingleImageWMS exports/externs 2013-03-11 08:31:32 +01:00
Éric Lemoine cee2725afd Fix Stamen exports/externs 2013-03-11 08:31:32 +01:00
Éric Lemoine 0459733883 Fix StaticImage exports/externs 2013-03-11 08:31:32 +01:00
Éric Lemoine f1949191b1 Fix TiledWMS exports/externs 2013-03-11 08:31:31 +01:00
Éric Lemoine 8121fda6fb Fix TileJSON exports/externs 2013-03-11 08:31:03 +01:00
Éric Lemoine 5ad6ca3aa1 Fix BingMaps exports/externs 2013-03-11 08:31:03 +01:00
Tom Payne b729f969a7 Add EMPTY tile state instead of using null for empty tiles 2013-03-08 14:41:14 +01:00
Tim Schaub 4422e3e73b Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-03-07 23:10:06 -07:00
Tom Payne 1deeaa437c Merge pull request #272 from twpayne/projection-get
allow people to specify projection as a string
2013-03-07 04:59:00 -08:00
Tom Payne 21d34f1cc8 Rename projection functions for a friendlier API
The following functions are renamed:

getTransform -> getTransformForProjections
getTransformFromCodes -> getTransform
transform -> transformWithProjections
transformWithCodes -> transform

With this change, the faster functions that avoid projection look-up
have longer names and are used internally, whereas the slower but
friendlier short name functions are available for users.
2013-03-07 13:39:40 +01:00
Éric Lemoine b487275d5b Round image height and width for WMS 2013-03-07 13:37:48 +01:00
Tom Payne eaa17758bd Allow strings to be used wherever projections are needed 2013-03-07 13:29:40 +01:00
Tom Payne afcbec469a Rename ol.projection.getFromCode to ol.projection.get 2013-03-07 13:29:39 +01:00
Bruno Binet 41408c0909 Extent cannot be undefined here but it can be null
so we now use !goog.isNull(extent) instead of goog.isDef(extent)
2013-03-07 10:54:06 +01:00
Bruno Binet 48c84aaf69 Do not wrap dateline if projection.isGlobal() is false 2013-03-07 02:07:00 +01:00
Tom Payne e027f9771e Use a single, shared attribution for Stamen sources
This ensures that the attribution only appears once, even if multiple
Stamen layers are used in the same map.
2013-03-06 17:53:33 +01:00
ahocevar c1f3a6cc54 WMS GetMap request parameters shall be params
To avoid surprises, we configure everything that is a WMS GetMap
request parameter in the params object, and not as direct
configuration option. This affects the VERSION and TRANSPARENT
params.
2013-03-06 02:20:09 +01:00
ahocevar a912d48b59 Do not use tiledWMSOptions in closure function
See #269.
2013-03-06 02:20:09 +01:00
Tom Payne 78780fa095 Correct Stamen source 2013-03-06 02:20:07 +01:00
Tim Schaub e1c3faa53e Vector related exports 2013-03-05 18:13:10 +01:00
Tim Schaub 12bee3178e Moving the feature management to the layer
The source will be responsible for fetching vector data.
2013-03-05 12:46:55 +01:00
Tom Payne 68919b5ee3 Merge pull request #267 from twpayne/stamen-fixes
Stamen fixes
2013-03-05 02:14:21 -08:00
Tim Schaub 54d8d45fc9 Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-03-05 10:58:27 +01:00
ahocevar 4bb521db65 WMS GetMap request parameters shall be params
To avoid surprises, we configure everything that is a WMS GetMap
request parameter in the params object, and not as direct
configuration option. This affects the VERSION and TRANSPARENT
params.
2013-03-05 10:54:33 +01:00
ahocevar 2676050d54 Do not use tiledWMSOptions in closure function
See #269.
2013-03-05 10:50:46 +01:00
Tom Payne 6d6188ea79 Correct Stamen source 2013-03-05 10:05:22 +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
Tim Schaub c29fabebef Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-03-04 21:06:13 +01:00
Tim Schaub 0b05432faa Vector source isn't a tile source 2013-03-04 18:43:46 +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
Tim Schaub 5a73529da5 Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-03-03 15:52:40 +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
Tim Schaub 93ab45432b Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-03-03 09:46:11 +01:00