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/animation.exports
+4 -4
View File
@@ -1,4 +1,4 @@
@exportFunction ol.animation.bounce ol.animation.BounceOptions ol.PreRenderFunction
@exportFunction ol.animation.pan ol.animation.PanOptions ol.PreRenderFunction
@exportFunction ol.animation.rotate ol.animation.RotateOptions ol.PreRenderFunction
@exportFunction ol.animation.zoom ol.animation.ZoomOptions ol.PreRenderFunction
@exportSymbol ol.animation.bounce ol.animation.bounce
@exportSymbol ol.animation.pan ol.animation.pan
@exportSymbol ol.animation.rotate ol.animation.rotate
@exportSymbol ol.animation.zoom ol.animation.zoom
src/ol/animation.js
+4 -4
View File
@@ -8,7 +8,7 @@ goog.require('ol.easing');
/**
* @param {ol.animation.BounceOptions} options Bounce options.
* @param {olx.animation.BounceOptions} options Bounce options.
* @return {ol.PreRenderFunction} Pre-render function.
* @todo stability experimental
*/
@@ -43,7 +43,7 @@ ol.animation.bounce = function(options) {
/**
* @param {ol.animation.PanOptions} options Pan options.
* @param {olx.animation.PanOptions} options Pan options.
* @return {ol.PreRenderFunction} Pre-render function.
* @todo stability experimental
*/
@@ -82,7 +82,7 @@ ol.animation.pan = function(options) {
/**
* @param {ol.animation.RotateOptions} options Rotate options.
* @param {olx.animation.RotateOptions} options Rotate options.
* @return {ol.PreRenderFunction} Pre-render function.
* @todo stability experimental
*/
@@ -119,7 +119,7 @@ ol.animation.rotate = function(options) {
/**
* @param {ol.animation.ZoomOptions} options Zoom options.
* @param {olx.animation.ZoomOptions} options Zoom options.
* @return {ol.PreRenderFunction} Pre-render function.
* @todo stability experimental
*/
src/ol/attribution.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.Attribution ol.AttributionOptions
@exportSymbol ol.Attribution
src/ol/attribution.js
+1 -1
View File
@@ -20,7 +20,7 @@ goog.require('ol.TileRange');
* ..
*
* @constructor
* @param {ol.AttributionOptions} options Attribution options.
* @param {olx.AttributionOptions} options Attribution options.
* @struct
* @todo stability experimental
*/
src/ol/control/attributioncontrol.exports
+1 -1
View File
@@ -1,2 +1,2 @@
@exportClass ol.control.Attribution ol.control.AttributionOptions
@exportSymbol ol.control.Attribution
@exportProperty ol.control.Attribution.prototype.setMap
src/ol/control/attributioncontrol.js
+1 -1
View File
@@ -21,7 +21,7 @@ goog.require('ol.css');
* be changed by using a css selector for `.ol-attribution`.
* @constructor
* @extends {ol.control.Control}
* @param {ol.control.AttributionOptions=} opt_options Attribution options.
* @param {olx.control.AttributionOptions=} opt_options Attribution options.
* @todo stability experimental
*/
ol.control.Attribution = function(opt_options) {
src/ol/control/control.exports
+1 -1
View File
@@ -1,3 +1,3 @@
@exportClass ol.control.Control ol.control.ControlOptions
@exportSymbol ol.control.Control
@exportProperty ol.control.Control.prototype.getMap
@exportProperty ol.control.Control.prototype.setMap
src/ol/control/control.js
+1 -1
View File
@@ -15,7 +15,7 @@ goog.require('ol.Object');
* @constructor
* @extends {ol.Object}
* @implements {oli.control.Control}
* @param {ol.control.ControlOptions} options Control options.
* @param {olx.control.ControlOptions} options Control options.
* @todo stability experimental
*/
ol.control.Control = function(options) {
src/ol/control/controldefaults.exports
+1 -1
View File
@@ -1 +1 @@
@exportFunction ol.control.defaults ol.control.DefaultsOptions ol.Collection
@exportSymbol ol.control.defaults ol.control.defaults
src/ol/control/controldefaults.js
+1 -1
View File
@@ -7,7 +7,7 @@ goog.require('ol.control.Zoom');
/**
* @param {ol.control.DefaultsOptions=} opt_options Defaults options.
* @param {olx.control.DefaultsOptions=} opt_options Defaults options.
* @return {ol.Collection} Controls.
* @todo stability experimental
*/
src/ol/control/fullscreencontrol.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.control.FullScreen ol.control.FullScreenOptions
@exportSymbol ol.control.FullScreen
src/ol/control/fullscreencontrol.js
+1 -1
View File
@@ -22,7 +22,7 @@ goog.require('ol.css');
*
* @constructor
* @extends {ol.control.Control}
* @param {ol.control.FullScreenOptions=} opt_options Options.
* @param {olx.control.FullScreenOptions=} opt_options Options.
* @todo stability experimental
*/
ol.control.FullScreen = function(opt_options) {
src/ol/control/logocontrol.exports
+1 -1
View File
@@ -1,2 +1,2 @@
@exportClass ol.control.Logo ol.control.LogoOptions
@exportSymbol ol.control.Logo
@exportProperty ol.control.Logo.prototype.setMap
src/ol/control/logocontrol.js
+1 -1
View File
@@ -17,7 +17,7 @@ goog.require('ol.css');
* be styled by using a css selector for `.ol-logo`.
* @constructor
* @extends {ol.control.Control}
* @param {ol.control.LogoOptions=} opt_options Logo options.
* @param {olx.control.LogoOptions=} opt_options Logo options.
* @todo stability experimental
*/
ol.control.Logo = function(opt_options) {
src/ol/control/mousepositioncontrol.exports
+1 -1
View File
@@ -1,2 +1,2 @@
@exportClass ol.control.MousePosition ol.control.MousePositionOptions
@exportSymbol ol.control.MousePosition
@exportProperty ol.control.MousePosition.prototype.setMap
src/ol/control/mousepositioncontrol.js
+2 -1
View File
@@ -36,7 +36,8 @@ ol.control.MousePositionProperty = {
*
* @constructor
* @extends {ol.control.Control}
* @param {ol.control.MousePositionOptions=} opt_options Mouse position options.
* @param {olx.control.MousePositionOptions=} opt_options Mouse position
* options.
* @todo stability experimental
* @todo observable projection {ol.proj.Projection} the projection to report
* mouse position in
src/ol/control/scalelinecontrol.exports
+1 -1
View File
@@ -1,4 +1,4 @@
@exportClass ol.control.ScaleLine ol.control.ScaleLineOptions
@exportSymbol ol.control.ScaleLine
@exportProperty ol.control.ScaleLine.prototype.setMap
@exportSymbol ol.control.ScaleLineUnits
src/ol/control/scalelinecontrol.js
+1 -1
View File
@@ -49,7 +49,7 @@ ol.control.ScaleLineUnits = {
*
* @constructor
* @extends {ol.control.Control}
* @param {ol.control.ScaleLineOptions=} opt_options Scale line options.
* @param {olx.control.ScaleLineOptions=} opt_options Scale line options.
* @todo stability experimental
* @todo observable units {ol.control.ScaleLineUnits} the units to use in the
* scale line
src/ol/control/zoomcontrol.exports
+1 -1
View File
@@ -1,2 +1,2 @@
@exportClass ol.control.Zoom ol.control.ZoomOptions
@exportSymbol ol.control.Zoom
@exportProperty ol.control.Zoom.prototype.setMap
src/ol/control/zoomcontrol.js
+1 -1
View File
@@ -19,7 +19,7 @@ goog.require('ol.easing');
* use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
* @constructor
* @extends {ol.control.Control}
* @param {ol.control.ZoomOptions=} opt_options Zoom options.
* @param {olx.control.ZoomOptions=} opt_options Zoom options.
* @todo stability experimental
*/
ol.control.Zoom = function(opt_options) {
src/ol/control/zoomslidercontrol.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.control.ZoomSlider ol.control.ZoomSliderOptions
@exportSymbol ol.control.ZoomSlider
src/ol/control/zoomslidercontrol.js
+1 -1
View File
@@ -37,7 +37,7 @@ ol.control.ZOOMSLIDER_ANIMATION_DURATION = 200;
*
* @constructor
* @extends {ol.control.Control}
* @param {ol.control.ZoomSliderOptions=} opt_options Zoom slider options.
* @param {olx.control.ZoomSliderOptions=} opt_options Zoom slider options.
* @todo stability experimental
*/
ol.control.ZoomSlider = function(opt_options) {
src/ol/control/zoomtoextentcontrol.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.control.ZoomToExtent ol.control.ZoomToExtentOptions
@exportSymbol ol.control.ZoomToExtent
src/ol/control/zoomtoextentcontrol.js
+1 -1
View File
@@ -17,7 +17,7 @@ goog.require('ol.css');
* css selector `.ol-zoom-extent`.
* @constructor
* @extends {ol.control.Control}
* @param {ol.control.ZoomToExtentOptions=} opt_options Options.
* @param {olx.control.ZoomToExtentOptions=} opt_options Options.
* @todo stability experimental
*/
ol.control.ZoomToExtent = function(opt_options) {
src/ol/deviceorientation.exports
+1 -1
View File
@@ -1,2 +1,2 @@
@exportClass ol.DeviceOrientation ol.DeviceOrientationOptions
@exportSymbol ol.DeviceOrientation
@exportSymbol ol.DeviceOrientation.SUPPORTED ol.DeviceOrientation.SUPPORTED
src/ol/deviceorientation.js
+1 -1
View File
@@ -67,7 +67,7 @@ ol.DeviceOrientationProperty = {
*
* @constructor
* @extends {ol.Object}
* @param {ol.DeviceOrientationOptions=} opt_options Options.
* @param {olx.DeviceOrientationOptions=} opt_options Options.
* @todo stability experimental
* @todo observable alpha {number} readonly the euler angle in radians of the
* device from the standard X axis
src/ol/format/geojsonformat.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.format.GeoJSON ol.format.GeoJSONOptions
@exportSymbol ol.format.GeoJSON
src/ol/format/geojsonformat.js
+1 -1
View File
@@ -22,7 +22,7 @@ goog.require('ol.proj');
/**
* @constructor
* @extends {ol.format.JSON}
* @param {ol.format.GeoJSONOptions=} opt_options Options.
* @param {olx.format.GeoJSONOptions=} opt_options Options.
*/
ol.format.GeoJSON = function(opt_options) {
src/ol/geolocation.exports
+1 -1
View File
@@ -1,2 +1,2 @@
@exportClass ol.Geolocation ol.GeolocationOptions
@exportSymbol ol.Geolocation
@exportSymbol ol.Geolocation.SUPPORTED ol.Geolocation.SUPPORTED
src/ol/geolocation.js
+1 -1
View File
@@ -45,7 +45,7 @@ ol.GeolocationProperty = {
*
* @constructor
* @extends {ol.Object}
* @param {ol.GeolocationOptions=} opt_options Options.
* @param {olx.GeolocationOptions=} opt_options Options.
* @todo stability experimental
* @todo observable accuracy {number} readonly the accuracy of the position
* measurement
src/ol/interaction/doubleclickzoom.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.interaction.DoubleClickZoom ol.interaction.DoubleClickZoomOptions
@exportSymbol ol.interaction.DoubleClickZoom
src/ol/interaction/doubleclickzoominteraction.js
+1 -1
View File
@@ -14,7 +14,7 @@ goog.require('ol.interaction.Interaction');
*
* @constructor
* @extends {ol.interaction.Interaction}
* @param {ol.interaction.DoubleClickZoomOptions=} opt_options Options.
* @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options.
* @todo stability experimental
*/
ol.interaction.DoubleClickZoom = function(opt_options) {
src/ol/interaction/dragpan.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.interaction.DragPan ol.interaction.DragPanOptions
@exportSymbol ol.interaction.DragPan
src/ol/interaction/dragpaninteraction.js
+1 -1
View File
@@ -18,7 +18,7 @@ goog.require('ol.interaction.Drag');
* Allows the user to pan the map by clickng and dragging.
* @constructor
* @extends {ol.interaction.Drag}
* @param {ol.interaction.DragPanOptions=} opt_options Options.
* @param {olx.interaction.DragPanOptions=} opt_options Options.
* @todo stability experimental
*/
ol.interaction.DragPan = function(opt_options) {
src/ol/interaction/dragrotate.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.interaction.DragRotate ol.interaction.DragRotateOptions
@exportSymbol ol.interaction.DragRotate
src/ol/interaction/dragrotateandzoom.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.interaction.DragRotateAndZoom ol.interaction.DragRotateAndZoomOptions
@exportSymbol ol.interaction.DragRotateAndZoom
src/ol/interaction/dragrotateandzoominteraction.js
+1 -1
View File
@@ -26,7 +26,7 @@ ol.interaction.DRAGROTATEANDZOOM_ANIMATION_DURATION = 400;
* This interaction is not included in the default interactions.
* @constructor
* @extends {ol.interaction.Drag}
* @param {ol.interaction.DragRotateAndZoomOptions=} opt_options Options.
* @param {olx.interaction.DragRotateAndZoomOptions=} opt_options Options.
* @todo stability experimental
*/
ol.interaction.DragRotateAndZoom = function(opt_options) {
src/ol/interaction/dragrotateinteraction.js
+1 -1
View File
@@ -21,7 +21,7 @@ ol.interaction.DRAGROTATE_ANIMATION_DURATION = 250;
* it to when the alt and shift keys are held down.
* @constructor
* @extends {ol.interaction.Drag}
* @param {ol.interaction.DragRotateOptions=} opt_options Options.
* @param {olx.interaction.DragRotateOptions=} opt_options Options.
*/
ol.interaction.DragRotate = function(opt_options) {
src/ol/interaction/dragzoom.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.interaction.DragZoom ol.interaction.DragZoomOptions
@exportSymbol ol.interaction.DragZoom
src/ol/interaction/dragzoominteraction.js
+1 -1
View File
@@ -34,7 +34,7 @@ ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS_SQUARED =
* it to when the shift key is held down.
* @constructor
* @extends {ol.interaction.Drag}
* @param {ol.interaction.DragZoomOptions=} opt_options Options.
* @param {olx.interaction.DragZoomOptions=} opt_options Options.
* @todo stability experimental
*/
ol.interaction.DragZoom = function(opt_options) {
src/ol/interaction/interactiondefaults.exports
+1 -1
View File
@@ -1 +1 @@
@exportFunction ol.interaction.defaults ol.interaction.DefaultsOptions ol.Collection
@exportSymbol ol.interaction.defaults ol.interaction.defaults
src/ol/interaction/interactiondefaults.js
+1 -1
View File
@@ -23,7 +23,7 @@ goog.require('ol.interaction.TouchZoom');
* {@link ol.interaction} instances and insert them into an
* {@link ol.Collection} in the order you want before creating your ol.Map
* instance.
* @param {ol.interaction.DefaultsOptions=} opt_options Defaults options.
* @param {olx.interaction.DefaultsOptions=} opt_options Defaults options.
* @return {ol.Collection} A collection of interactions to be used with
* the ol.Map constructor's interactions option.
* @todo stability experimental
src/ol/interaction/keyboardpan.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.interaction.KeyboardPan ol.interaction.KeyboardPanOptions
@exportSymbol ol.interaction.KeyboardPan
src/ol/interaction/keyboardpaninteraction.js
+1 -1
View File
@@ -24,7 +24,7 @@ ol.interaction.KEYBOARD_PAN_DURATION = 100;
* Allows the user to pan the map using keyboard arrows.
* @constructor
* @extends {ol.interaction.Interaction}
* @param {ol.interaction.KeyboardPanOptions=} opt_options Options.
* @param {olx.interaction.KeyboardPanOptions=} opt_options Options.
* @todo stability experimental
*/
ol.interaction.KeyboardPan = function(opt_options) {
src/ol/interaction/keyboardzoom.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.interaction.KeyboardZoom ol.interaction.KeyboardZoomOptions
@exportSymbol ol.interaction.KeyboardZoom
src/ol/interaction/keyboardzoominteraction.js
+1 -1
View File
@@ -13,7 +13,7 @@ goog.require('ol.interaction.Interaction');
/**
* Allows the user to zoom the map using keyboard + and -.
* @constructor
* @param {ol.interaction.KeyboardZoomOptions=} opt_options Options.
* @param {olx.interaction.KeyboardZoomOptions=} opt_options Options.
* @extends {ol.interaction.Interaction}
* @todo stability experimental
*/
src/ol/interaction/mousewheelzoominteraction.js
+1 -1
View File
@@ -27,7 +27,7 @@ ol.interaction.MOUSEWHEELZOOM_TIMEOUT_DURATION = 80;
* Allows the user to zoom the map by scrolling the mouse wheel.
* @constructor
* @extends {ol.interaction.Interaction}
* @param {ol.interaction.MouseWheelZoomOptions=} opt_options Options.
* @param {olx.interaction.MouseWheelZoomOptions=} opt_options Options.
* @todo stability experimental
*/
ol.interaction.MouseWheelZoom = function(opt_options) {
src/ol/interaction/touchpan.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.interaction.TouchPan ol.interaction.TouchPanOptions
@exportSymbol ol.interaction.TouchPan
src/ol/interaction/touchpaninteraction.js
+1 -1
View File
@@ -15,7 +15,7 @@ goog.require('ol.interaction.Touch');
* on a touch screen.
* @constructor
* @extends {ol.interaction.Touch}
* @param {ol.interaction.TouchPanOptions=} opt_options Options.
* @param {olx.interaction.TouchPanOptions=} opt_options Options.
* @todo stability experimental
*/
ol.interaction.TouchPan = function(opt_options) {
src/ol/interaction/touchrotate.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.interaction.TouchRotate ol.interaction.TouchRotateOptions
@exportSymbol ol.interaction.TouchRotate
src/ol/interaction/touchrotateinteraction.js
+1 -1
View File
@@ -21,7 +21,7 @@ ol.interaction.TOUCHROTATE_ANIMATION_DURATION = 250;
* on a touch screen.
* @constructor
* @extends {ol.interaction.Touch}
* @param {ol.interaction.TouchRotateOptions=} opt_options Options.
* @param {olx.interaction.TouchRotateOptions=} opt_options Options.
* @todo stability experimental
*/
ol.interaction.TouchRotate = function(opt_options) {
src/ol/interaction/touchzoominteraction.js
+1 -1
View File
@@ -15,7 +15,7 @@ goog.require('ol.interaction.Touch');
* on a touch screen.
* @constructor
* @extends {ol.interaction.Touch}
* @param {ol.interaction.TouchZoomOptions=} opt_options Options.
* @param {olx.interaction.TouchZoomOptions=} opt_options Options.
* @todo stability experimental
*/
ol.interaction.TouchZoom = function(opt_options) {
src/ol/layer/imagelayer.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.layer.Image ol.layer.LayerOptions
@exportSymbol ol.layer.Image
src/ol/layer/imagelayer.js
+1 -1
View File
@@ -8,7 +8,7 @@ goog.require('ol.source.Image');
/**
* @constructor
* @extends {ol.layer.Layer}
* @param {ol.layer.LayerOptions} options Layer options.
* @param {olx.layer.LayerOptions} options Layer options.
* @todo stability experimental
*/
ol.layer.Image = function(options) {
src/ol/layer/layer.js
+2 -2
View File
@@ -12,7 +12,7 @@ goog.require('ol.source.Source');
/**
* @constructor
* @extends {ol.layer.Base}
* @param {ol.layer.LayerOptions} options Layer options.
* @param {olx.layer.LayerOptions} options Layer options.
* @todo stability experimental
* @todo observable brightness {number} the brightness of the layer
* @todo observable contrast {number} the contrast of the layer
@@ -25,7 +25,7 @@ goog.require('ol.source.Source');
*/
ol.layer.Layer = function(options) {
var baseOptions = /** @type {ol.layer.LayerOptions} */
var baseOptions = /** @type {olx.layer.LayerOptions} */
(goog.object.clone(options));
delete baseOptions.source;
src/ol/layer/layerbase.js
+1 -37
View File
@@ -43,7 +43,7 @@ ol.layer.LayerState;
/**
* @constructor
* @extends {ol.Object}
* @param {ol.layer.BaseOptions} options Layer options.
* @param {olx.layer.BaseOptions} options Layer options.
*/
ol.layer.Base = function(options) {
@@ -71,22 +71,6 @@ ol.layer.Base = function(options) {
values.minResolution : 0;
this.setValues(values);
goog.events.listen(this, [
ol.Object.getChangeEventType(ol.layer.LayerProperty.BRIGHTNESS),
ol.Object.getChangeEventType(ol.layer.LayerProperty.CONTRAST),
ol.Object.getChangeEventType(ol.layer.LayerProperty.HUE),
ol.Object.getChangeEventType(ol.layer.LayerProperty.OPACITY),
ol.Object.getChangeEventType(ol.layer.LayerProperty.SATURATION),
ol.Object.getChangeEventType(ol.layer.LayerProperty.MAX_RESOLUTION),
ol.Object.getChangeEventType(ol.layer.LayerProperty.MIN_RESOLUTION)
],
this.handleLayerChange, false, this);
goog.events.listen(this,
ol.Object.getChangeEventType(ol.layer.LayerProperty.VISIBLE),
this.handleLayerVisibleChange, false, this);
};
goog.inherits(ol.layer.Base, ol.Object);
@@ -251,26 +235,6 @@ goog.exportProperty(
ol.layer.Base.prototype.getVisible);
/**
* @protected
*/
ol.layer.Base.prototype.handleLayerChange = function() {
if (this.getVisible() && this.getSourceState() == ol.source.State.READY) {
this.dispatchChangeEvent();
}
};
/**
* @protected
*/
ol.layer.Base.prototype.handleLayerVisibleChange = function() {
if (this.getSourceState() == ol.source.State.READY) {
this.dispatchChangeEvent();
}
};
/**
* Adjust the layer brightness. A value of -1 will render the layer completely
* black. A value of 0 will leave the brightness unchanged. A value of 1 will
src/ol/layer/layergroup.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.layer.Group ol.layer.GroupOptions
@exportSymbol ol.layer.Group
src/ol/layer/layergroup.js
+6 -14
View File
@@ -26,7 +26,7 @@ ol.layer.GroupProperty = {
/**
* @constructor
* @extends {ol.layer.Base}
* @param {ol.layer.GroupOptions=} opt_options Layer options.
* @param {olx.layer.GroupOptions=} opt_options Layer options.
* @todo stability experimental
* @todo observable layers {ol.Collection} collection of layers that are part
* of this group
@@ -34,7 +34,7 @@ ol.layer.GroupProperty = {
ol.layer.Group = function(opt_options) {
var options = goog.isDef(opt_options) ? opt_options : {};
var baseOptions = /** @type {ol.layer.GroupOptions} */
var baseOptions = /** @type {olx.layer.GroupOptions} */
(goog.object.clone(options));
delete baseOptions.layers;
@@ -70,23 +70,15 @@ goog.inherits(ol.layer.Group, ol.layer.Base);
/**
* @inheritDoc
* @private
*/
ol.layer.Group.prototype.handleLayerChange = function() {
ol.layer.Group.prototype.handleLayerChange_ = function() {
if (this.getVisible()) {
this.dispatchChangeEvent();
}
};
/**
* @inheritDoc
*/
ol.layer.Group.prototype.handleLayerVisibleChange = function() {
this.dispatchChangeEvent();
};
/**
* @param {goog.events.Event} event Event.
* @private
@@ -113,7 +105,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
layer = layersArray[i];
this.listenerKeys_[goog.getUid(layer).toString()] =
goog.events.listen(layer, goog.events.EventType.CHANGE,
this.handleLayerChange, false, this);
this.handleLayerChange_, false, this);
}
}
@@ -128,7 +120,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement());
this.listenerKeys_[goog.getUid(layer).toString()] = goog.events.listen(
layer, goog.events.EventType.CHANGE, this.handleLayerChange, false,
layer, goog.events.EventType.CHANGE, this.handleLayerChange_, false,
this);
this.dispatchChangeEvent();
};
src/ol/layer/tilelayer.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.layer.Tile ol.layer.TileOptions
@exportSymbol ol.layer.Tile
src/ol/layer/tilelayer.js
+1 -1
View File
@@ -16,7 +16,7 @@ ol.layer.TileProperty = {
/**
* @constructor
* @extends {ol.layer.Layer}
* @param {ol.layer.TileOptions} options Tile layer options.
* @param {olx.layer.TileOptions} options Tile layer options.
* @todo stability experimental
* @todo observable preload {number} the level to preload tiles up to
*/
src/ol/layer/vectorlayer.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.layer.Vector ol.layer.VectorOptions
@exportSymbol ol.layer.Vector
src/ol/layer/vectorlayer.js
+3 -3
View File
@@ -17,14 +17,14 @@ ol.layer.VectorProperty = {
/**
* @constructor
* @extends {ol.layer.Layer}
* @param {ol.layer.VectorOptions=} opt_options Options.
* @param {olx.layer.VectorOptions=} opt_options Options.
*/
ol.layer.Vector = function(opt_options) {
var options = goog.isDef(opt_options) ?
opt_options : /** @type {ol.layer.VectorOptions} */ ({});
opt_options : /** @type {olx.layer.VectorOptions} */ ({});
goog.base(this, /** @type {ol.layer.LayerOptions} */ (options));
goog.base(this, /** @type {olx.layer.LayerOptions} */ (options));
// FIXME veryify this
if (goog.isDef(options.styleFunction)) {
src/ol/map.exports
+1 -1
View File
@@ -1,4 +1,4 @@
@exportClass ol.Map ol.MapOptions
@exportSymbol ol.Map
@exportProperty ol.Map.prototype.addControl
@exportProperty ol.Map.prototype.addInteraction
@exportProperty ol.Map.prototype.addLayer
src/ol/map.js
+2 -2
View File
@@ -141,7 +141,7 @@ ol.MapProperty = {
*
* @constructor
* @extends {ol.Object}
* @param {ol.MapOptions} options Map options.
* @param {olx.MapOptions} options Map options.
* @todo stability experimental
* @todo observable layergroup {ol.layer.LayerGroup} a layer group containing
* the layers in this map.
@@ -1224,7 +1224,7 @@ ol.MapOptionsInternal;
/**
* @param {ol.MapOptions} options Map options.
* @param {olx.MapOptions} options Map options.
* @return {ol.MapOptionsInternal} Internal map options.
*/
ol.Map.createOptionsInternal = function(options) {
src/ol/mapbrowserevent.exports
+1
View File
@@ -1,3 +1,4 @@
@exportProperty ol.MapBrowserEvent.prototype.getBrowserEvent
@exportProperty ol.MapBrowserEvent.prototype.getCoordinate
@exportProperty ol.MapBrowserEvent.prototype.getPixel
@exportProperty ol.MapBrowserEvent.prototype.preventDefault
src/ol/mapbrowserevent.js
+8
View File
@@ -49,6 +49,14 @@ ol.MapBrowserEvent = function(type, map, browserEvent, opt_frameState) {
goog.inherits(ol.MapBrowserEvent, ol.MapEvent);
/**
* @return {Event} The underlying browser event object.
*/
ol.MapBrowserEvent.prototype.getBrowserEvent = function() {
return this.browserEvent.getBrowserEvent();
};
/**
* @return {ol.Coordinate} Coordinate.
* @todo stability experimental
src/ol/overlay.exports
+1 -1
View File
@@ -1,4 +1,4 @@
@exportClass ol.Overlay ol.OverlayOptions
@exportSymbol ol.Overlay
@exportSymbol ol.OverlayPositioning
@exportProperty ol.OverlayPositioning.BOTTOM_LEFT
src/ol/overlay.js
+1 -1
View File
@@ -55,7 +55,7 @@ ol.OverlayPositioning = {
*
* @constructor
* @extends {ol.Object}
* @param {ol.OverlayOptions} options Overlay options.
* @param {olx.OverlayOptions} options Overlay options.
* @todo stability experimental
* @todo observable element {Element} the Element containing the overlay
* @todo observable map {ol.Map} the map that the overlay is part of
src/ol/proj.exports
+1 -1
View File
@@ -1,4 +1,4 @@
@exportClass ol.proj.Projection ol.ProjectionOptions
@exportSymbol ol.proj.Projection
@exportProperty ol.proj.Projection.prototype.getCode
@exportProperty ol.proj.Projection.prototype.getExtent
src/ol/proj/proj.js
+6 -6
View File
@@ -58,7 +58,7 @@ ol.METERS_PER_UNIT[ol.proj.Units.METERS] = 1;
/**
* @constructor
* @param {ol.ProjectionOptions} options Projection options.
* @param {olx.ProjectionOptions} options Projection options.
* @struct
* @todo stability experimental
*/
@@ -199,7 +199,7 @@ ol.proj.Projection.prototype.setDefaultTileGrid = function(tileGrid) {
* @constructor
* @extends {ol.proj.Projection}
* @param {Proj4js.Proj} proj4jsProj Proj4js projection.
* @param {ol.Proj4jsProjectionOptions} options Proj4js projection options.
* @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
* @private
* @struct
*/
@@ -207,7 +207,7 @@ ol.Proj4jsProjection_ = function(proj4jsProj, options) {
var units = /** @type {ol.proj.Units} */ (proj4jsProj.units);
var config = /** @type {ol.ProjectionOptions} */ ({
var config = /** @type {olx.ProjectionOptions} */ ({
units: units,
axisOrientation: proj4jsProj.axis
});
@@ -493,7 +493,7 @@ ol.proj.get = function(projectionLike) {
/**
* @param {ol.Proj4jsProjectionOptions} options Proj4js projection options.
* @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
* @private
* @return {ol.Proj4jsProjection_} Proj4js projection.
*/
@@ -506,7 +506,7 @@ ol.proj.getProj4jsProjectionFromCode_ = function(options) {
var srsCode = proj4jsProj.srsCode;
proj4jsProjection = proj4jsProjections[srsCode];
if (!goog.isDef(proj4jsProjection)) {
var config = /** @type {ol.Proj4jsProjectionOptions} */
var config = /** @type {olx.Proj4jsProjectionOptions} */
(goog.object.clone(options));
config.code = srsCode;
proj4jsProjection = new ol.Proj4jsProjection_(proj4jsProj, config);
@@ -711,7 +711,7 @@ ol.proj.transformWithProjections =
/**
* @param {ol.Proj4jsProjectionOptions} options Proj4js projection options.
* @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
* @return {ol.proj.Projection} Proj4js projection.
* @todo stability experimental
*/
src/ol/renderer/canvas/canvastilelayerrenderer.js
+7 -2
View File
@@ -181,6 +181,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection);
}
var tileGutter = tileSource.getGutter();
var z = tileGrid.getZForResolution(view2DState.resolution);
var tileSize = tileGrid.getTileSize(z);
var tileResolution = tileGrid.getResolution(z);
@@ -339,7 +340,9 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
context.clearRect(x, y, tileSize[0], tileSize[1]);
}
if (tileState == ol.TileState.LOADED) {
context.drawImage(tile.getImage(), x, y);
context.drawImage(tile.getImage(),
tileGutter, tileGutter, tileSize[0], tileSize[1],
x, y, tileSize[0], tileSize[1]);
}
this.renderedTiles_[index] = tile;
}
@@ -358,7 +361,9 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
context.clearRect(x, y, width, height);
}
if (tileState == ol.TileState.LOADED) {
context.drawImage(tile.getImage(), x, y, width, height);
context.drawImage(tile.getImage(),
tileGutter, tileGutter, tileSize[0], tileSize[1],
x, y, width, height);
}
interimTileRange =
tileGrid.getTileRangeForExtentAndZ(tileExtent, z, tmpTileRange);
src/ol/renderer/dom/domtilelayerrenderer.js
+29 -11
View File
@@ -98,6 +98,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
if (goog.isNull(tileGrid)) {
tileGrid = ol.tilegrid.getForProjection(projection);
}
var tileGutter = tileSource.getGutter();
var z = tileGrid.getZForResolution(view2DState.resolution);
var tileResolution = tileGrid.getResolution(z);
var center = view2DState.center;
@@ -186,7 +187,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
}
tilesToDraw = tilesToDrawByZ[tileLayerZKey];
for (tileCoordKey in tilesToDraw) {
tileLayerZ.addTile(tilesToDraw[tileCoordKey]);
tileLayerZ.addTile(tilesToDraw[tileCoordKey], tileGutter);
}
tileLayerZ.finalizeAddTiles();
}
@@ -317,8 +318,9 @@ ol.renderer.dom.TileLayerZ_ = function(tileGrid, tileCoordOrigin) {
/**
* @param {ol.Tile} tile Tile.
* @param {number} tileGutter Tile gutter.
*/
ol.renderer.dom.TileLayerZ_.prototype.addTile = function(tile) {
ol.renderer.dom.TileLayerZ_.prototype.addTile = function(tile, tileGutter) {
var tileCoord = tile.tileCoord;
goog.asserts.assert(tileCoord.z == this.tileCoordOrigin_.z);
var tileCoordKey = tileCoord.toString();
@@ -327,20 +329,36 @@ ol.renderer.dom.TileLayerZ_.prototype.addTile = function(tile) {
}
var tileSize = this.tileGrid_.getTileSize(tileCoord.z);
var image = tile.getImage(this);
var style = image.style;
// Bootstrap sets the style max-width: 100% for all images, which breaks
// prevents the tile from being displayed in FireFox. Workaround by
// overriding the max-width style.
style.maxWidth = 'none';
style.position = 'absolute';
style.left =
var imageStyle = image.style;
// Bootstrap sets the style max-width: 100% for all images, which
// prevents the tile from being displayed in FireFox. Workaround
// by overriding the max-width style.
imageStyle.maxWidth = 'none';
var tileElement;
var tileElementStyle;
if (tileGutter > 0) {
tileElement = goog.dom.createElement(goog.dom.TagName.DIV);
tileElementStyle = tileElement.style;
tileElementStyle.overflow = 'hidden';
tileElementStyle.width = tileSize[0] + 'px';
tileElementStyle.height = tileSize[1] + 'px';
imageStyle.position = 'absolute';
imageStyle.left = -tileGutter + 'px';
imageStyle.top = -tileGutter + 'px';
goog.dom.appendChild(tileElement, image);
} else {
tileElement = image;
tileElementStyle = imageStyle;
}
tileElementStyle.position = 'absolute';
tileElementStyle.left =
((tileCoord.x - this.tileCoordOrigin_.x) * tileSize[0]) + 'px';
style.top =
tileElementStyle.top =
((this.tileCoordOrigin_.y - tileCoord.y) * tileSize[1]) + 'px';
if (goog.isNull(this.documentFragment_)) {
this.documentFragment_ = document.createDocumentFragment();
}
goog.dom.appendChild(this.documentFragment_, image);
goog.dom.appendChild(this.documentFragment_, tileElement);
this.tiles_[tileCoordKey] = tile;
};
src/ol/renderer/webgl/webglmaprenderer.js
+55 -6
View File
@@ -66,6 +66,26 @@ ol.renderer.webgl.Map = function(container, map) {
this.canvas_.className = ol.css.CLASS_UNSELECTABLE;
goog.dom.insertChildAt(container, this.canvas_, 0);
/**
* @private
* @type {HTMLCanvasElement}
*/
this.clipTileCanvas_ = /** @type {HTMLCanvasElement} */
(goog.dom.createElement(goog.dom.TagName.CANVAS));
/**
* @private
* @type {ol.Size}
*/
this.clipTileCanvasSize_ = [0, 0];
/**
* @private
* @type {CanvasRenderingContext2D}
*/
this.clipTileContext_ = /** @type {CanvasRenderingContext2D} */
(this.clipTileCanvas_.getContext('2d'));
/**
* @private
* @type {boolean}
@@ -147,9 +167,14 @@ ol.renderer.webgl.Map = function(container, map) {
function(map, frameState) {
if (!this.tileTextureQueue_.isEmpty()) {
this.tileTextureQueue_.reprioritize();
var tile =
/** @type {ol.Tile} */ (this.tileTextureQueue_.dequeue()[0]);
this.bindTileTexture(tile, goog.webgl.LINEAR, goog.webgl.LINEAR);
var element = this.tileTextureQueue_.dequeue();
var tile = /** @type {ol.Tile} */ (element[0]);
var tileWidth = /** @type {number} */ (element[3]);
var tileHeight = /** @type {number} */ (element[4]);
var tileGutter = /** @type {number} */ (element[5]);
this.bindTileTexture(tile,
tileWidth, tileHeight, tileGutter,
goog.webgl.LINEAR, goog.webgl.LINEAR);
}
}, this);
@@ -167,11 +192,14 @@ goog.inherits(ol.renderer.webgl.Map, ol.renderer.Map);
/**
* @param {ol.Tile} tile Tile.
* @param {number} tileWidth Tile width.
* @param {number} tileHeight Tile height.
* @param {number} tileGutter Tile gutter.
* @param {number} magFilter Mag filter.
* @param {number} minFilter Min filter.
*/
ol.renderer.webgl.Map.prototype.bindTileTexture =
function(tile, magFilter, minFilter) {
function(tile, tileWidth, tileHeight, tileGutter, magFilter, minFilter) {
var gl = this.getGL();
var tileKey = tile.getKey();
if (this.textureCache_.containsKey(tileKey)) {
@@ -191,8 +219,29 @@ ol.renderer.webgl.Map.prototype.bindTileTexture =
} else {
var texture = gl.createTexture();
gl.bindTexture(goog.webgl.TEXTURE_2D, texture);
gl.texImage2D(goog.webgl.TEXTURE_2D, 0, goog.webgl.RGBA, goog.webgl.RGBA,
goog.webgl.UNSIGNED_BYTE, tile.getImage());
if (tileGutter > 0) {
var clipTileCanvas = this.clipTileCanvas_;
var clipTileCanvasSize = this.clipTileCanvasSize_;
var clipTileContext = this.clipTileContext_;
if (clipTileCanvasSize[0] != tileWidth ||
clipTileCanvasSize[1] != tileHeight) {
clipTileCanvas.width = tileWidth;
clipTileCanvas.height = tileHeight;
clipTileCanvasSize[0] = tileWidth;
clipTileCanvasSize[1] = tileHeight;
} else {
clipTileContext.clearRect(0, 0, tileWidth, tileHeight);
}
clipTileContext.drawImage(tile.getImage(), tileGutter, tileGutter,
tileWidth, tileHeight, 0, 0, tileWidth, tileHeight);
gl.texImage2D(goog.webgl.TEXTURE_2D, 0,
goog.webgl.RGBA, goog.webgl.RGBA,
goog.webgl.UNSIGNED_BYTE, clipTileCanvas);
} else {
gl.texImage2D(goog.webgl.TEXTURE_2D, 0,
goog.webgl.RGBA, goog.webgl.RGBA,
goog.webgl.UNSIGNED_BYTE, tile.getImage());
}
gl.texParameteri(
goog.webgl.TEXTURE_2D, goog.webgl.TEXTURE_MAG_FILTER, magFilter);
gl.texParameteri(
src/ol/renderer/webgl/webgltilelayerrenderer.js
+9 -3
View File
@@ -132,6 +132,10 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
}
var z = tileGrid.getZForResolution(view2DState.resolution);
var tileResolution = tileGrid.getResolution(z);
var tileSize = tileGrid.getTileSize(z);
var tileGutter = tileSource.getGutter();
var center = view2DState.center;
var extent;
if (tileResolution == view2DState.resolution) {
@@ -152,7 +156,6 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
} else {
var tileRangeSize = tileRange.getSize();
var tileSize = tileGrid.getTileSize(z);
var maxDimension = Math.max(
tileRangeSize[0] * tileSize[0],
@@ -257,7 +260,9 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
framebufferExtentDimension - 1;
goog.vec.Vec4.setFromValues(u_tileOffset, sx, sy, tx, ty);
gl.uniform4fv(this.locations_.u_tileOffset, u_tileOffset);
mapRenderer.bindTileTexture(tile, goog.webgl.LINEAR, goog.webgl.LINEAR);
mapRenderer.bindTileTexture(tile,
tileSize[0], tileSize[1], tileGutter,
goog.webgl.LINEAR, goog.webgl.LINEAR);
gl.drawArrays(goog.webgl.TRIANGLE_STRIP, 0, 4);
}
}
@@ -290,7 +295,8 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
tileTextureQueue.enqueue([
tile,
tileGrid.getTileCoordCenter(tile.tileCoord),
tileGrid.getResolution(tile.tileCoord.z)
tileGrid.getResolution(tile.tileCoord.z),
tileSize[0], tileSize[1], tileGutter
]);
}
}, this);
src/ol/source/bingmapssource.exports
+1 -1
View File
@@ -1,2 +1,2 @@
@exportClass ol.source.BingMaps ol.source.BingMapsOptions
@exportSymbol ol.source.BingMaps
@exportProperty ol.source.BingMaps.TOS_ATTRIBUTION
src/ol/source/bingmapssource.js
+1 -1
View File
@@ -18,7 +18,7 @@ goog.require('ol.tilegrid.XYZ');
/**
* @constructor
* @extends {ol.source.TileImage}
* @param {ol.source.BingMapsOptions} options Bing Maps options.
* @param {olx.source.BingMapsOptions} options Bing Maps options.
* @todo stability experimental
*/
ol.source.BingMaps = function(options) {
src/ol/source/debugtilesource.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.source.TileDebug ol.source.TileDebugOptions
@exportSymbol ol.source.TileDebug
src/ol/source/debugtilesource.js
+1 -1
View File
@@ -85,7 +85,7 @@ ol.DebugTile_.prototype.getImage = function(opt_context) {
/**
* @constructor
* @extends {ol.source.Tile}
* @param {ol.source.TileDebugOptions} options Debug tile options.
* @param {olx.source.TileDebugOptions} options Debug tile options.
* @todo stability experimental
*/
ol.source.TileDebug = function(options) {
src/ol/source/geojsonsource.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.source.GeoJSON ol.source.GeoJSONOptions
@exportSymbol ol.source.GeoJSON
src/ol/source/geojsonsource.js
+1 -1
View File
@@ -8,7 +8,7 @@ goog.require('ol.source.VectorFile');
/**
* @constructor
* @extends {ol.source.VectorFile}
* @param {ol.source.GeoJSONOptions=} opt_options Options.
* @param {olx.source.GeoJSONOptions=} opt_options Options.
*/
ol.source.GeoJSON = function(opt_options) {
src/ol/source/imagestaticsource.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.source.ImageStatic ol.source.ImageStaticOptions
@exportSymbol ol.source.ImageStatic
src/ol/source/imagestaticsource.js
+1 -1
View File
@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
/**
* @constructor
* @extends {ol.source.Image}
* @param {ol.source.ImageStaticOptions} options Options.
* @param {olx.source.ImageStaticOptions} options Options.
* @todo stability experimental
*/
ol.source.ImageStatic = function(options) {
src/ol/source/imagewmssource.exports
+1 -1
View File
@@ -1,3 +1,3 @@
@exportClass ol.source.ImageWMS ol.source.ImageWMSOptions
@exportSymbol ol.source.ImageWMS
@exportProperty ol.source.ImageWMS.prototype.getParams
@exportProperty ol.source.ImageWMS.prototype.updateParams
src/ol/source/imagewmssource.js
+1 -1
View File
@@ -13,7 +13,7 @@ goog.require('ol.source.wms');
/**
* @constructor
* @extends {ol.source.Image}
* @param {ol.source.ImageWMSOptions} options Options.
* @param {olx.source.ImageWMSOptions} options Options.
* @todo stability experimental
*/
ol.source.ImageWMS = function(options) {
src/ol/source/mapguidesource.js
+1 -1
View File
@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
/**
* @constructor
* @extends {ol.source.Image}
* @param {ol.source.MapGuideOptions} options Options.
* @param {olx.source.MapGuideOptions} options Options.
*/
ol.source.MapGuide = function(options) {
src/ol/source/mapquestsource.js
+2 -2
View File
@@ -10,7 +10,7 @@ goog.require('ol.source.XYZ');
/**
* @constructor
* @extends {ol.source.XYZ}
* @param {ol.source.MapQuestOptions=} opt_options MapQuest options.
* @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
* @todo stability experimental
*/
ol.source.MapQuestOSM = function(opt_options) {
@@ -43,7 +43,7 @@ goog.inherits(ol.source.MapQuestOSM, ol.source.XYZ);
/**
* @constructor
* @extends {ol.source.XYZ}
* @param {ol.source.MapQuestOptions=} opt_options MapQuest options.
* @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
* @todo stability experimental
*/
ol.source.MapQuestOpenAerial = function(opt_options) {
src/ol/source/osmsource.js
+1 -1
View File
@@ -8,7 +8,7 @@ goog.require('ol.source.XYZ');
/**
* @constructor
* @extends {ol.source.XYZ}
* @param {ol.source.OSMOptions=} opt_options Open Street Map options.
* @param {olx.source.OSMOptions=} opt_options Open Street Map options.
* @todo stability experimental
*/
ol.source.OSM = function(opt_options) {
src/ol/source/stamensource.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.source.Stamen ol.source.StamenOptions
@exportSymbol ol.source.Stamen
src/ol/source/stamensource.js
+1 -1
View File
@@ -80,7 +80,7 @@ ol.source.StamenProviderConfig = {
/**
* @constructor
* @extends {ol.source.XYZ}
* @param {ol.source.StamenOptions} options Stamen options.
* @param {olx.source.StamenOptions} options Stamen options.
* @todo stability experimental
*/
ol.source.Stamen = function(options) {
src/ol/source/tilejsonsource.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.source.TileJSON ol.source.TileJSONOptions
@exportSymbol ol.source.TileJSON
src/ol/source/tilejsonsource.js
+1 -1
View File
@@ -40,7 +40,7 @@ goog.exportSymbol('grid', grid);
/**
* @constructor
* @extends {ol.source.TileImage}
* @param {ol.source.TileJSONOptions} options TileJSON options.
* @param {olx.source.TileJSONOptions} options TileJSON options.
* @todo stability experimental
*/
ol.source.TileJSON = function(options) {
src/ol/source/tilesource.js
+8
View File
@@ -106,6 +106,14 @@ ol.source.Tile.prototype.findLoadedTiles = function(loadedTilesByZ,
};
/**
* @return {number} Gutter.
*/
ol.source.Tile.prototype.getGutter = function() {
return 0;
};
/**
* @param {number} z Z.
* @param {number} x X.
src/ol/source/tilewmssource.exports
+1 -1
View File
@@ -1,3 +1,3 @@
@exportClass ol.source.TileWMS ol.source.TileWMSOptions
@exportSymbol ol.source.TileWMS
@exportProperty ol.source.TileWMS.prototype.getParams
@exportProperty ol.source.TileWMS.prototype.updateParams
src/ol/source/tilewmssource.js
+16 -2
View File
@@ -16,7 +16,7 @@ goog.require('ol.source.wms');
/**
* @constructor
* @extends {ol.source.TileImage}
* @param {ol.source.TileWMSOptions} options Tile WMS options.
* @param {olx.source.TileWMSOptions} options Tile WMS options.
* @todo stability experimental
*/
ol.source.TileWMS = function(options) {
@@ -32,6 +32,12 @@ ol.source.TileWMS = function(options) {
urls = ol.TileUrlFunction.expandUrl(options.url);
}
/**
* @private
* @type {number}
*/
this.gutter_ = goog.isDef(options.gutter) ? options.gutter : 0;
/**
* @private
* @type {Object}
@@ -49,7 +55,7 @@ ol.source.TileWMS = function(options) {
var tileUrlFunctions = goog.array.map(
urls, function(url) {
return ol.TileUrlFunction.createFromParamsFunction(
url, this.params_, ol.source.wms.getUrl);
url, this.params_, this.gutter_, ol.source.wms.getUrl);
}, this);
tileUrlFunction = ol.TileUrlFunction.createFromTileUrlFunctions(
tileUrlFunctions);
@@ -106,6 +112,14 @@ ol.source.TileWMS = function(options) {
goog.inherits(ol.source.TileWMS, ol.source.TileImage);
/**
* @inheritDoc
*/
ol.source.TileWMS.prototype.getGutter = function() {
return this.gutter_;
};
/**
* @inheritDoc
*/
src/ol/source/vectorfilesource.exports
+1 -1
View File
@@ -1 +1 @@
@exportClass ol.source.VectorFile ol.source.VectorFileOptions
@exportSymbol ol.source.VectorFile
src/ol/source/vectorfilesource.js
+1 -1
View File
@@ -14,7 +14,7 @@ goog.require('ol.source.Vector');
/**
* @constructor
* @extends {ol.source.Vector}
* @param {ol.source.VectorFileOptions=} opt_options Options.
* @param {olx.source.VectorFileOptions=} opt_options Options.
*/
ol.source.VectorFile = function(opt_options) {
src/ol/source/vectorsource.exports
+1 -1
View File
@@ -1,4 +1,4 @@
@exportClass ol.source.Vector ol.source.VectorOptions
@exportSymbol ol.source.Vector
@exportProperty ol.source.Vector.prototype.addFeature
@exportProperty ol.source.Vector.prototype.getClosestFeatureToCoordinate
@exportProperty ol.source.Vector.prototype.forEachFeature
src/ol/source/vectorsource.js
+2 -1
View File
@@ -27,7 +27,8 @@ ol.source.VectorEventType = {
/**
* @constructor
* @extends {ol.source.Source}
* @param {ol.source.VectorOptions=} opt_options Options.
* @param {olx.source.VectorOptions=} opt_options Vector source options.
* @todo stability experimental
*/
ol.source.Vector = function(opt_options) {
src/ol/source/wmtssource.exports
+1 -1
View File
@@ -1,4 +1,4 @@
@exportClass ol.source.WMTS ol.source.WMTSOptions
@exportSymbol ol.source.WMTS
@exportProperty ol.source.WMTS.prototype.getDimensions
@exportProperty ol.source.WMTS.prototype.updateDimensions
@exportSymbol ol.source.WMTS.optionsFromCapabilities
src/ol/source/wmtssource.js
+2 -2
View File
@@ -28,7 +28,7 @@ ol.source.WMTSRequestEncoding = {
/**
* @constructor
* @extends {ol.source.TileImage}
* @param {ol.source.WMTSOptions} options WMTS options.
* @param {olx.source.WMTSOptions} options WMTS options.
* @todo stability experimental
*/
ol.source.WMTS = function(options) {
@@ -237,7 +237,7 @@ ol.source.WMTS.prototype.updateDimensions = function(dimensions) {
/**
* @param {Object} wmtsCap An object representing the capabilities document.
* @param {string} layer The layer identifier.
* @return {ol.source.WMTSOptions} WMTS source options object.
* @return {olx.source.WMTSOptions} WMTS source options object.
* @todo stability experimental
*/
ol.source.WMTS.optionsFromCapabilities = function(wmtsCap, layer) {

Some files were not shown because too many files have changed in this diff Show More