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

Merge remote-tracking branch 'upstream/master' into vector-api

Browse Source 
Conflicts:
	src/objectliterals.jsdoc
	src/ol/attribution.js
	src/ol/geom/geometry.js
	src/ol/geom/geometrycollection.js
	src/ol/geom/linestring.js
	src/ol/layer/vectorlayer.exports
	src/ol/layer/vectorlayer.js
	src/ol/map.js
	src/ol/proj/proj.js
	src/ol/renderer/canvas/canvasvectorlayerrenderer.js
	src/ol/source/imagewmssource.js
	src/ol/source/tilewmssource.js
	src/ol/source/vectorsource.exports
	src/ol/source/vectorsource.js
	src/ol/source/wmssource.js
	src/ol/style/style.js
	src/ol/tilegrid/tilegrid.js
	src/ol/tilegrid/wmtstilegrid.js
	src/ol/tilegrid/xyztilegrid.js
This commit is contained in:
Éric Lemoine
2013-12-13 12:46:55 +01:00
parent cbc71686df 93e605b119
commit 35d5158454
167 changed files with 678 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/tilegrid/tilegrid.exports
+1 -1
View File
@@ -1,4 +1,4 @@
@exportClass ol.tilegrid.TileGrid ol.tilegrid.TileGridOptions
@exportSymbol ol.tilegrid.TileGrid
@exportProperty ol.tilegrid.TileGrid.prototype.getMinZoom
@exportProperty ol.tilegrid.TileGrid.prototype.getOrigin
@exportProperty ol.tilegrid.TileGrid.prototype.getResolutions
src/ol/tilegrid/tilegrid.js
+1 -1
View File
@@ -27,7 +27,7 @@ ol.DEFAULT_MAX_ZOOM = 42;
/**
* @constructor
* @param {ol.tilegrid.TileGridOptions} options Tile grid options.
* @param {olx.tilegrid.TileGridOptions} options Tile grid options.
* @struct
* @todo stability experimental
*/
src/ol/tilegrid/wmtstilegrid.exports
+1 -1
View File
@@ -1,2 +1,2 @@
@exportClass ol.tilegrid.WMTS ol.tilegrid.WMTSOptions
@exportSymbol ol.tilegrid.WMTS
@exportProperty ol.tilegrid.WMTS.prototype.getMatrixIds
src/ol/tilegrid/wmtstilegrid.js
+1 -1
View File
@@ -10,7 +10,7 @@ goog.require('ol.tilegrid.TileGrid');
/**
* @constructor
* @extends {ol.tilegrid.TileGrid}
* @param {ol.tilegrid.WMTSOptions} options WMTS options.
* @param {olx.tilegrid.WMTSOptions} options WMTS options.
* @struct
* @todo stability experimental
*/
src/ol/tilegrid/xyztilegrid.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.tilegrid.XYZ ol.tilegrid.XYZOptions
@exportSymbol ol.tilegrid.XYZ
src/ol/tilegrid/xyztilegrid.js
+1 -1
View File
@@ -12,7 +12,7 @@ goog.require('ol.tilegrid.TileGrid');
/**
* @constructor
* @extends {ol.tilegrid.TileGrid}
* @param {ol.tilegrid.XYZOptions} options XYZ options.
* @param {olx.tilegrid.XYZOptions} options XYZ options.
* @struct
* @todo stability experimental
*/