Use olx namespace for options types in source code

sed command used: find src/ol -name '*.js' -exec sed -ri 's/\{ol(\.(\w|\.)+Options\=?\})/{olx\1/' \{\} \;
This commit is contained in:
Éric Lemoine
2013-12-12 14:52:29 +01:00
parent ef703c7147
commit 315c42f0a7
81 changed files with 120 additions and 120 deletions

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. * @return {ol.PreRenderFunction} Pre-render function.
* @todo stability experimental * @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. * @return {ol.PreRenderFunction} Pre-render function.
* @todo stability experimental * @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. * @return {ol.PreRenderFunction} Pre-render function.
* @todo stability experimental * @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. * @return {ol.PreRenderFunction} Pre-render function.
* @todo stability experimental * @todo stability experimental
*/ */

View File

@@ -20,7 +20,7 @@ goog.require('ol.TileRange');
* .. * ..
* *
* @constructor * @constructor
* @param {ol.AttributionOptions} options Attribution options. * @param {olx.AttributionOptions} options Attribution options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.Attribution = function(options) { ol.Attribution = function(options) {

View File

@@ -21,7 +21,7 @@ goog.require('ol.css');
* be changed by using a css selector for `.ol-attribution`. * be changed by using a css selector for `.ol-attribution`.
* @constructor * @constructor
* @extends {ol.control.Control} * @extends {ol.control.Control}
* @param {ol.control.AttributionOptions=} opt_options Attribution options. * @param {olx.control.AttributionOptions=} opt_options Attribution options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.control.Attribution = function(opt_options) { ol.control.Attribution = function(opt_options) {

View File

@@ -15,7 +15,7 @@ goog.require('ol.Object');
* @constructor * @constructor
* @extends {ol.Object} * @extends {ol.Object}
* @implements {oli.control.Control} * @implements {oli.control.Control}
* @param {ol.control.ControlOptions} options Control options. * @param {olx.control.ControlOptions} options Control options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.control.Control = function(options) { ol.control.Control = function(options) {

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. * @return {ol.Collection} Controls.
* @todo stability experimental * @todo stability experimental
*/ */

View File

@@ -26,7 +26,7 @@ ol.control.DragBoxOptions;
/** /**
* @constructor * @constructor
* @extends {ol.control.Control} * @extends {ol.control.Control}
* @param {ol.control.DragBoxOptions} options Drag box options. * @param {olx.control.DragBoxOptions} options Drag box options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.control.DragBox = function(options) { ol.control.DragBox = function(options) {

View File

@@ -22,7 +22,7 @@ goog.require('ol.css');
* *
* @constructor * @constructor
* @extends {ol.control.Control} * @extends {ol.control.Control}
* @param {ol.control.FullScreenOptions=} opt_options Options. * @param {olx.control.FullScreenOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.control.FullScreen = function(opt_options) { ol.control.FullScreen = function(opt_options) {

View File

@@ -17,7 +17,7 @@ goog.require('ol.css');
* be styled by using a css selector for `.ol-logo`. * be styled by using a css selector for `.ol-logo`.
* @constructor * @constructor
* @extends {ol.control.Control} * @extends {ol.control.Control}
* @param {ol.control.LogoOptions=} opt_options Logo options. * @param {olx.control.LogoOptions=} opt_options Logo options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.control.Logo = function(opt_options) { ol.control.Logo = function(opt_options) {

View File

@@ -36,7 +36,7 @@ ol.control.MousePositionProperty = {
* *
* @constructor * @constructor
* @extends {ol.control.Control} * @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 stability experimental
* @todo observable projection {ol.proj.Projection} the projection to report * @todo observable projection {ol.proj.Projection} the projection to report
* mouse position in * mouse position in

View File

@@ -49,7 +49,7 @@ ol.control.ScaleLineUnits = {
* *
* @constructor * @constructor
* @extends {ol.control.Control} * @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 stability experimental
* @todo observable units {ol.control.ScaleLineUnits} the units to use in the * @todo observable units {ol.control.ScaleLineUnits} the units to use in the
* scale line * scale line

View File

@@ -19,7 +19,7 @@ goog.require('ol.easing');
* use css selectors `.ol-zoom-in` and `.ol-zoom-out`. * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
* @constructor * @constructor
* @extends {ol.control.Control} * @extends {ol.control.Control}
* @param {ol.control.ZoomOptions=} opt_options Zoom options. * @param {olx.control.ZoomOptions=} opt_options Zoom options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.control.Zoom = function(opt_options) { ol.control.Zoom = function(opt_options) {

View File

@@ -37,7 +37,7 @@ ol.control.ZOOMSLIDER_ANIMATION_DURATION = 200;
* *
* @constructor * @constructor
* @extends {ol.control.Control} * @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 * @todo stability experimental
*/ */
ol.control.ZoomSlider = function(opt_options) { ol.control.ZoomSlider = function(opt_options) {

View File

@@ -17,7 +17,7 @@ goog.require('ol.css');
* css selector `.ol-zoom-extent`. * css selector `.ol-zoom-extent`.
* @constructor * @constructor
* @extends {ol.control.Control} * @extends {ol.control.Control}
* @param {ol.control.ZoomToExtentOptions=} opt_options Options. * @param {olx.control.ZoomToExtentOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.control.ZoomToExtent = function(opt_options) { ol.control.ZoomToExtent = function(opt_options) {

View File

@@ -67,7 +67,7 @@ ol.DeviceOrientationProperty = {
* *
* @constructor * @constructor
* @extends {ol.Object} * @extends {ol.Object}
* @param {ol.DeviceOrientationOptions=} opt_options Options. * @param {olx.DeviceOrientationOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
* @todo observable alpha {number} readonly the euler angle in radians of the * @todo observable alpha {number} readonly the euler angle in radians of the
* device from the standard X axis * device from the standard X axis

View File

@@ -45,7 +45,7 @@ ol.GeolocationProperty = {
* *
* @constructor * @constructor
* @extends {ol.Object} * @extends {ol.Object}
* @param {ol.GeolocationOptions=} opt_options Options. * @param {olx.GeolocationOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
* @todo observable accuracy {number} readonly the accuracy of the position * @todo observable accuracy {number} readonly the accuracy of the position
* measurement * measurement

View File

@@ -14,7 +14,7 @@ goog.require('ol.interaction.Interaction');
* *
* @constructor * @constructor
* @extends {ol.interaction.Interaction} * @extends {ol.interaction.Interaction}
* @param {ol.interaction.DoubleClickZoomOptions=} opt_options Options. * @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.DoubleClickZoom = function(opt_options) { ol.interaction.DoubleClickZoom = function(opt_options) {

View File

@@ -18,7 +18,7 @@ goog.require('ol.interaction.Drag');
* Allows the user to pan the map by clickng and dragging. * Allows the user to pan the map by clickng and dragging.
* @constructor * @constructor
* @extends {ol.interaction.Drag} * @extends {ol.interaction.Drag}
* @param {ol.interaction.DragPanOptions=} opt_options Options. * @param {olx.interaction.DragPanOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.DragPan = function(opt_options) { ol.interaction.DragPan = function(opt_options) {

View File

@@ -26,7 +26,7 @@ ol.interaction.DRAGROTATEANDZOOM_ANIMATION_DURATION = 400;
* This interaction is not included in the default interactions. * This interaction is not included in the default interactions.
* @constructor * @constructor
* @extends {ol.interaction.Drag} * @extends {ol.interaction.Drag}
* @param {ol.interaction.DragRotateAndZoomOptions=} opt_options Options. * @param {olx.interaction.DragRotateAndZoomOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.DragRotateAndZoom = function(opt_options) { ol.interaction.DragRotateAndZoom = function(opt_options) {

View File

@@ -21,7 +21,7 @@ ol.interaction.DRAGROTATE_ANIMATION_DURATION = 250;
* it to when the alt and shift keys are held down. * it to when the alt and shift keys are held down.
* @constructor * @constructor
* @extends {ol.interaction.Drag} * @extends {ol.interaction.Drag}
* @param {ol.interaction.DragRotateOptions=} opt_options Options. * @param {olx.interaction.DragRotateOptions=} opt_options Options.
*/ */
ol.interaction.DragRotate = function(opt_options) { ol.interaction.DragRotate = function(opt_options) {

View File

@@ -34,7 +34,7 @@ ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS_SQUARED =
* it to when the shift key is held down. * it to when the shift key is held down.
* @constructor * @constructor
* @extends {ol.interaction.Drag} * @extends {ol.interaction.Drag}
* @param {ol.interaction.DragZoomOptions=} opt_options Options. * @param {olx.interaction.DragZoomOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.DragZoom = function(opt_options) { ol.interaction.DragZoom = function(opt_options) {

View File

@@ -23,7 +23,7 @@ goog.require('ol.source.Vector');
/** /**
* Interaction that allows drawing geometries. * Interaction that allows drawing geometries.
* @param {ol.interaction.DrawOptions} options Options. * @param {olx.interaction.DrawOptions} options Options.
* @constructor * @constructor
* @extends {ol.interaction.Interaction} * @extends {ol.interaction.Interaction}
*/ */

View File

@@ -23,7 +23,7 @@ goog.require('ol.interaction.TouchZoom');
* {@link ol.interaction} instances and insert them into an * {@link ol.interaction} instances and insert them into an
* {@link ol.Collection} in the order you want before creating your ol.Map * {@link ol.Collection} in the order you want before creating your ol.Map
* instance. * 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 * @return {ol.Collection} A collection of interactions to be used with
* the ol.Map constructor's interactions option. * the ol.Map constructor's interactions option.
* @todo stability experimental * @todo stability experimental

View File

@@ -24,7 +24,7 @@ ol.interaction.KEYBOARD_PAN_DURATION = 100;
* Allows the user to pan the map using keyboard arrows. * Allows the user to pan the map using keyboard arrows.
* @constructor * @constructor
* @extends {ol.interaction.Interaction} * @extends {ol.interaction.Interaction}
* @param {ol.interaction.KeyboardPanOptions=} opt_options Options. * @param {olx.interaction.KeyboardPanOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.KeyboardPan = function(opt_options) { ol.interaction.KeyboardPan = function(opt_options) {

View File

@@ -13,7 +13,7 @@ goog.require('ol.interaction.Interaction');
/** /**
* Allows the user to zoom the map using keyboard + and -. * Allows the user to zoom the map using keyboard + and -.
* @constructor * @constructor
* @param {ol.interaction.KeyboardZoomOptions=} opt_options Options. * @param {olx.interaction.KeyboardZoomOptions=} opt_options Options.
* @extends {ol.interaction.Interaction} * @extends {ol.interaction.Interaction}
* @todo stability experimental * @todo stability experimental
*/ */

View File

@@ -38,7 +38,7 @@ ol.interaction.SegmentDataType;
/** /**
* @constructor * @constructor
* @extends {ol.interaction.Drag} * @extends {ol.interaction.Drag}
* @param {ol.interaction.ModifyOptions=} opt_options Options. * @param {olx.interaction.ModifyOptions=} opt_options Options.
*/ */
ol.interaction.Modify = function(opt_options) { ol.interaction.Modify = function(opt_options) {
goog.base(this); goog.base(this);

View File

@@ -27,7 +27,7 @@ ol.interaction.MOUSEWHEELZOOM_TIMEOUT_DURATION = 80;
* Allows the user to zoom the map by scrolling the mouse wheel. * Allows the user to zoom the map by scrolling the mouse wheel.
* @constructor * @constructor
* @extends {ol.interaction.Interaction} * @extends {ol.interaction.Interaction}
* @param {ol.interaction.MouseWheelZoomOptions=} opt_options Options. * @param {olx.interaction.MouseWheelZoomOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.MouseWheelZoom = function(opt_options) { ol.interaction.MouseWheelZoom = function(opt_options) {

View File

@@ -15,7 +15,7 @@ goog.require('ol.layer.Vector');
* Allows the user to select features on the map. * Allows the user to select features on the map.
* @constructor * @constructor
* @extends {ol.interaction.Interaction} * @extends {ol.interaction.Interaction}
* @param {ol.interaction.SelectOptions=} opt_options Options. * @param {olx.interaction.SelectOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.Select = function(opt_options) { ol.interaction.Select = function(opt_options) {

View File

@@ -15,7 +15,7 @@ goog.require('ol.interaction.Touch');
* on a touch screen. * on a touch screen.
* @constructor * @constructor
* @extends {ol.interaction.Touch} * @extends {ol.interaction.Touch}
* @param {ol.interaction.TouchPanOptions=} opt_options Options. * @param {olx.interaction.TouchPanOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.TouchPan = function(opt_options) { ol.interaction.TouchPan = function(opt_options) {

View File

@@ -21,7 +21,7 @@ ol.interaction.TOUCHROTATE_ANIMATION_DURATION = 250;
* on a touch screen. * on a touch screen.
* @constructor * @constructor
* @extends {ol.interaction.Touch} * @extends {ol.interaction.Touch}
* @param {ol.interaction.TouchRotateOptions=} opt_options Options. * @param {olx.interaction.TouchRotateOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.TouchRotate = function(opt_options) { ol.interaction.TouchRotate = function(opt_options) {

View File

@@ -15,7 +15,7 @@ goog.require('ol.interaction.Touch');
* on a touch screen. * on a touch screen.
* @constructor * @constructor
* @extends {ol.interaction.Touch} * @extends {ol.interaction.Touch}
* @param {ol.interaction.TouchZoomOptions=} opt_options Options. * @param {olx.interaction.TouchZoomOptions=} opt_options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.interaction.TouchZoom = function(opt_options) { ol.interaction.TouchZoom = function(opt_options) {

View File

@@ -8,7 +8,7 @@ goog.require('ol.source.Image');
/** /**
* @constructor * @constructor
* @extends {ol.layer.Layer} * @extends {ol.layer.Layer}
* @param {ol.layer.LayerOptions} options Layer options. * @param {olx.layer.LayerOptions} options Layer options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.layer.Image = function(options) { ol.layer.Image = function(options) {

View File

@@ -12,7 +12,7 @@ goog.require('ol.source.Source');
/** /**
* @constructor * @constructor
* @extends {ol.layer.Base} * @extends {ol.layer.Base}
* @param {ol.layer.LayerOptions} options Layer options. * @param {olx.layer.LayerOptions} options Layer options.
* @todo stability experimental * @todo stability experimental
* @todo observable brightness {number} the brightness of the layer * @todo observable brightness {number} the brightness of the layer
* @todo observable contrast {number} the contrast 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) { ol.layer.Layer = function(options) {
var baseOptions = /** @type {ol.layer.LayerOptions} */ var baseOptions = /** @type {olx.layer.LayerOptions} */
(goog.object.clone(options)); (goog.object.clone(options));
delete baseOptions.source; delete baseOptions.source;

View File

@@ -43,7 +43,7 @@ ol.layer.LayerState;
/** /**
* @constructor * @constructor
* @extends {ol.Object} * @extends {ol.Object}
* @param {ol.layer.BaseOptions} options Layer options. * @param {olx.layer.BaseOptions} options Layer options.
*/ */
ol.layer.Base = function(options) { ol.layer.Base = function(options) {

View File

@@ -26,7 +26,7 @@ ol.layer.GroupProperty = {
/** /**
* @constructor * @constructor
* @extends {ol.layer.Base} * @extends {ol.layer.Base}
* @param {ol.layer.GroupOptions=} opt_options Layer options. * @param {olx.layer.GroupOptions=} opt_options Layer options.
* @todo stability experimental * @todo stability experimental
* @todo observable layers {ol.Collection} collection of layers that are part * @todo observable layers {ol.Collection} collection of layers that are part
* of this group * of this group
@@ -34,7 +34,7 @@ ol.layer.GroupProperty = {
ol.layer.Group = function(opt_options) { ol.layer.Group = function(opt_options) {
var options = goog.isDef(opt_options) ? 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)); (goog.object.clone(options));
delete baseOptions.layers; delete baseOptions.layers;

View File

@@ -16,7 +16,7 @@ ol.layer.TileProperty = {
/** /**
* @constructor * @constructor
* @extends {ol.layer.Layer} * @extends {ol.layer.Layer}
* @param {ol.layer.TileOptions} options Tile layer options. * @param {olx.layer.TileOptions} options Tile layer options.
* @todo stability experimental * @todo stability experimental
* @todo observable preload {number} the level to preload tiles up to * @todo observable preload {number} the level to preload tiles up to
*/ */

View File

@@ -15,12 +15,12 @@ goog.require('ol.style.Style');
/** /**
* @constructor * @constructor
* @extends {ol.layer.Layer} * @extends {ol.layer.Layer}
* @param {ol.layer.VectorLayerOptions} options Vector layer options. * @param {olx.layer.VectorLayerOptions} options Vector layer options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.layer.Vector = function(options) { ol.layer.Vector = function(options) {
var baseOptions = /** @type {ol.layer.VectorLayerOptions} */ var baseOptions = /** @type {olx.layer.VectorLayerOptions} */
(goog.object.clone(options)); (goog.object.clone(options));
/** /**
@@ -45,7 +45,7 @@ ol.layer.Vector = function(options) {
*/ */
this.temporary_ = false; this.temporary_ = false;
goog.base(this, /** @type {ol.layer.LayerOptions} */ (baseOptions)); goog.base(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
}; };
goog.inherits(ol.layer.Vector, ol.layer.Layer); goog.inherits(ol.layer.Vector, ol.layer.Layer);

View File

@@ -141,7 +141,7 @@ ol.MapProperty = {
* *
* @constructor * @constructor
* @extends {ol.Object} * @extends {ol.Object}
* @param {ol.MapOptions} options Map options. * @param {olx.MapOptions} options Map options.
* @todo stability experimental * @todo stability experimental
* @todo observable layergroup {ol.layer.LayerGroup} a layer group containing * @todo observable layergroup {ol.layer.LayerGroup} a layer group containing
* the layers in this map. * the layers in this map.
@@ -563,7 +563,7 @@ ol.Map.prototype.getOverlays = function() {
/** /**
* Get feature information for a pixel on the map. * Get feature information for a pixel on the map.
* *
* @param {ol.GetFeatureInfoOptions} options Options. * @param {olx.GetFeatureInfoOptions} options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.Map.prototype.getFeatureInfo = function(options) { ol.Map.prototype.getFeatureInfo = function(options) {
@@ -577,7 +577,7 @@ ol.Map.prototype.getFeatureInfo = function(options) {
/** /**
* Get features for a pixel on the map. * Get features for a pixel on the map.
* *
* @param {ol.GetFeaturesOptions} options Options. * @param {olx.GetFeaturesOptions} options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.Map.prototype.getFeatures = function(options) { ol.Map.prototype.getFeatures = function(options) {
@@ -1241,7 +1241,7 @@ ol.MapOptionsInternal;
/** /**
* @param {ol.MapOptions} options Map options. * @param {olx.MapOptions} options Map options.
* @return {ol.MapOptionsInternal} Internal map options. * @return {ol.MapOptionsInternal} Internal map options.
*/ */
ol.Map.createOptionsInternal = function(options) { ol.Map.createOptionsInternal = function(options) {

View File

@@ -55,7 +55,7 @@ ol.OverlayPositioning = {
* *
* @constructor * @constructor
* @extends {ol.Object} * @extends {ol.Object}
* @param {ol.OverlayOptions} options Overlay options. * @param {olx.OverlayOptions} options Overlay options.
* @todo stability experimental * @todo stability experimental
* @todo observable element {Element} the Element containing the overlay * @todo observable element {Element} the Element containing the overlay
* @todo observable map {ol.Map} the map that the overlay is part of * @todo observable map {ol.Map} the map that the overlay is part of

View File

@@ -21,12 +21,12 @@ goog.require('ol.parser.XML');
* @implements {ol.parser.DomFeatureParser} * @implements {ol.parser.DomFeatureParser}
* @implements {ol.parser.StringFeatureParser} * @implements {ol.parser.StringFeatureParser}
* @implements {ol.parser.ObjectFeatureParser} * @implements {ol.parser.ObjectFeatureParser}
* @param {ol.parser.GPXOptions=} opt_options Optional configuration object. * @param {olx.parser.GPXOptions=} opt_options Optional configuration object.
* @extends {ol.parser.XML} * @extends {ol.parser.XML}
* @todo stability experimental * @todo stability experimental
*/ */
ol.parser.GPX = function(opt_options) { ol.parser.GPX = function(opt_options) {
var options = /** @type {ol.parser.GPXOptions} */ var options = /** @type {olx.parser.GPXOptions} */
(goog.isDef(opt_options) ? opt_options : {}); (goog.isDef(opt_options) ? opt_options : {});
this.extractAttributes = goog.isDef(options.extractAttributes) ? this.extractAttributes = goog.isDef(options.extractAttributes) ?
options.extractAttributes : true; options.extractAttributes : true;
@@ -269,7 +269,7 @@ ol.parser.GPX.prototype.readFeaturesFromObject = function(obj) {
/** /**
* @param {ol.parser.GPXWriteOptions} obj Object structure to write out * @param {olx.parser.GPXWriteOptions} obj Object structure to write out
* as GPX. * as GPX.
* @return {string} An string representing the GPX document. * @return {string} An string representing the GPX document.
*/ */

View File

@@ -40,12 +40,12 @@ goog.require('ol.style.Stroke');
* @implements {ol.parser.StringFeatureParser} * @implements {ol.parser.StringFeatureParser}
* @implements {ol.parser.AsyncObjectFeatureParser} * @implements {ol.parser.AsyncObjectFeatureParser}
* @implements {ol.parser.AsyncStringFeatureParser} * @implements {ol.parser.AsyncStringFeatureParser}
* @param {ol.parser.KMLOptions=} opt_options Optional configuration object. * @param {olx.parser.KMLOptions=} opt_options Optional configuration object.
* @extends {ol.parser.XML} * @extends {ol.parser.XML}
* @todo stability experimental * @todo stability experimental
*/ */
ol.parser.KML = function(opt_options) { ol.parser.KML = function(opt_options) {
var options = /** @type {ol.parser.KMLOptions} */ var options = /** @type {olx.parser.KMLOptions} */
(goog.isDef(opt_options) ? opt_options : {}); (goog.isDef(opt_options) ? opt_options : {});
this.extractAttributes = goog.isDef(options.extractAttributes) ? this.extractAttributes = goog.isDef(options.extractAttributes) ?
options.extractAttributes : true; options.extractAttributes : true;

View File

@@ -649,6 +649,6 @@ ol.parser.ogc.Filter_v1.prototype.setSrsName = function(srsName) {
this.srsName = srsName; this.srsName = srsName;
if (goog.isDefAndNotNull(this.gmlParser_)) { if (goog.isDefAndNotNull(this.gmlParser_)) {
this.gmlParser_.applyWriteOptions({}, this.gmlParser_.applyWriteOptions({},
/** @type {ol.parser.GMLWriteOptions} */ ({srsName: srsName})); /** @type {olx.parser.GMLWriteOptions} */ ({srsName: srsName}));
} }
}; };

View File

@@ -22,12 +22,12 @@ goog.require('ol.proj');
/** /**
* @constructor * @constructor
* @implements {ol.parser.StringFeatureParser} * @implements {ol.parser.StringFeatureParser}
* @param {ol.parser.GMLOptions=} opt_options * @param {olx.parser.GMLOptions=} opt_options
* Optional configuration object. * Optional configuration object.
* @extends {ol.parser.XML} * @extends {ol.parser.XML}
*/ */
ol.parser.ogc.GML = function(opt_options) { ol.parser.ogc.GML = function(opt_options) {
var options = /** @type {ol.parser.GMLOptions} */ var options = /** @type {olx.parser.GMLOptions} */
(goog.isDef(opt_options) ? opt_options : {}); (goog.isDef(opt_options) ? opt_options : {});
this.extractAttributes = goog.isDef(options.extractAttributes) ? this.extractAttributes = goog.isDef(options.extractAttributes) ?
options.extractAttributes : true; options.extractAttributes : true;
@@ -491,7 +491,7 @@ ol.parser.ogc.GML.prototype.writeGeometry = function(geometry) {
/** /**
* @param {string|Document|Element|Object} data Data to read. * @param {string|Document|Element|Object} data Data to read.
* @param {ol.parser.GMLReadOptions=} opt_options Read options. * @param {olx.parser.GMLReadOptions=} opt_options Read options.
* @return {ol.parser.ReadFeaturesResult} An object representing the document. * @return {ol.parser.ReadFeaturesResult} An object representing the document.
*/ */
ol.parser.ogc.GML.prototype.read = function(data, opt_options) { ol.parser.ogc.GML.prototype.read = function(data, opt_options) {
@@ -630,7 +630,7 @@ ol.parser.ogc.GML.prototype.readFeaturesFromString = function(str) {
* Applies the writeOptions passed into the write function. * Applies the writeOptions passed into the write function.
* @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as * @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as
* GML. * GML.
* @param {ol.parser.GMLWriteOptions=} opt_options Write options. * @param {olx.parser.GMLWriteOptions=} opt_options Write options.
*/ */
ol.parser.ogc.GML.prototype.applyWriteOptions = function(obj, opt_options) { ol.parser.ogc.GML.prototype.applyWriteOptions = function(obj, opt_options) {
// srsName handling: opt_options -> this.writeOptions -> obj.metadata // srsName handling: opt_options -> this.writeOptions -> obj.metadata

View File

@@ -11,7 +11,7 @@ goog.require('ol.parser.ogc.GML');
* version 2.1.2 * version 2.1.2
* *
* @constructor * @constructor
* @param {ol.parser.GMLOptions=} opt_options Optional configuration object. * @param {olx.parser.GMLOptions=} opt_options Optional configuration object.
* @extends {ol.parser.ogc.GML} * @extends {ol.parser.ogc.GML}
* @todo stability experimental * @todo stability experimental
*/ */
@@ -127,7 +127,7 @@ goog.inherits(ol.parser.ogc.GML_v2, ol.parser.ogc.GML);
/** /**
* @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as * @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as
* GML. * GML.
* @param {ol.parser.GMLWriteOptions=} opt_options Write options. * @param {olx.parser.GMLWriteOptions=} opt_options Write options.
* @return {string} A string representing the GML document. * @return {string} A string representing the GML document.
* @todo stability experimental * @todo stability experimental
*/ */

View File

@@ -13,7 +13,7 @@ goog.require('ol.parser.ogc.GML');
* version 3.1.1 * version 3.1.1
* *
* @constructor * @constructor
* @param {ol.parser.GMLOptions=} opt_options Optional configuration object. * @param {olx.parser.GMLOptions=} opt_options Optional configuration object.
* @extends {ol.parser.ogc.GML} * @extends {ol.parser.ogc.GML}
* @todo stability experimental * @todo stability experimental
*/ */
@@ -425,7 +425,7 @@ goog.inherits(ol.parser.ogc.GML_v3, ol.parser.ogc.GML);
/** /**
* @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as * @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as
* XML. * XML.
* @param {ol.parser.GMLWriteOptions=} opt_options Write options. * @param {olx.parser.GMLWriteOptions=} opt_options Write options.
* @return {string} An string representing the XML document. * @return {string} An string representing the XML document.
* @todo stability experimental * @todo stability experimental
*/ */

View File

@@ -89,7 +89,7 @@ ol.parser.ogc.SLD_v1 = function() {
delete config.fill; delete config.fill;
config.zIndex = this.featureTypeCounter; config.zIndex = this.featureTypeCounter;
rule.symbolizers.push( rule.symbolizers.push(
new ol.style.Text(/** @type {ol.style.TextOptions} */(config)) new ol.style.Text(/** @type {olx.style.TextOptions} */(config))
); );
}, },
'Label': function(node, symbolizer) { 'Label': function(node, symbolizer) {
@@ -197,7 +197,7 @@ ol.parser.ogc.SLD_v1 = function() {
if (goog.isDef(config.externalGraphic)) { if (goog.isDef(config.externalGraphic)) {
config.width = config.height = config.size; config.width = config.height = config.size;
symbolizer = new ol.style.Icon( symbolizer = new ol.style.Icon(
/** @type {ol.style.IconOptions} */(config)); /** @type {olx.style.IconOptions} */(config));
} else { } else {
symbolizer = new ol.style.Shape(config); symbolizer = new ol.style.Shape(config);
} }
@@ -689,7 +689,7 @@ ol.parser.ogc.SLD_v1.prototype.getScaleDenominatorFromResolution_ =
/** /**
* @param {string|Document|Element} data Data to read. * @param {string|Document|Element} data Data to read.
* @param {ol.parser.SLDReadOptions=} opt_options Read options. * @param {olx.parser.SLDReadOptions=} opt_options Read options.
* @return {Object} An object representing the document. * @return {Object} An object representing the document.
*/ */
ol.parser.ogc.SLD_v1.prototype.read = function(data, opt_options) { ol.parser.ogc.SLD_v1.prototype.read = function(data, opt_options) {
@@ -713,7 +713,7 @@ ol.parser.ogc.SLD_v1.prototype.read = function(data, opt_options) {
/** /**
* @param {Object} style The style to write out. * @param {Object} style The style to write out.
* @param {ol.parser.SLDWriteOptions=} opt_options Write options. * @param {olx.parser.SLDWriteOptions=} opt_options Write options.
* @return {string} The serialized SLD. * @return {string} The serialized SLD.
*/ */
ol.parser.ogc.SLD_v1.prototype.write = function(style, opt_options) { ol.parser.ogc.SLD_v1.prototype.write = function(style, opt_options) {

View File

@@ -28,7 +28,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) {
this.writers = {}; this.writers = {};
this.writers[this.defaultNamespaceURI] = { this.writers[this.defaultNamespaceURI] = {
/** /**
* @param {ol.parser.WFSWriteGetFeatureOptions} options Options. * @param {olx.parser.WFSWriteGetFeatureOptions} options Options.
* @return {{node: Node, * @return {{node: Node,
* options: ol.parser.WFSWriteGetFeatureOptions}} Object. * options: ol.parser.WFSWriteGetFeatureOptions}} Object.
* @this {ol.parser.XML} * @this {ol.parser.XML}
@@ -338,7 +338,7 @@ ol.parser.ogc.WFS_v1.prototype.read = function(data) {
/** /**
* @param {ol.parser.WFSWriteGetFeatureOptions} options Options. * @param {olx.parser.WFSWriteGetFeatureOptions} options Options.
* @return {string} A serialized WFS GetFeature query. * @return {string} A serialized WFS GetFeature query.
*/ */
ol.parser.ogc.WFS_v1.prototype.writeGetFeature = function(options) { ol.parser.ogc.WFS_v1.prototype.writeGetFeature = function(options) {
@@ -352,7 +352,7 @@ ol.parser.ogc.WFS_v1.prototype.writeGetFeature = function(options) {
* @param {Array.<ol.Feature>} inserts The features to insert. * @param {Array.<ol.Feature>} inserts The features to insert.
* @param {Array.<ol.Feature>} updates The features to update. * @param {Array.<ol.Feature>} updates The features to update.
* @param {Array.<ol.Feature>} deletes The features to delete. * @param {Array.<ol.Feature>} deletes The features to delete.
* @param {ol.parser.WFSWriteTransactionOptions} options Write options. * @param {olx.parser.WFSWriteTransactionOptions} options Write options.
* @return {string} A serialized WFS transaction. * @return {string} A serialized WFS transaction.
*/ */
ol.parser.ogc.WFS_v1.prototype.writeTransaction = ol.parser.ogc.WFS_v1.prototype.writeTransaction =

View File

@@ -58,7 +58,7 @@ ol.METERS_PER_UNIT[ol.proj.Units.METERS] = 1;
/** /**
* @constructor * @constructor
* @param {ol.ProjectionOptions} options Projection options. * @param {olx.ProjectionOptions} options Projection options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.proj.Projection = function(options) { ol.proj.Projection = function(options) {
@@ -198,14 +198,14 @@ ol.proj.Projection.prototype.setDefaultTileGrid = function(tileGrid) {
* @constructor * @constructor
* @extends {ol.proj.Projection} * @extends {ol.proj.Projection}
* @param {Proj4js.Proj} proj4jsProj Proj4js projection. * @param {Proj4js.Proj} proj4jsProj Proj4js projection.
* @param {ol.Proj4jsProjectionOptions} options Proj4js projection options. * @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
* @private * @private
*/ */
ol.Proj4jsProjection_ = function(proj4jsProj, options) { ol.Proj4jsProjection_ = function(proj4jsProj, options) {
var units = /** @type {ol.proj.Units} */ (proj4jsProj.units); var units = /** @type {ol.proj.Units} */ (proj4jsProj.units);
var config = /** @type {ol.ProjectionOptions} */ ({ var config = /** @type {olx.ProjectionOptions} */ ({
units: units, units: units,
axisOrientation: proj4jsProj.axis axisOrientation: proj4jsProj.axis
}); });
@@ -491,7 +491,7 @@ ol.proj.get = function(projectionLike) {
/** /**
* @param {ol.Proj4jsProjectionOptions} options Proj4js projection options. * @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
* @private * @private
* @return {ol.Proj4jsProjection_} Proj4js projection. * @return {ol.Proj4jsProjection_} Proj4js projection.
*/ */
@@ -504,7 +504,7 @@ ol.proj.getProj4jsProjectionFromCode_ = function(options) {
var srsCode = proj4jsProj.srsCode; var srsCode = proj4jsProj.srsCode;
proj4jsProjection = proj4jsProjections[srsCode]; proj4jsProjection = proj4jsProjections[srsCode];
if (!goog.isDef(proj4jsProjection)) { if (!goog.isDef(proj4jsProjection)) {
var config = /** @type {ol.Proj4jsProjectionOptions} */ var config = /** @type {olx.Proj4jsProjectionOptions} */
(goog.object.clone(options)); (goog.object.clone(options));
config.code = srsCode; config.code = srsCode;
proj4jsProjection = new ol.Proj4jsProjection_(proj4jsProj, config); proj4jsProjection = new ol.Proj4jsProjection_(proj4jsProj, config);
@@ -709,7 +709,7 @@ ol.proj.transformWithProjections =
/** /**
* @param {ol.Proj4jsProjectionOptions} options Proj4js projection options. * @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
* @return {ol.proj.Projection} Proj4js projection. * @return {ol.proj.Projection} Proj4js projection.
* @todo stability experimental * @todo stability experimental
*/ */

View File

@@ -18,7 +18,7 @@ goog.require('ol.tilegrid.XYZ');
/** /**
* @constructor * @constructor
* @extends {ol.source.TileImage} * @extends {ol.source.TileImage}
* @param {ol.source.BingMapsOptions} options Bing Maps options. * @param {olx.source.BingMapsOptions} options Bing Maps options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.BingMaps = function(options) { ol.source.BingMaps = function(options) {

View File

@@ -85,7 +85,7 @@ ol.DebugTile_.prototype.getImage = function(opt_context) {
/** /**
* @constructor * @constructor
* @extends {ol.source.Tile} * @extends {ol.source.Tile}
* @param {ol.source.TileDebugOptions} options Debug tile options. * @param {olx.source.TileDebugOptions} options Debug tile options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.TileDebug = function(options) { ol.source.TileDebug = function(options) {

View File

@@ -30,7 +30,7 @@ ol.source.ImageOptions;
/** /**
* @constructor * @constructor
* @extends {ol.source.Source} * @extends {ol.source.Source}
* @param {ol.source.ImageOptions} options Single image source options. * @param {olx.source.ImageOptions} options Single image source options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.Image = function(options) { ol.source.Image = function(options) {

View File

@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
/** /**
* @constructor * @constructor
* @extends {ol.source.Image} * @extends {ol.source.Image}
* @param {ol.source.ImageStaticOptions} options Options. * @param {olx.source.ImageStaticOptions} options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.ImageStatic = function(options) { ol.source.ImageStatic = function(options) {

View File

@@ -15,7 +15,7 @@ goog.require('ol.source.wms');
* @constructor * @constructor
* @extends {ol.source.Image} * @extends {ol.source.Image}
* @implements {ol.source.FeatureInfoSource} * @implements {ol.source.FeatureInfoSource}
* @param {ol.source.ImageWMSOptions} options Options. * @param {olx.source.ImageWMSOptions} options Options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.ImageWMS = function(options) { ol.source.ImageWMS = function(options) {
@@ -42,11 +42,11 @@ ol.source.ImageWMS = function(options) {
/** /**
* @private * @private
* @type {ol.source.WMSGetFeatureInfoOptions} * @type {olx.source.WMSGetFeatureInfoOptions}
*/ */
this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ? this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
options.getFeatureInfoOptions : options.getFeatureInfoOptions :
/** @type {ol.source.WMSGetFeatureInfoOptions} */ ({}); /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({});
/** /**
* @private * @private

View File

@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
/** /**
* @constructor * @constructor
* @extends {ol.source.Image} * @extends {ol.source.Image}
* @param {ol.source.MapGuideOptions} options Options. * @param {olx.source.MapGuideOptions} options Options.
*/ */
ol.source.MapGuide = function(options) { ol.source.MapGuide = function(options) {

View File

@@ -10,7 +10,7 @@ goog.require('ol.source.XYZ');
/** /**
* @constructor * @constructor
* @extends {ol.source.XYZ} * @extends {ol.source.XYZ}
* @param {ol.source.MapQuestOptions=} opt_options MapQuest options. * @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.MapQuestOSM = function(opt_options) { ol.source.MapQuestOSM = function(opt_options) {
@@ -43,7 +43,7 @@ goog.inherits(ol.source.MapQuestOSM, ol.source.XYZ);
/** /**
* @constructor * @constructor
* @extends {ol.source.XYZ} * @extends {ol.source.XYZ}
* @param {ol.source.MapQuestOptions=} opt_options MapQuest options. * @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.MapQuestOpenAerial = function(opt_options) { ol.source.MapQuestOpenAerial = function(opt_options) {

View File

@@ -8,7 +8,7 @@ goog.require('ol.source.XYZ');
/** /**
* @constructor * @constructor
* @extends {ol.source.XYZ} * @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 * @todo stability experimental
*/ */
ol.source.OSM = function(opt_options) { ol.source.OSM = function(opt_options) {

View File

@@ -33,7 +33,7 @@ ol.source.SourceOptions;
/** /**
* @constructor * @constructor
* @extends {goog.events.EventTarget} * @extends {goog.events.EventTarget}
* @param {ol.source.SourceOptions} options Source options. * @param {olx.source.SourceOptions} options Source options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.Source = function(options) { ol.source.Source = function(options) {

View File

@@ -80,7 +80,7 @@ ol.source.StamenProviderConfig = {
/** /**
* @constructor * @constructor
* @extends {ol.source.XYZ} * @extends {ol.source.XYZ}
* @param {ol.source.StamenOptions} options Stamen options. * @param {olx.source.StamenOptions} options Stamen options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.Stamen = function(options) { ol.source.Stamen = function(options) {

View File

@@ -34,7 +34,7 @@ ol.source.TileImageOptions;
/** /**
* @constructor * @constructor
* @extends {ol.source.Tile} * @extends {ol.source.Tile}
* @param {ol.source.TileImageOptions} options Image tile options. * @param {olx.source.TileImageOptions} options Image tile options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.TileImage = function(options) { ol.source.TileImage = function(options) {

View File

@@ -40,7 +40,7 @@ goog.exportSymbol('grid', grid);
/** /**
* @constructor * @constructor
* @extends {ol.source.TileImage} * @extends {ol.source.TileImage}
* @param {ol.source.TileJSONOptions} options TileJSON options. * @param {olx.source.TileJSONOptions} options TileJSON options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.TileJSON = function(options) { ol.source.TileJSON = function(options) {

View File

@@ -27,7 +27,7 @@ ol.source.TileOptions;
/** /**
* @constructor * @constructor
* @extends {ol.source.Source} * @extends {ol.source.Source}
* @param {ol.source.TileOptions} options Tile source options. * @param {olx.source.TileOptions} options Tile source options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.Tile = function(options) { ol.source.Tile = function(options) {

View File

@@ -19,7 +19,7 @@ goog.require('ol.source.wms');
* @constructor * @constructor
* @extends {ol.source.TileImage} * @extends {ol.source.TileImage}
* @implements {ol.source.FeatureInfoSource} * @implements {ol.source.FeatureInfoSource}
* @param {ol.source.TileWMSOptions} options Tile WMS options. * @param {olx.source.TileWMSOptions} options Tile WMS options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.TileWMS = function(options) { ol.source.TileWMS = function(options) {
@@ -107,11 +107,11 @@ ol.source.TileWMS = function(options) {
/** /**
* @private * @private
* @type {ol.source.WMSGetFeatureInfoOptions} * @type {olx.source.WMSGetFeatureInfoOptions}
*/ */
this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ? this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
options.getFeatureInfoOptions : options.getFeatureInfoOptions :
/** @type {ol.source.WMSGetFeatureInfoOptions} */ ({}); /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({});
}; };
goog.inherits(ol.source.TileWMS, ol.source.TileImage); goog.inherits(ol.source.TileWMS, ol.source.TileImage);

View File

@@ -32,7 +32,7 @@ ol.source.VectorLoadState = {
/** /**
* @constructor * @constructor
* @extends {ol.source.Source} * @extends {ol.source.Source}
* @param {ol.source.VectorOptions=} opt_options Vector source options. * @param {olx.source.VectorOptions=} opt_options Vector source options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.Vector = function(opt_options) { ol.source.Vector = function(opt_options) {

View File

@@ -74,7 +74,7 @@ ol.source.wms.getUrl =
/** /**
* @param {string} url URL as provided by the url function. * @param {string} url URL as provided by the url function.
* @param {ol.Pixel} pixel Pixel. * @param {ol.Pixel} pixel Pixel.
* @param {ol.source.WMSGetFeatureInfoOptions} options Options as defined in the * @param {olx.source.WMSGetFeatureInfoOptions} options Options as defined in the
* source. * source.
* @param {function(string)} success Callback function for successful queries. * @param {function(string)} success Callback function for successful queries.
* @param {function()=} opt_error Optional callback function for unsuccessful * @param {function()=} opt_error Optional callback function for unsuccessful
@@ -86,9 +86,9 @@ ol.source.wms.getFeatureInfo =
// closure // closure
url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo') url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo')
.replace(ol.source.wms.regExes.layers, 'LAYERS=$1&QUERY_LAYERS=$1'); .replace(ol.source.wms.regExes.layers, 'LAYERS=$1&QUERY_LAYERS=$1');
options = /** @type {ol.source.WMSGetFeatureInfoOptions} */ options = /** @type {olx.source.WMSGetFeatureInfoOptions} */
(goog.isDef(options) ? goog.object.clone(options) : {}); (goog.isDef(options) ? goog.object.clone(options) : {});
var localOptions = /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({ var localOptions = /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({
method: ol.source.WMSGetFeatureInfoMethod.IFRAME, method: ol.source.WMSGetFeatureInfoMethod.IFRAME,
params: {} params: {}
}); });

View File

@@ -28,7 +28,7 @@ ol.source.WMTSRequestEncoding = {
/** /**
* @constructor * @constructor
* @extends {ol.source.TileImage} * @extends {ol.source.TileImage}
* @param {ol.source.WMTSOptions} options WMTS options. * @param {olx.source.WMTSOptions} options WMTS options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.WMTS = function(options) { 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 {Object} wmtsCap An object representing the capabilities document.
* @param {string} layer The layer identifier. * @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 * @todo stability experimental
*/ */
ol.source.WMTS.optionsFromCapabilities = function(wmtsCap, layer) { ol.source.WMTS.optionsFromCapabilities = function(wmtsCap, layer) {

View File

@@ -12,7 +12,7 @@ goog.require('ol.tilegrid.XYZ');
/** /**
* @constructor * @constructor
* @extends {ol.source.TileImage} * @extends {ol.source.TileImage}
* @param {ol.source.XYZOptions} options XYZ options. * @param {olx.source.XYZOptions} options XYZ options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.source.XYZ = function(options) { ol.source.XYZ = function(options) {

View File

@@ -14,7 +14,7 @@ goog.require('ol.style.Symbolizer');
/** /**
* @constructor * @constructor
* @extends {ol.style.Symbolizer} * @extends {ol.style.Symbolizer}
* @param {ol.style.FillOptions=} opt_options Polygon options. * @param {olx.style.FillOptions=} opt_options Polygon options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.style.Fill = function(opt_options) { ol.style.Fill = function(opt_options) {

View File

@@ -21,7 +21,7 @@ ol.style.IconLiteralOptions;
/** /**
* @constructor * @constructor
* @extends {ol.style.PointLiteral} * @extends {ol.style.PointLiteral}
* @param {ol.style.IconLiteralOptions} options Icon literal options. * @param {olx.style.IconLiteralOptions} options Icon literal options.
*/ */
ol.style.IconLiteral = function(options) { ol.style.IconLiteral = function(options) {

View File

@@ -14,7 +14,7 @@ goog.require('ol.style.Point');
/** /**
* @constructor * @constructor
* @extends {ol.style.Point} * @extends {ol.style.Point}
* @param {ol.style.IconOptions} options Icon options. * @param {olx.style.IconOptions} options Icon options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.style.Icon = function(options) { ol.style.Icon = function(options) {

View File

@@ -17,7 +17,7 @@ ol.style.LineLiteralOptions;
/** /**
* @constructor * @constructor
* @extends {ol.style.Literal} * @extends {ol.style.Literal}
* @param {ol.style.LineLiteralOptions} options Line literal options. * @param {olx.style.LineLiteralOptions} options Line literal options.
*/ */
ol.style.LineLiteral = function(options) { ol.style.LineLiteral = function(options) {
goog.base(this); goog.base(this);

View File

@@ -19,7 +19,7 @@ ol.style.PolygonLiteralOptions;
/** /**
* @constructor * @constructor
* @extends {ol.style.Literal} * @extends {ol.style.Literal}
* @param {ol.style.PolygonLiteralOptions} options Polygon literal options. * @param {olx.style.PolygonLiteralOptions} options Polygon literal options.
*/ */
ol.style.PolygonLiteral = function(options) { ol.style.PolygonLiteral = function(options) {
goog.base(this); goog.base(this);

View File

@@ -11,7 +11,7 @@ goog.require('ol.style.Symbolizer');
/** /**
* @constructor * @constructor
* @param {ol.style.RuleOptions} options Rule options. * @param {olx.style.RuleOptions} options Rule options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.style.Rule = function(options) { ol.style.Rule = function(options) {

View File

@@ -31,7 +31,7 @@ ol.style.ShapeLiteralOptions;
/** /**
* @constructor * @constructor
* @extends {ol.style.PointLiteral} * @extends {ol.style.PointLiteral}
* @param {ol.style.ShapeLiteralOptions} options Shape literal options. * @param {olx.style.ShapeLiteralOptions} options Shape literal options.
*/ */
ol.style.ShapeLiteral = function(options) { ol.style.ShapeLiteral = function(options) {

View File

@@ -17,7 +17,7 @@ goog.require('ol.style.Stroke');
/** /**
* @constructor * @constructor
* @extends {ol.style.Point} * @extends {ol.style.Point}
* @param {ol.style.ShapeOptions} options Shape options. * @param {olx.style.ShapeOptions} options Shape options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.style.Shape = function(options) { ol.style.Shape = function(options) {

View File

@@ -16,7 +16,7 @@ goog.require('ol.style.Symbolizer');
/** /**
* @constructor * @constructor
* @extends {ol.style.Symbolizer} * @extends {ol.style.Symbolizer}
* @param {ol.style.StrokeOptions=} opt_options Stroke options. * @param {olx.style.StrokeOptions=} opt_options Stroke options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.style.Stroke = function(opt_options) { ol.style.Stroke = function(opt_options) {

View File

@@ -21,7 +21,7 @@ goog.require('ol.style.TextLiteral');
/** /**
* @constructor * @constructor
* @param {ol.style.StyleOptions} options Style options. * @param {olx.style.StyleOptions} options Style options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.style.Style = function(options) { ol.style.Style = function(options) {

View File

@@ -23,7 +23,7 @@ ol.style.TextLiteralOptions;
/** /**
* @constructor * @constructor
* @extends {ol.style.Literal} * @extends {ol.style.Literal}
* @param {ol.style.TextLiteralOptions} options Text literal options. * @param {olx.style.TextLiteralOptions} options Text literal options.
*/ */
ol.style.TextLiteral = function(options) { ol.style.TextLiteral = function(options) {

View File

@@ -13,7 +13,7 @@ goog.require('ol.style.TextLiteral');
/** /**
* @constructor * @constructor
* @extends {ol.style.Symbolizer} * @extends {ol.style.Symbolizer}
* @param {ol.style.TextOptions} options Text options. * @param {olx.style.TextOptions} options Text options.
*/ */
ol.style.Text = function(options) { ol.style.Text = function(options) {

View File

@@ -27,7 +27,7 @@ ol.DEFAULT_MAX_ZOOM = 42;
/** /**
* @constructor * @constructor
* @param {ol.tilegrid.TileGridOptions} options Tile grid options. * @param {olx.tilegrid.TileGridOptions} options Tile grid options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.tilegrid.TileGrid = function(options) { ol.tilegrid.TileGrid = function(options) {

View File

@@ -10,7 +10,7 @@ goog.require('ol.tilegrid.TileGrid');
/** /**
* @constructor * @constructor
* @extends {ol.tilegrid.TileGrid} * @extends {ol.tilegrid.TileGrid}
* @param {ol.tilegrid.WMTSOptions} options WMTS options. * @param {olx.tilegrid.WMTSOptions} options WMTS options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.tilegrid.WMTS = function(options) { ol.tilegrid.WMTS = function(options) {

View File

@@ -12,7 +12,7 @@ goog.require('ol.tilegrid.TileGrid');
/** /**
* @constructor * @constructor
* @extends {ol.tilegrid.TileGrid} * @extends {ol.tilegrid.TileGrid}
* @param {ol.tilegrid.XYZOptions} options XYZ options. * @param {olx.tilegrid.XYZOptions} options XYZ options.
* @todo stability experimental * @todo stability experimental
*/ */
ol.tilegrid.XYZ = function(options) { ol.tilegrid.XYZ = function(options) {

View File

@@ -84,7 +84,7 @@ ol.View2DProperty = {
* @implements {ol.IView2D} * @implements {ol.IView2D}
* @implements {ol.IView3D} * @implements {ol.IView3D}
* @extends {ol.View} * @extends {ol.View}
* @param {ol.View2DOptions=} opt_options View2D options. * @param {olx.View2DOptions=} opt_options View2D options.
* @todo stability experimental * @todo stability experimental
* @todo observable center {ol.Coordinate} the center of the view * @todo observable center {ol.Coordinate} the center of the view
* @todo observable projection {ol.proj.Projection} the projection of the view * @todo observable projection {ol.proj.Projection} the projection of the view
@@ -501,7 +501,7 @@ ol.View2D.prototype.setZoom = function(zoom) {
/** /**
* @param {ol.View2DOptions} options View2D options. * @param {olx.View2DOptions} options View2D options.
* @private * @private
* @return {ol.CenterConstraintType} * @return {ol.CenterConstraintType}
*/ */
@@ -516,7 +516,7 @@ ol.View2D.createCenterConstraint_ = function(options) {
/** /**
* @private * @private
* @param {ol.View2DOptions} options View2D options. * @param {olx.View2DOptions} options View2D options.
* @return {{constraint: ol.ResolutionConstraintType, maxResolution: number, * @return {{constraint: ol.ResolutionConstraintType, maxResolution: number,
* minResolution: number}} * minResolution: number}}
*/ */
@@ -563,7 +563,7 @@ ol.View2D.createResolutionConstraint_ = function(options) {
/** /**
* @private * @private
* @param {ol.View2DOptions} options View2D options. * @param {olx.View2DOptions} options View2D options.
* @return {ol.RotationConstraintType} Rotation constraint. * @return {ol.RotationConstraintType} Rotation constraint.
*/ */
ol.View2D.createRotationConstraint_ = function(options) { ol.View2D.createRotationConstraint_ = function(options) {