From cfb3e7310fcf3015eaf6d8c27f7efbc2f4151a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 13:41:02 +0100 Subject: [PATCH 01/15] No longer generate src/external/src/types.js --- build.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/build.py b/build.py index f7d1bb8a17..c001fd0f2d 100755 --- a/build.py +++ b/build.py @@ -91,8 +91,7 @@ EXPORTS = [path EXTERNAL_SRC = [ 'build/src/external/externs/types.js', - 'build/src/external/src/exports.js', - 'build/src/external/src/types.js'] + 'build/src/external/src/exports.js'] EXAMPLES = [path for path in ifind('examples') @@ -237,13 +236,6 @@ def build_src_external_src_exports_js(t): '--exports', 'src/objectliterals.jsdoc', EXPORTS) -@target('build/src/external/src/types.js', 'bin/generate-exports.py', - 'src/objectliterals.jsdoc') -def build_src_external_src_types_js(t): - t.output('%(PYTHON)s', 'bin/generate-exports.py', - '--typedef', 'src/objectliterals.jsdoc') - - for glsl_src in GLSL_SRC: def shader_src_helper(glsl_src): @target(glsl_src.replace('.glsl', 'shader.js'), glsl_src, From ff49b89f6216facf92c3b4285d617ad42e23f308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 13:43:38 +0100 Subject: [PATCH 02/15] File types.js no longer an input for ol-all.js --- buildcfg/ol-all.json | 1 - 1 file changed, 1 deletion(-) diff --git a/buildcfg/ol-all.json b/buildcfg/ol-all.json index b3a6cfd3de..02563fec18 100644 --- a/buildcfg/ol-all.json +++ b/buildcfg/ol-all.json @@ -18,7 +18,6 @@ "inputs": [ "../build/src/internal/src/requireall.js", - "../build/src/internal/src/types.js", "../build/src/external/src/exports.js" ] From f5481ac2f5c09db0f12f335c7947ba137f8c8efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 13:44:15 +0100 Subject: [PATCH 03/15] File types.js no longer an input for ol-simple.js --- buildcfg/ol-simple.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildcfg/ol-simple.json b/buildcfg/ol-simple.json index 93192f4484..4afa4b5ff6 100644 --- a/buildcfg/ol-simple.json +++ b/buildcfg/ol-simple.json @@ -14,6 +14,7 @@ "externs": [ "//json.js", + "../build/src/external/externs/types.js", "../externs/bingmaps.js", "../externs/geojson.js", "../externs/topojson.js", @@ -27,7 +28,7 @@ "inputs": [ "../build/src/internal/src/requireall.js", - "../build/src/internal/src/types.js" + "../build/src/external/src/exports.js" ], "mode": "SIMPLE", From a1b7d512eb0768e407bcba2d69b5e4fee6ca5e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 13:45:11 +0100 Subject: [PATCH 04/15] File types.js no longer an input for ol-whitespace.js --- buildcfg/ol-whitespace.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildcfg/ol-whitespace.json b/buildcfg/ol-whitespace.json index c17f47682b..b74b4a8376 100644 --- a/buildcfg/ol-whitespace.json +++ b/buildcfg/ol-whitespace.json @@ -27,8 +27,7 @@ "inherits": "ol.json", "inputs": [ - "../build/src/internal/src/requireall.js", - "../build/src/internal/src/types.js" + "../build/src/internal/src/requireall.js" ], "mode": "WHITESPACE", From 875b5e1c0e28204238c9a99453e621946f6458fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 13:45:47 +0100 Subject: [PATCH 05/15] File types.js no longer an input for ol.js --- buildcfg/ol.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildcfg/ol.json b/buildcfg/ol.json index a315972e4a..6c207af40a 100644 --- a/buildcfg/ol.json +++ b/buildcfg/ol.json @@ -27,8 +27,7 @@ "inherits": "base.json", "inputs": [ - "../build/src/external/src/exports.js", - "../build/src/external/src/types.js" + "../build/src/external/src/exports.js" ], "output-wrapper": "// OpenLayers 3. see http://ol3js.org/\n(function(){%output%})();", From ef703c71479d867d90d32aeb8cfd61f0a14ceaa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 14:12:02 +0100 Subject: [PATCH 06/15] Use olx namespace in src/objectliterals.jsdoc sed comment used: sed -ri 's/ol(\.\S*Options)/olx\1/' src/objectliterals.jsdoc --- src/objectliterals.jsdoc | 168 +++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index 8499475241..898a48adb3 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -1,5 +1,5 @@ /** - * @typedef {Object} ol.AttributionOptions + * @typedef {Object} olx.AttributionOptions * @property {string} html HTML markup for this attribution. * @property {Object.>|undefined} tileRanges * Tile ranges (FOR INTERNAL USE ONLY). @@ -7,13 +7,13 @@ */ /** - * @typedef {Object} ol.DeviceOrientationOptions + * @typedef {Object} olx.DeviceOrientationOptions * @property {boolean|undefined} tracking Start tracking. Default is `false`. * @todo stability experimental */ /** - * @typedef {Object} ol.GeolocationOptions + * @typedef {Object} olx.GeolocationOptions * @property {boolean|undefined} tracking Start Tracking. Default is `false`. * @property {GeolocationPositionOptions|undefined} trackingOptions Tracking options. * @property {ol.proj.ProjectionLike} projection Projection. @@ -21,7 +21,7 @@ */ /** - * @typedef {Object} ol.GetFeatureInfoOptions + * @typedef {Object} olx.GetFeatureInfoOptions * @property {ol.Pixel} pixel Pixel coordinate relative to the map viewport. * @property {Array.|undefined} layers Layers to restrict the * query to. All map layers will be queried if not provided. @@ -37,7 +37,7 @@ */ /** - * @typedef {Object} ol.GetFeaturesOptions + * @typedef {Object} olx.GetFeaturesOptions * @property {ol.Pixel} pixel Pixel coordinate relative to the map viewport. * @property {Array.|undefined} layers Layers to restrict the * query to. All layers will be queried if not provided. @@ -54,7 +54,7 @@ /** * Object literal with config options for the map. - * @typedef {Object} ol.MapOptions + * @typedef {Object} olx.MapOptions * @property {ol.Collection|Array.|undefined} controls * Controls initially added to the map. * @property {ol.Collection|Array.|undefined} interactions @@ -72,7 +72,7 @@ /** * Object literal with config options for the overlay. - * @typedef {Object} ol.OverlayOptions + * @typedef {Object} olx.OverlayOptions * @property {Element|undefined} element The overlay element. * @property {ol.Coordinate|undefined} position The overlay position in map * projection. @@ -91,7 +91,7 @@ /** * Object literal with config options for the Proj4js projection. - * @typedef {Object} ol.Proj4jsProjectionOptions + * @typedef {Object} olx.Proj4jsProjectionOptions * @property {string} code The SRS identifier code, e.g. `EPSG:31256`. * @property {ol.Extent|undefined} extent The validity extent for the SRS. * @property {boolean|undefined} global Whether the projection is valid for the @@ -101,7 +101,7 @@ /** * Object literal with config options for the projection. - * @typedef {Object} ol.ProjectionOptions + * @typedef {Object} olx.ProjectionOptions * @property {string} code The SRS identifier code, e.g. `EPSG:4326`. * @property {ol.proj.Units} units Units. * @property {ol.Extent|undefined} extent The validity extent for the SRS. @@ -114,7 +114,7 @@ /** * Object literal with config options for the view. - * @typedef {Object} ol.View2DOptions + * @typedef {Object} olx.View2DOptions * @property {ol.Coordinate|undefined} center The initial center for the view. * The coordinate system for the center is specified with the `projection` * option. Default is `undefined`, and layer sources will not be fetched if @@ -154,7 +154,7 @@ */ /** - * @typedef {Object} ol.animation.BounceOptions + * @typedef {Object} olx.animation.BounceOptions * @property {number} resolution The resolution to start the bounce from, typically `map.getView().getResolution()`. * @property {number|undefined} start The start time of the animation. Default is immediately. * @property {number|undefined} duration The duration of the animation in milliseconds. Default is `1000`. @@ -163,7 +163,7 @@ */ /** - * @typedef {Object} ol.animation.PanOptions + * @typedef {Object} olx.animation.PanOptions * @property {ol.Coordinate} source The location to start panning from, typically `map.getView().getCenter()`. * @property {number|undefined} start The start time of the animation. Default is immediately. * @property {number|undefined} duration The duration of the animation in milliseconds. Default is `1000`. @@ -172,7 +172,7 @@ */ /** - * @typedef {Object} ol.animation.RotateOptions + * @typedef {Object} olx.animation.RotateOptions * @property {number} rotation The rotation to apply, in radians. * @property {number|undefined} start The start time of the animation. Default is immediately. * @property {number|undefined} duration The duration of the animation in milliseconds. Default is `1000`. @@ -181,7 +181,7 @@ */ /** - * @typedef {Object} ol.animation.ZoomOptions + * @typedef {Object} olx.animation.ZoomOptions * @property {number} resolution number The resolution to begin zooming from, typically `map.getView().getResolution()`. * @property {number|undefined} start The start time of the animation. Default is immediately. * @property {number|undefined} duration The duration of the animation in milliseconds. Default is `1000`. @@ -190,33 +190,33 @@ */ /** - * @typedef {Object} ol.control.AttributionOptions + * @typedef {Object} olx.control.AttributionOptions * @property {string|undefined} className CSS class name. Default is `ol-attribution`. * @property {Element|undefined} target Target. * @todo stability experimental */ /** - * @typedef {Object} ol.control.ControlOptions + * @typedef {Object} olx.control.ControlOptions * @property {Element|undefined} element Element. * @property {Element|undefined} target Target. * @todo stability experimental */ /** - * @typedef {Object} ol.control.DefaultsOptions + * @typedef {Object} olx.control.DefaultsOptions * @property {boolean|undefined} attribution Attribution. - * @property {ol.control.AttributionOptions|undefined} attributionOptions + * @property {olx.control.AttributionOptions|undefined} attributionOptions * Attribution options. * @property {boolean|undefined} logo Logo. - * @property {ol.control.LogoOptions|undefined} logoOptions Logo options. + * @property {olx.control.LogoOptions|undefined} logoOptions Logo options. * @property {boolean|undefined} zoom Zoom. - * @property {ol.control.ZoomOptions|undefined} zoomOptions Zoom options. + * @property {olx.control.ZoomOptions|undefined} zoomOptions Zoom options. * @todo stability experimental */ /** - * @typedef {Object} ol.control.FullScreenOptions + * @typedef {Object} olx.control.FullScreenOptions * @property {string|undefined} className CSS class name. Default is `ol-full-screen`. * @property {boolean|undefined} keys Full keyboard access. * @property {Element|undefined} target Target. @@ -224,14 +224,14 @@ */ /** - * @typedef {Object} ol.control.LogoOptions + * @typedef {Object} olx.control.LogoOptions * @property {string|undefined} className CSS class name. Default is `ol-logo`. * @property {Element|undefined} target Target. * @todo stability experimental */ /** - * @typedef {Object} ol.control.MousePositionOptions + * @typedef {Object} olx.control.MousePositionOptions * @property {string|undefined} className CSS class name. Default is `ol-mouse-position`. * @property {ol.CoordinateFormatType|undefined} coordinateFormat Coordinate * format. @@ -243,7 +243,7 @@ */ /** - * @typedef {Object} ol.control.ScaleLineOptions + * @typedef {Object} olx.control.ScaleLineOptions * @property {string|undefined} className CSS Class name. Default is `ol-scale-line`. * @property {number|undefined} minWidth Minimum width in pixels. * @property {Element|undefined} target Target. @@ -252,7 +252,7 @@ */ /** - * @typedef {Object} ol.control.ZoomOptions + * @typedef {Object} olx.control.ZoomOptions * @property {number|undefined} duration Animation duration in milliseconds. Default is `250`. * @property {string|undefined} className CSS class name. Default is `ol-zoom`. * @property {number|undefined} delta The zoom delta applied on each click. @@ -261,7 +261,7 @@ */ /** - * @typedef {Object} ol.control.ZoomSliderOptions + * @typedef {Object} olx.control.ZoomSliderOptions * @property {string|undefined} className CSS class name. * @property {number|undefined} maxResolution Maximum resolution. * @property {number|undefined} minResolution Minimum resolution. @@ -269,7 +269,7 @@ */ /** - * @typedef {Object} ol.control.ZoomToExtentOptions + * @typedef {Object} olx.control.ZoomToExtentOptions * @property {string|undefined} className Class name. Default is `ol-zoom-extent`. * @property {Element|undefined} target Target. * @property {ol.Extent|undefined} extent The extent to zoom to. If @@ -278,7 +278,7 @@ */ /** - * @typedef {Object} ol.interaction.DoubleClickZoomOptions + * @typedef {Object} olx.interaction.DoubleClickZoomOptions * @property {number|undefined} duration Animation duration in milliseconds. Default is `250`. * @property {number|undefined} delta The zoom delta applied on each double * click, default is `1`. @@ -286,7 +286,7 @@ */ /** - * @typedef {Object} ol.interaction.DragPanOptions + * @typedef {Object} olx.interaction.DragPanOptions * @property {ol.Kinetic|undefined} kinetic Kinetic inertia to apply to the pan. * @property {ol.events.ConditionType|undefined} condition A conditional * modifier (i.e. Shift key) that determines if the interaction is active @@ -295,7 +295,7 @@ */ /** - * @typedef {Object} ol.interaction.DragRotateOptions + * @typedef {Object} olx.interaction.DragRotateOptions * @property {ol.events.ConditionType|undefined} condition A conditional * modifier (i.e. Shift key) that determines if the interaction is active * or not, default is both shift and alt keys. @@ -303,7 +303,7 @@ */ /** - * @typedef {Object} ol.interaction.DragRotateAndZoomOptions + * @typedef {Object} olx.interaction.DragRotateAndZoomOptions * @property {ol.events.ConditionType|undefined} condition A conditional * modifier (i.e. Shift key) that determines if the interaction is active * or not, default is shify key. @@ -311,7 +311,7 @@ */ /** - * @typedef {Object} ol.interaction.DragZoomOptions + * @typedef {Object} olx.interaction.DragZoomOptions * @property {ol.events.ConditionType|undefined} condition A conditional * modifier (i.e. Shift key) that determines if the interaction is active * or not, default is shift key. @@ -320,7 +320,7 @@ /** * Interactions for the map. Default is `true` for all options. - * @typedef {Object} ol.interaction.DefaultsOptions + * @typedef {Object} olx.interaction.DefaultsOptions * @property {boolean|undefined} altShiftDragRotate Whether Alt-Shift-drag * rotate is desired. * @property {boolean|undefined} doubleClickZoom Whether double click zoom is @@ -342,7 +342,7 @@ */ /** - * @typedef {Object} ol.interaction.DrawOptions + * @typedef {Object} olx.interaction.DrawOptions * @property {ol.layer.Vector} layer Destination layer for the features. * @property {number|undefined} snapTolerance Pixel distance for snapping to the * drawing finish (default is 12). @@ -352,7 +352,7 @@ */ /** - * @typedef {Object} ol.interaction.KeyboardPanOptions + * @typedef {Object} olx.interaction.KeyboardPanOptions * @property {ol.events.ConditionType|undefined} condition A conditional * modifier (i.e. Shift key) that determines if the interaction is active * or not, default is no modifiers. @@ -362,7 +362,7 @@ */ /** - * @typedef {Object} ol.interaction.KeyboardZoomOptions + * @typedef {Object} olx.interaction.KeyboardZoomOptions * @property {number|undefined} duration Animation duration in milliseconds. Default is `100`. * @property {ol.events.ConditionType|undefined} condition A conditional * modifier (i.e. Shift key) that determines if the interaction is active @@ -372,13 +372,13 @@ */ /** - * @typedef {Object} ol.interaction.MouseWheelZoomOptions + * @typedef {Object} olx.interaction.MouseWheelZoomOptions * @property {number|undefined} duration Animation duration in milliseconds. Default is `250`. * @todo stability experimental */ /** - * @typedef {Object} ol.interaction.ModifyOptions + * @typedef {Object} olx.interaction.ModifyOptions * @property {undefined|Array.|function(ol.layer.Layer):boolean} layers * Layers or filter function to restrict modification to a subset of layers. * @property {number|undefined} pixelTolerance Pixel tolerance for considering @@ -386,7 +386,7 @@ */ /** - * @typedef {Object} ol.interaction.SelectOptions + * @typedef {Object} olx.interaction.SelectOptions * @property {ol.events.ConditionType|undefined} addCondition A conditional * modifier (e.g. shift key) that determines if the selection is added to * the current selection. By default, a shift-click adds to the current @@ -401,27 +401,27 @@ */ /** - * @typedef {Object} ol.interaction.TouchPanOptions + * @typedef {Object} olx.interaction.TouchPanOptions * @property {ol.Kinetic|undefined} kinetic Kinetic inertia to apply to the * pan. * @todo stability experimental */ /** - * @typedef {Object} ol.interaction.TouchRotateOptions + * @typedef {Object} olx.interaction.TouchRotateOptions * @property {number|undefined} threshold Minimal angle in radians to start a rotation. * Default is `0.3`. * @todo stability experimental */ /** - * @typedef {Object} ol.interaction.TouchZoomOptions + * @typedef {Object} olx.interaction.TouchZoomOptions * @property {number|undefined} duration Animation duration in milliseconds. Default is `400`. * @todo stability experimental */ /** - * @typedef {Object} ol.layer.BaseOptions + * @typedef {Object} olx.layer.BaseOptions * @property {number|undefined} brightness Brightness. Default is `0`. * @property {number|undefined} contrast Contrast. Default is `1`. * @property {number|undefined} hue Hue. Default is `0`. @@ -436,7 +436,7 @@ */ /** - * @typedef {Object} ol.layer.LayerOptions + * @typedef {Object} olx.layer.LayerOptions * @property {number|undefined} brightness Brightness. Default is `0`. * @property {number|undefined} contrast Contrast. Default is `1`. * @property {number|undefined} hue Hue. Default is `0`. @@ -452,7 +452,7 @@ */ /** - * @typedef {Object} ol.layer.GroupOptions + * @typedef {Object} olx.layer.GroupOptions * @property {number|undefined} brightness Brightness. Default is `0`. * @property {number|undefined} contrast Contrast. Default is `1`. * @property {number|undefined} hue Hue. Default is `0`. @@ -468,7 +468,7 @@ */ /** - * @typedef {Object} ol.layer.TileOptions + * @typedef {Object} olx.layer.TileOptions * @property {number|undefined} brightness Brightness. Default is `0`. * @property {number|undefined} contrast Contrast. Default is `1`. * @property {number|undefined} hue Hue. Default is `0`. @@ -485,7 +485,7 @@ */ /** - * @typedef {Object} ol.layer.VectorLayerOptions + * @typedef {Object} olx.layer.VectorLayerOptions * @property {function(Array.):string|undefined} transformFeatureInfo * Function to render an array of * features into feature info markup. If not provided, a comma separated @@ -502,7 +502,7 @@ */ /** - * @typedef {Object} ol.parser.KMLOptions + * @typedef {Object} olx.parser.KMLOptions * @property {boolean|undefined} extractAttributes Should we extract attributes * from the KML? Default is `true`. * @property {boolean|undefined} extractStyles Should we extract styles from the @@ -515,20 +515,20 @@ */ /** - * @typedef {Object} ol.parser.GMLReadOptions + * @typedef {Object} olx.parser.GMLReadOptions * @property {string|undefined} axisOrientation The axis orientation. * @todo stability experimental */ /** - * @typedef {Object} ol.parser.GMLWriteOptions + * @typedef {Object} olx.parser.GMLWriteOptions * @property {ol.proj.ProjectionLike} srsName The srsName to use when writing. * @property {string|undefined} axisOrientation The axis orientation. * @todo stability experimental */ /** - * @typedef {Object} ol.parser.GMLOptions + * @typedef {Object} olx.parser.GMLOptions * @property {boolean|undefined} curve Write gml:Curve instead of * gml:LineString elements. This also affects the elements in multi-part * geometries. Default is `false`. This only applies to GML version 3. @@ -549,15 +549,15 @@ * @property {boolean|undefined} surface Write gml:Surface instead of * gml:Polygon elements. This also affects the elements in multi-part * geometries. Default is `false`. This only applies to GML version 3. - * @property {ol.parser.GMLReadOptions|undefined} readOptions readOptions to + * @property {olx.parser.GMLReadOptions|undefined} readOptions readOptions to * use for this instance. - * @property {ol.parser.GMLWriteOptions|undefined} writeOptions writeOptions + * @property {olx.parser.GMLWriteOptions|undefined} writeOptions writeOptions * to use for this instance. * @todo stability experimental */ /** - * @typedef {Object} ol.parser.GPXOptions + * @typedef {Object} olx.parser.GPXOptions * @property {string|undefined} creator The creator attribute to be added to * the written GPX files. Defaults to `OpenLayers`. * @property {string|undefined} defaultDesc Default description for the @@ -575,7 +575,7 @@ */ /** - * @typedef {Object} ol.parser.GPXWriteOptions + * @typedef {Object} olx.parser.GPXWriteOptions * @property {Array.|ol.Feature} features The features to write * out. * @property {Object|undefined} metadata Metadata key/value pair with keys: @@ -584,19 +584,19 @@ */ /** - * @typedef {Object} ol.parser.SLDReadOptions + * @typedef {Object} olx.parser.SLDReadOptions * @property {ol.proj.Units} units The units to use in scale to resolution * calculations. */ /** - * @typedef {Object} ol.parser.SLDWriteOptions + * @typedef {Object} olx.parser.SLDWriteOptions * @property {ol.proj.Units} units The units to use in resolution to scale * calculations. */ /** - * @typedef {Object} ol.parser.WFSWriteGetFeatureOptions + * @typedef {Object} olx.parser.WFSWriteGetFeatureOptions * @property {string} featureNS The namespace URI used for features. * @property {string} featurePrefix The prefix for the feature namespace. * @property {Array.} featureTypes The feature type names. @@ -609,7 +609,7 @@ */ /** - * @typedef {Object} ol.parser.WFSWriteTransactionOptions + * @typedef {Object} olx.parser.WFSWriteTransactionOptions * @property {string} featureNS The namespace URI used for features. * @property {string} featurePrefix The prefix for the feature namespace. * @property {string} featureType The feature type name. @@ -621,7 +621,7 @@ */ /** - * @typedef {Object} ol.source.BingMapsOptions + * @typedef {Object} olx.source.BingMapsOptions * @property {string|undefined} culture Culture code. Default is `en-us`. * @property {string} key Bing Maps API key. Get yours at * http://bingmapsportal.com/. @@ -632,7 +632,7 @@ */ /** - * @typedef {Object} ol.source.MapGuideOptions + * @typedef {Object} olx.source.MapGuideOptions * @property {string|undefined} url The mapagent url. * @property {number|undefined} metersPerUnit The meters-per-unit value. * @property {ol.Extent|undefined} extent Extent.. @@ -648,14 +648,14 @@ */ /** - * @typedef {Object} ol.source.MapQuestOptions + * @typedef {Object} olx.source.MapQuestOptions * @property {ol.TileLoadFunctionType|undefined} tileLoadFunction Optional * function to load a tile given a URL. * @todo stability experimental */ /** - * @typedef {Object} ol.source.TileDebugOptions + * @typedef {Object} olx.source.TileDebugOptions * @property {ol.Extent|undefined} extent Extent. * @property {ol.proj.ProjectionLike} projection Projection. * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid. @@ -663,7 +663,7 @@ */ /** - * @typedef {Object} ol.source.OSMOptions + * @typedef {Object} olx.source.OSMOptions * @property {Array.|undefined} attributions Attributions. * @property {number|undefined} maxZoom Max zoom. * @property {ol.TileLoadFunctionType|undefined} tileLoadFunction Optional @@ -675,12 +675,12 @@ */ /** - * @typedef {Object} ol.source.ImageWMSOptions + * @typedef {Object} olx.source.ImageWMSOptions * @property {Array.|undefined} attributions Attributions. * @property {null|string|undefined} crossOrigin crossOrigin setting for image * requests. * @property {ol.Extent|undefined} extent Extent. - * @property {ol.source.WMSGetFeatureInfoOptions|undefined} getFeatureInfoOptions + * @property {olx.source.WMSGetFeatureInfoOptions|undefined} getFeatureInfoOptions * Options for GetFeatureInfo. * @property {Object.} params WMS request parameters. At least a * `LAYERS` param is required. `STYLES` is `` by default. `VERSION` is @@ -697,7 +697,7 @@ */ /** - * @typedef {Object} ol.source.StamenOptions + * @typedef {Object} olx.source.StamenOptions * @property {string} layer Layer. * @property {number|undefined} minZoom Minimum zoom. * @property {number|undefined} maxZoom Maximum zoom. @@ -710,7 +710,7 @@ */ /** - * @typedef {Object} ol.source.ImageStaticOptions + * @typedef {Object} olx.source.ImageStaticOptions * @property {Array.|undefined} attributions Attributions. * @property {null|string|undefined} crossOrigin crossOrigin setting for image * requests. @@ -723,7 +723,7 @@ */ /** - * @typedef {Object} ol.source.TileJSONOptions + * @typedef {Object} olx.source.TileJSONOptions * @property {null|string|undefined} crossOrigin crossOrigin setting for image * requests. * @property {ol.TileLoadFunctionType|undefined} tileLoadFunction Optional @@ -733,7 +733,7 @@ */ /** - * @typedef {Object} ol.source.TileWMSOptions + * @typedef {Object} olx.source.TileWMSOptions * @property {Array.|undefined} attributions Attributions. * @property {Object.} params WMS request parameters. At least a * `LAYERS` param is required. `STYLES` is `` by default. `VERSION` is @@ -742,7 +742,7 @@ * @property {null|string|undefined} crossOrigin crossOrigin setting for image * requests. * @property {ol.Extent|undefined} extent Extent. - * @property {ol.source.WMSGetFeatureInfoOptions|undefined} getFeatureInfoOptions + * @property {olx.source.WMSGetFeatureInfoOptions|undefined} getFeatureInfoOptions * Options for GetFeatureInfo. * @property {string|undefined} logo Logo. * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid. @@ -757,7 +757,7 @@ */ /** - * @typedef {Object} ol.source.VectorOptions + * @typedef {Object} olx.source.VectorOptions * @property {Array.|undefined} attributions Attributions. * @property {Array.|undefined} features Any features to be added * to the source. Providing features is an alternative to providing @@ -776,7 +776,7 @@ */ /** - * @typedef {Object} ol.source.WMTSOptions + * @typedef {Object} olx.source.WMTSOptions * @property {Array.|undefined} attributions Attributions. * @property {string|null|undefined} crossOrigin crossOrigin setting for image * requests. @@ -801,7 +801,7 @@ */ /** - * @typedef {Object} ol.source.XYZOptions + * @typedef {Object} olx.source.XYZOptions * @property {Array.|undefined} attributions Attributions. * @property {null|string|undefined} crossOrigin Cross origin setting for image * requests. @@ -822,7 +822,7 @@ */ /** - * @typedef {Object} ol.style.IconOptions + * @typedef {Object} olx.style.IconOptions * @property {string|ol.expr.Expression} url Icon image URL. * @property {number|ol.expr.Expression|undefined} width Width of the icon * in pixels. Default is the width of the icon image. @@ -841,7 +841,7 @@ */ /** - * @typedef {Object} ol.style.FillOptions + * @typedef {Object} olx.style.FillOptions * @property {string|ol.expr.Expression|undefined} color Fill color as hex color * code. * @property {number|ol.expr.Expression|undefined} opacity Opacity (0, 1). Default is `1`. @@ -850,7 +850,7 @@ */ /** - * @typedef {Object} ol.style.RuleOptions + * @typedef {Object} olx.style.RuleOptions * @property {ol.expr.Expression|string|undefined} filter Filter. * @property {number|undefined} maxResolution Optional maximum resolution. If * a value is provided, the rule will apply at resolutions less than @@ -865,7 +865,7 @@ */ /** - * @typedef {Object} ol.style.ShapeOptions + * @typedef {Object} olx.style.ShapeOptions * @property {ol.style.ShapeType|undefined} type Type. * @property {number|ol.expr.Expression|undefined} size Size in pixels. * @property {ol.style.Fill|undefined} fill Fill symbolizer for shape. @@ -875,7 +875,7 @@ */ /** - * @typedef {Object} ol.style.StrokeOptions + * @typedef {Object} olx.style.StrokeOptions * @property {string|ol.expr.Expression|undefined} color Stroke color as hex * color code. * @property {number|ol.expr.Expression|undefined} opacity Stroke opacity (0, 1). Default is `1`. @@ -885,7 +885,7 @@ */ /** - * @typedef {Object} ol.style.StyleOptions + * @typedef {Object} olx.style.StyleOptions * @property {Array.|undefined} rules Rules. * @property {Array.|undefined} symbolizers Symbolizers * (that apply if no rules are provided or where none of the provided rules @@ -896,7 +896,7 @@ */ /** - * @typedef {Object} ol.style.TextOptions + * @typedef {Object} olx.style.TextOptions * @property {string|ol.expr.Expression|undefined} color Color. * @property {string|ol.expr.Expression|undefined} fontFamily Font family. * @property {number|ol.expr.Expression|undefined} fontSize Font size in pixels. @@ -909,7 +909,7 @@ */ /** - * @typedef {Object} ol.tilegrid.TileGridOptions + * @typedef {Object} olx.tilegrid.TileGridOptions * @property {number|undefined} minZoom Minimum zoom. * @property {ol.Coordinate|undefined} origin Origin. * @property {Array.|undefined} origins Origins. @@ -920,7 +920,7 @@ */ /** - * @typedef {Object} ol.tilegrid.WMTSOptions + * @typedef {Object} olx.tilegrid.WMTSOptions * @property {ol.Coordinate|undefined} origin Origin. * @property {Array.|undefined} origins Origins. * @property {!Array.} resolutions Resolutions. @@ -931,7 +931,7 @@ */ /** - * @typedef {Object} ol.tilegrid.XYZOptions + * @typedef {Object} olx.tilegrid.XYZOptions * @property {number} maxZoom Maximum zoom. * @todo stability experimental */ From 315c42f0a7bad339c96f2f936d7513a498df1b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 14:52:29 +0100 Subject: [PATCH 07/15] 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/' \{\} \; --- src/ol/animation.js | 8 ++++---- src/ol/attribution.js | 2 +- src/ol/control/attributioncontrol.js | 2 +- src/ol/control/control.js | 2 +- src/ol/control/controldefaults.js | 2 +- src/ol/control/dragboxcontrol.js | 2 +- src/ol/control/fullscreencontrol.js | 2 +- src/ol/control/logocontrol.js | 2 +- src/ol/control/mousepositioncontrol.js | 2 +- src/ol/control/scalelinecontrol.js | 2 +- src/ol/control/zoomcontrol.js | 2 +- src/ol/control/zoomslidercontrol.js | 2 +- src/ol/control/zoomtoextentcontrol.js | 2 +- src/ol/deviceorientation.js | 2 +- src/ol/geolocation.js | 2 +- src/ol/interaction/doubleclickzoominteraction.js | 2 +- src/ol/interaction/dragpaninteraction.js | 2 +- src/ol/interaction/dragrotateandzoominteraction.js | 2 +- src/ol/interaction/dragrotateinteraction.js | 2 +- src/ol/interaction/dragzoominteraction.js | 2 +- src/ol/interaction/drawinteraction.js | 2 +- src/ol/interaction/interactiondefaults.js | 2 +- src/ol/interaction/keyboardpaninteraction.js | 2 +- src/ol/interaction/keyboardzoominteraction.js | 2 +- src/ol/interaction/modifyinteraction.js | 2 +- src/ol/interaction/mousewheelzoominteraction.js | 2 +- src/ol/interaction/selectinteraction.js | 2 +- src/ol/interaction/touchpaninteraction.js | 2 +- src/ol/interaction/touchrotateinteraction.js | 2 +- src/ol/interaction/touchzoominteraction.js | 2 +- src/ol/layer/imagelayer.js | 2 +- src/ol/layer/layer.js | 4 ++-- src/ol/layer/layerbase.js | 2 +- src/ol/layer/layergroup.js | 4 ++-- src/ol/layer/tilelayer.js | 2 +- src/ol/layer/vectorlayer.js | 6 +++--- src/ol/map.js | 8 ++++---- src/ol/overlay.js | 2 +- src/ol/parser/gpxparser.js | 6 +++--- src/ol/parser/kmlparser.js | 4 ++-- src/ol/parser/ogc/filterparser_v1.js | 2 +- src/ol/parser/ogc/gmlparser.js | 8 ++++---- src/ol/parser/ogc/gmlparser_v2.js | 4 ++-- src/ol/parser/ogc/gmlparser_v3.js | 4 ++-- src/ol/parser/ogc/sldparser_v1.js | 8 ++++---- src/ol/parser/ogc/wfsparser_v1.js | 6 +++--- src/ol/proj/proj.js | 12 ++++++------ src/ol/source/bingmapssource.js | 2 +- src/ol/source/debugtilesource.js | 2 +- src/ol/source/imagesource.js | 2 +- src/ol/source/imagestaticsource.js | 2 +- src/ol/source/imagewmssource.js | 6 +++--- src/ol/source/mapguidesource.js | 2 +- src/ol/source/mapquestsource.js | 4 ++-- src/ol/source/osmsource.js | 2 +- src/ol/source/source.js | 2 +- src/ol/source/stamensource.js | 2 +- src/ol/source/tileimagesource.js | 2 +- src/ol/source/tilejsonsource.js | 2 +- src/ol/source/tilesource.js | 2 +- src/ol/source/tilewmssource.js | 6 +++--- src/ol/source/vectorsource.js | 2 +- src/ol/source/wmssource.js | 6 +++--- src/ol/source/wmtssource.js | 4 ++-- src/ol/source/xyzsource.js | 2 +- src/ol/style/fillsymbolizer.js | 2 +- src/ol/style/iconliteral.js | 2 +- src/ol/style/iconsymbolizer.js | 2 +- src/ol/style/lineliteral.js | 2 +- src/ol/style/polygonliteral.js | 2 +- src/ol/style/rule.js | 2 +- src/ol/style/shapeliteral.js | 2 +- src/ol/style/shapesymbolizer.js | 2 +- src/ol/style/strokesymbolizer.js | 2 +- src/ol/style/style.js | 2 +- src/ol/style/textliteral.js | 2 +- src/ol/style/textsymbolizer.js | 2 +- src/ol/tilegrid/tilegrid.js | 2 +- src/ol/tilegrid/wmtstilegrid.js | 2 +- src/ol/tilegrid/xyztilegrid.js | 2 +- src/ol/view2d.js | 8 ++++---- 81 files changed, 120 insertions(+), 120 deletions(-) diff --git a/src/ol/animation.js b/src/ol/animation.js index b1a15fa966..17207baea0 100644 --- a/src/ol/animation.js +++ b/src/ol/animation.js @@ -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 */ diff --git a/src/ol/attribution.js b/src/ol/attribution.js index 361572bcc7..560e52facf 100644 --- a/src/ol/attribution.js +++ b/src/ol/attribution.js @@ -20,7 +20,7 @@ goog.require('ol.TileRange'); * .. * * @constructor - * @param {ol.AttributionOptions} options Attribution options. + * @param {olx.AttributionOptions} options Attribution options. * @todo stability experimental */ ol.Attribution = function(options) { diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attributioncontrol.js index f5d2ed225f..b8e6e63b58 100644 --- a/src/ol/control/attributioncontrol.js +++ b/src/ol/control/attributioncontrol.js @@ -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) { diff --git a/src/ol/control/control.js b/src/ol/control/control.js index b57a732e38..d7b96d18d0 100644 --- a/src/ol/control/control.js +++ b/src/ol/control/control.js @@ -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) { diff --git a/src/ol/control/controldefaults.js b/src/ol/control/controldefaults.js index 0546ee1229..da53820325 100644 --- a/src/ol/control/controldefaults.js +++ b/src/ol/control/controldefaults.js @@ -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 */ diff --git a/src/ol/control/dragboxcontrol.js b/src/ol/control/dragboxcontrol.js index 4529d77767..4106b2833f 100644 --- a/src/ol/control/dragboxcontrol.js +++ b/src/ol/control/dragboxcontrol.js @@ -26,7 +26,7 @@ ol.control.DragBoxOptions; /** * @constructor * @extends {ol.control.Control} - * @param {ol.control.DragBoxOptions} options Drag box options. + * @param {olx.control.DragBoxOptions} options Drag box options. * @todo stability experimental */ ol.control.DragBox = function(options) { diff --git a/src/ol/control/fullscreencontrol.js b/src/ol/control/fullscreencontrol.js index 12f9823f4d..b7a5dac4fd 100644 --- a/src/ol/control/fullscreencontrol.js +++ b/src/ol/control/fullscreencontrol.js @@ -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) { diff --git a/src/ol/control/logocontrol.js b/src/ol/control/logocontrol.js index 8843e10d7e..e1ebaa359a 100644 --- a/src/ol/control/logocontrol.js +++ b/src/ol/control/logocontrol.js @@ -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) { diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js index 3697e9f7b6..7381867f59 100644 --- a/src/ol/control/mousepositioncontrol.js +++ b/src/ol/control/mousepositioncontrol.js @@ -36,7 +36,7 @@ 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 diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js index ccaabb707d..5c18bac16c 100644 --- a/src/ol/control/scalelinecontrol.js +++ b/src/ol/control/scalelinecontrol.js @@ -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 diff --git a/src/ol/control/zoomcontrol.js b/src/ol/control/zoomcontrol.js index 72f278353b..f31b6aaa66 100644 --- a/src/ol/control/zoomcontrol.js +++ b/src/ol/control/zoomcontrol.js @@ -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) { diff --git a/src/ol/control/zoomslidercontrol.js b/src/ol/control/zoomslidercontrol.js index 52b9e1f2d4..c2cf84481e 100644 --- a/src/ol/control/zoomslidercontrol.js +++ b/src/ol/control/zoomslidercontrol.js @@ -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) { diff --git a/src/ol/control/zoomtoextentcontrol.js b/src/ol/control/zoomtoextentcontrol.js index f926db5a0d..71fdae3a99 100644 --- a/src/ol/control/zoomtoextentcontrol.js +++ b/src/ol/control/zoomtoextentcontrol.js @@ -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) { diff --git a/src/ol/deviceorientation.js b/src/ol/deviceorientation.js index 87c51ec8d1..000494963b 100644 --- a/src/ol/deviceorientation.js +++ b/src/ol/deviceorientation.js @@ -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 diff --git a/src/ol/geolocation.js b/src/ol/geolocation.js index 884cac198d..ffb7a11638 100644 --- a/src/ol/geolocation.js +++ b/src/ol/geolocation.js @@ -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 diff --git a/src/ol/interaction/doubleclickzoominteraction.js b/src/ol/interaction/doubleclickzoominteraction.js index 1b106052b1..ac4f7c9668 100644 --- a/src/ol/interaction/doubleclickzoominteraction.js +++ b/src/ol/interaction/doubleclickzoominteraction.js @@ -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) { diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js index d1d668d551..d98a801639 100644 --- a/src/ol/interaction/dragpaninteraction.js +++ b/src/ol/interaction/dragpaninteraction.js @@ -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) { diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js index c479deefbb..b2588a2af3 100644 --- a/src/ol/interaction/dragrotateandzoominteraction.js +++ b/src/ol/interaction/dragrotateandzoominteraction.js @@ -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) { diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js index b43aaed167..06a85e3eb9 100644 --- a/src/ol/interaction/dragrotateinteraction.js +++ b/src/ol/interaction/dragrotateinteraction.js @@ -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) { diff --git a/src/ol/interaction/dragzoominteraction.js b/src/ol/interaction/dragzoominteraction.js index 5a44365def..2cc9ed0e99 100644 --- a/src/ol/interaction/dragzoominteraction.js +++ b/src/ol/interaction/dragzoominteraction.js @@ -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) { diff --git a/src/ol/interaction/drawinteraction.js b/src/ol/interaction/drawinteraction.js index 217adb30d7..6157a21131 100644 --- a/src/ol/interaction/drawinteraction.js +++ b/src/ol/interaction/drawinteraction.js @@ -23,7 +23,7 @@ goog.require('ol.source.Vector'); /** * Interaction that allows drawing geometries. - * @param {ol.interaction.DrawOptions} options Options. + * @param {olx.interaction.DrawOptions} options Options. * @constructor * @extends {ol.interaction.Interaction} */ diff --git a/src/ol/interaction/interactiondefaults.js b/src/ol/interaction/interactiondefaults.js index b6e39c8752..32b4e5569c 100644 --- a/src/ol/interaction/interactiondefaults.js +++ b/src/ol/interaction/interactiondefaults.js @@ -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 diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js index ae3b15b8ef..f38e0c004a 100644 --- a/src/ol/interaction/keyboardpaninteraction.js +++ b/src/ol/interaction/keyboardpaninteraction.js @@ -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) { diff --git a/src/ol/interaction/keyboardzoominteraction.js b/src/ol/interaction/keyboardzoominteraction.js index 6fa1bd4ad0..e43dab79ea 100644 --- a/src/ol/interaction/keyboardzoominteraction.js +++ b/src/ol/interaction/keyboardzoominteraction.js @@ -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 */ diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js index fdef1b88e7..901589751e 100644 --- a/src/ol/interaction/modifyinteraction.js +++ b/src/ol/interaction/modifyinteraction.js @@ -38,7 +38,7 @@ ol.interaction.SegmentDataType; /** * @constructor * @extends {ol.interaction.Drag} - * @param {ol.interaction.ModifyOptions=} opt_options Options. + * @param {olx.interaction.ModifyOptions=} opt_options Options. */ ol.interaction.Modify = function(opt_options) { goog.base(this); diff --git a/src/ol/interaction/mousewheelzoominteraction.js b/src/ol/interaction/mousewheelzoominteraction.js index 29999fb194..fb1c229ceb 100644 --- a/src/ol/interaction/mousewheelzoominteraction.js +++ b/src/ol/interaction/mousewheelzoominteraction.js @@ -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) { diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js index 6442cd9d5b..96cec1ad9d 100644 --- a/src/ol/interaction/selectinteraction.js +++ b/src/ol/interaction/selectinteraction.js @@ -15,7 +15,7 @@ goog.require('ol.layer.Vector'); * Allows the user to select features on the map. * @constructor * @extends {ol.interaction.Interaction} - * @param {ol.interaction.SelectOptions=} opt_options Options. + * @param {olx.interaction.SelectOptions=} opt_options Options. * @todo stability experimental */ ol.interaction.Select = function(opt_options) { diff --git a/src/ol/interaction/touchpaninteraction.js b/src/ol/interaction/touchpaninteraction.js index 41f494a7b2..3f2efb7cb6 100644 --- a/src/ol/interaction/touchpaninteraction.js +++ b/src/ol/interaction/touchpaninteraction.js @@ -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) { diff --git a/src/ol/interaction/touchrotateinteraction.js b/src/ol/interaction/touchrotateinteraction.js index 617c522daf..ddf3fcc0e7 100644 --- a/src/ol/interaction/touchrotateinteraction.js +++ b/src/ol/interaction/touchrotateinteraction.js @@ -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) { diff --git a/src/ol/interaction/touchzoominteraction.js b/src/ol/interaction/touchzoominteraction.js index 17c2c9f3bc..b642852b82 100644 --- a/src/ol/interaction/touchzoominteraction.js +++ b/src/ol/interaction/touchzoominteraction.js @@ -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) { diff --git a/src/ol/layer/imagelayer.js b/src/ol/layer/imagelayer.js index f3d6b49ac9..d75edf8ded 100644 --- a/src/ol/layer/imagelayer.js +++ b/src/ol/layer/imagelayer.js @@ -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) { diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index b095c51584..a83bfb9183 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -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; diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index 5c1a1d24db..389f3afef7 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -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) { diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/layergroup.js index 9fd4b6c5b0..50649459f0 100644 --- a/src/ol/layer/layergroup.js +++ b/src/ol/layer/layergroup.js @@ -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; diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js index 2bbbde2764..f8ba630d95 100644 --- a/src/ol/layer/tilelayer.js +++ b/src/ol/layer/tilelayer.js @@ -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 */ diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js index 11feb64ecd..11a4853b39 100644 --- a/src/ol/layer/vectorlayer.js +++ b/src/ol/layer/vectorlayer.js @@ -15,12 +15,12 @@ goog.require('ol.style.Style'); /** * @constructor * @extends {ol.layer.Layer} - * @param {ol.layer.VectorLayerOptions} options Vector layer options. + * @param {olx.layer.VectorLayerOptions} options Vector layer options. * @todo stability experimental */ ol.layer.Vector = function(options) { - var baseOptions = /** @type {ol.layer.VectorLayerOptions} */ + var baseOptions = /** @type {olx.layer.VectorLayerOptions} */ (goog.object.clone(options)); /** @@ -45,7 +45,7 @@ ol.layer.Vector = function(options) { */ 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); diff --git a/src/ol/map.js b/src/ol/map.js index c6d2f2fcf8..69fd635db6 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -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. @@ -563,7 +563,7 @@ ol.Map.prototype.getOverlays = function() { /** * Get feature information for a pixel on the map. * - * @param {ol.GetFeatureInfoOptions} options Options. + * @param {olx.GetFeatureInfoOptions} options Options. * @todo stability experimental */ ol.Map.prototype.getFeatureInfo = function(options) { @@ -577,7 +577,7 @@ ol.Map.prototype.getFeatureInfo = function(options) { /** * Get features for a pixel on the map. * - * @param {ol.GetFeaturesOptions} options Options. + * @param {olx.GetFeaturesOptions} options Options. * @todo stability experimental */ 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. */ ol.Map.createOptionsInternal = function(options) { diff --git a/src/ol/overlay.js b/src/ol/overlay.js index 38233f7953..bd81f321c7 100644 --- a/src/ol/overlay.js +++ b/src/ol/overlay.js @@ -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 diff --git a/src/ol/parser/gpxparser.js b/src/ol/parser/gpxparser.js index ff32db5382..a193396976 100644 --- a/src/ol/parser/gpxparser.js +++ b/src/ol/parser/gpxparser.js @@ -21,12 +21,12 @@ goog.require('ol.parser.XML'); * @implements {ol.parser.DomFeatureParser} * @implements {ol.parser.StringFeatureParser} * @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} * @todo stability experimental */ ol.parser.GPX = function(opt_options) { - var options = /** @type {ol.parser.GPXOptions} */ + var options = /** @type {olx.parser.GPXOptions} */ (goog.isDef(opt_options) ? opt_options : {}); this.extractAttributes = goog.isDef(options.extractAttributes) ? 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. * @return {string} An string representing the GPX document. */ diff --git a/src/ol/parser/kmlparser.js b/src/ol/parser/kmlparser.js index fcd6d8aefd..c1cdfc9037 100644 --- a/src/ol/parser/kmlparser.js +++ b/src/ol/parser/kmlparser.js @@ -40,12 +40,12 @@ goog.require('ol.style.Stroke'); * @implements {ol.parser.StringFeatureParser} * @implements {ol.parser.AsyncObjectFeatureParser} * @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} * @todo stability experimental */ ol.parser.KML = function(opt_options) { - var options = /** @type {ol.parser.KMLOptions} */ + var options = /** @type {olx.parser.KMLOptions} */ (goog.isDef(opt_options) ? opt_options : {}); this.extractAttributes = goog.isDef(options.extractAttributes) ? options.extractAttributes : true; diff --git a/src/ol/parser/ogc/filterparser_v1.js b/src/ol/parser/ogc/filterparser_v1.js index 3d3ff44d55..2c60548f42 100644 --- a/src/ol/parser/ogc/filterparser_v1.js +++ b/src/ol/parser/ogc/filterparser_v1.js @@ -649,6 +649,6 @@ ol.parser.ogc.Filter_v1.prototype.setSrsName = function(srsName) { this.srsName = srsName; if (goog.isDefAndNotNull(this.gmlParser_)) { this.gmlParser_.applyWriteOptions({}, - /** @type {ol.parser.GMLWriteOptions} */ ({srsName: srsName})); + /** @type {olx.parser.GMLWriteOptions} */ ({srsName: srsName})); } }; diff --git a/src/ol/parser/ogc/gmlparser.js b/src/ol/parser/ogc/gmlparser.js index e690cbae58..28c36e0f1a 100644 --- a/src/ol/parser/ogc/gmlparser.js +++ b/src/ol/parser/ogc/gmlparser.js @@ -22,12 +22,12 @@ goog.require('ol.proj'); /** * @constructor * @implements {ol.parser.StringFeatureParser} - * @param {ol.parser.GMLOptions=} opt_options + * @param {olx.parser.GMLOptions=} opt_options * Optional configuration object. * @extends {ol.parser.XML} */ 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 : {}); this.extractAttributes = goog.isDef(options.extractAttributes) ? 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 {ol.parser.GMLReadOptions=} opt_options Read options. + * @param {olx.parser.GMLReadOptions=} opt_options Read options. * @return {ol.parser.ReadFeaturesResult} An object representing the document. */ 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. * @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as * 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) { // srsName handling: opt_options -> this.writeOptions -> obj.metadata diff --git a/src/ol/parser/ogc/gmlparser_v2.js b/src/ol/parser/ogc/gmlparser_v2.js index 37bdd9d191..a6aaa73c52 100644 --- a/src/ol/parser/ogc/gmlparser_v2.js +++ b/src/ol/parser/ogc/gmlparser_v2.js @@ -11,7 +11,7 @@ goog.require('ol.parser.ogc.GML'); * version 2.1.2 * * @constructor - * @param {ol.parser.GMLOptions=} opt_options Optional configuration object. + * @param {olx.parser.GMLOptions=} opt_options Optional configuration object. * @extends {ol.parser.ogc.GML} * @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 * 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. * @todo stability experimental */ diff --git a/src/ol/parser/ogc/gmlparser_v3.js b/src/ol/parser/ogc/gmlparser_v3.js index 2a9bb45406..b22f755e3e 100644 --- a/src/ol/parser/ogc/gmlparser_v3.js +++ b/src/ol/parser/ogc/gmlparser_v3.js @@ -13,7 +13,7 @@ goog.require('ol.parser.ogc.GML'); * version 3.1.1 * * @constructor - * @param {ol.parser.GMLOptions=} opt_options Optional configuration object. + * @param {olx.parser.GMLOptions=} opt_options Optional configuration object. * @extends {ol.parser.ogc.GML} * @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 * 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. * @todo stability experimental */ diff --git a/src/ol/parser/ogc/sldparser_v1.js b/src/ol/parser/ogc/sldparser_v1.js index a1516d8c5a..f952d4878f 100644 --- a/src/ol/parser/ogc/sldparser_v1.js +++ b/src/ol/parser/ogc/sldparser_v1.js @@ -89,7 +89,7 @@ ol.parser.ogc.SLD_v1 = function() { delete config.fill; config.zIndex = this.featureTypeCounter; 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) { @@ -197,7 +197,7 @@ ol.parser.ogc.SLD_v1 = function() { if (goog.isDef(config.externalGraphic)) { config.width = config.height = config.size; symbolizer = new ol.style.Icon( - /** @type {ol.style.IconOptions} */(config)); + /** @type {olx.style.IconOptions} */(config)); } else { 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 {ol.parser.SLDReadOptions=} opt_options Read options. + * @param {olx.parser.SLDReadOptions=} opt_options Read options. * @return {Object} An object representing the document. */ 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 {ol.parser.SLDWriteOptions=} opt_options Write options. + * @param {olx.parser.SLDWriteOptions=} opt_options Write options. * @return {string} The serialized SLD. */ ol.parser.ogc.SLD_v1.prototype.write = function(style, opt_options) { diff --git a/src/ol/parser/ogc/wfsparser_v1.js b/src/ol/parser/ogc/wfsparser_v1.js index acc0449c8b..15e431d683 100644 --- a/src/ol/parser/ogc/wfsparser_v1.js +++ b/src/ol/parser/ogc/wfsparser_v1.js @@ -28,7 +28,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) { this.writers = {}; this.writers[this.defaultNamespaceURI] = { /** - * @param {ol.parser.WFSWriteGetFeatureOptions} options Options. + * @param {olx.parser.WFSWriteGetFeatureOptions} options Options. * @return {{node: Node, * options: ol.parser.WFSWriteGetFeatureOptions}} Object. * @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. */ ol.parser.ogc.WFS_v1.prototype.writeGetFeature = function(options) { @@ -352,7 +352,7 @@ ol.parser.ogc.WFS_v1.prototype.writeGetFeature = function(options) { * @param {Array.} inserts The features to insert. * @param {Array.} updates The features to update. * @param {Array.} 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. */ ol.parser.ogc.WFS_v1.prototype.writeTransaction = diff --git a/src/ol/proj/proj.js b/src/ol/proj/proj.js index c6268dd3ec..1a686a9282 100644 --- a/src/ol/proj/proj.js +++ b/src/ol/proj/proj.js @@ -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. * @todo stability experimental */ ol.proj.Projection = function(options) { @@ -198,14 +198,14 @@ 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 */ 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 }); @@ -491,7 +491,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. */ @@ -504,7 +504,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); @@ -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. * @todo stability experimental */ diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index 81820341cb..975c471d9f 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -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) { diff --git a/src/ol/source/debugtilesource.js b/src/ol/source/debugtilesource.js index 32c7a1905f..f0e58f115a 100644 --- a/src/ol/source/debugtilesource.js +++ b/src/ol/source/debugtilesource.js @@ -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) { diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js index 31b9c1d384..323b749068 100644 --- a/src/ol/source/imagesource.js +++ b/src/ol/source/imagesource.js @@ -30,7 +30,7 @@ ol.source.ImageOptions; /** * @constructor * @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 */ ol.source.Image = function(options) { diff --git a/src/ol/source/imagestaticsource.js b/src/ol/source/imagestaticsource.js index 8a3cae06ca..43ce4f62bd 100644 --- a/src/ol/source/imagestaticsource.js +++ b/src/ol/source/imagestaticsource.js @@ -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) { diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js index 4dc4226704..6f7d6ddd2a 100644 --- a/src/ol/source/imagewmssource.js +++ b/src/ol/source/imagewmssource.js @@ -15,7 +15,7 @@ goog.require('ol.source.wms'); * @constructor * @extends {ol.source.Image} * @implements {ol.source.FeatureInfoSource} - * @param {ol.source.ImageWMSOptions} options Options. + * @param {olx.source.ImageWMSOptions} options Options. * @todo stability experimental */ ol.source.ImageWMS = function(options) { @@ -42,11 +42,11 @@ ol.source.ImageWMS = function(options) { /** * @private - * @type {ol.source.WMSGetFeatureInfoOptions} + * @type {olx.source.WMSGetFeatureInfoOptions} */ this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ? options.getFeatureInfoOptions : - /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({}); + /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({}); /** * @private diff --git a/src/ol/source/mapguidesource.js b/src/ol/source/mapguidesource.js index 974c69b1bc..a8ddc8484b 100644 --- a/src/ol/source/mapguidesource.js +++ b/src/ol/source/mapguidesource.js @@ -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) { diff --git a/src/ol/source/mapquestsource.js b/src/ol/source/mapquestsource.js index 126072087a..68e11dc08a 100644 --- a/src/ol/source/mapquestsource.js +++ b/src/ol/source/mapquestsource.js @@ -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) { diff --git a/src/ol/source/osmsource.js b/src/ol/source/osmsource.js index 92e13ec6b8..63d57086d9 100644 --- a/src/ol/source/osmsource.js +++ b/src/ol/source/osmsource.js @@ -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) { diff --git a/src/ol/source/source.js b/src/ol/source/source.js index 3f5a46d2d1..759c7db73f 100644 --- a/src/ol/source/source.js +++ b/src/ol/source/source.js @@ -33,7 +33,7 @@ ol.source.SourceOptions; /** * @constructor * @extends {goog.events.EventTarget} - * @param {ol.source.SourceOptions} options Source options. + * @param {olx.source.SourceOptions} options Source options. * @todo stability experimental */ ol.source.Source = function(options) { diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamensource.js index 34509ac611..6a269206f7 100644 --- a/src/ol/source/stamensource.js +++ b/src/ol/source/stamensource.js @@ -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) { diff --git a/src/ol/source/tileimagesource.js b/src/ol/source/tileimagesource.js index dd9da53a21..532cb0689a 100644 --- a/src/ol/source/tileimagesource.js +++ b/src/ol/source/tileimagesource.js @@ -34,7 +34,7 @@ ol.source.TileImageOptions; /** * @constructor * @extends {ol.source.Tile} - * @param {ol.source.TileImageOptions} options Image tile options. + * @param {olx.source.TileImageOptions} options Image tile options. * @todo stability experimental */ ol.source.TileImage = function(options) { diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js index 81e57f6098..2f3768d1d3 100644 --- a/src/ol/source/tilejsonsource.js +++ b/src/ol/source/tilejsonsource.js @@ -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) { diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js index e40c93d937..960603a9ed 100644 --- a/src/ol/source/tilesource.js +++ b/src/ol/source/tilesource.js @@ -27,7 +27,7 @@ ol.source.TileOptions; /** * @constructor * @extends {ol.source.Source} - * @param {ol.source.TileOptions} options Tile source options. + * @param {olx.source.TileOptions} options Tile source options. * @todo stability experimental */ ol.source.Tile = function(options) { diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js index 77cba28dc4..d3bbd7c8ce 100644 --- a/src/ol/source/tilewmssource.js +++ b/src/ol/source/tilewmssource.js @@ -19,7 +19,7 @@ goog.require('ol.source.wms'); * @constructor * @extends {ol.source.TileImage} * @implements {ol.source.FeatureInfoSource} - * @param {ol.source.TileWMSOptions} options Tile WMS options. + * @param {olx.source.TileWMSOptions} options Tile WMS options. * @todo stability experimental */ ol.source.TileWMS = function(options) { @@ -107,11 +107,11 @@ ol.source.TileWMS = function(options) { /** * @private - * @type {ol.source.WMSGetFeatureInfoOptions} + * @type {olx.source.WMSGetFeatureInfoOptions} */ this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ? options.getFeatureInfoOptions : - /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({}); + /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({}); }; goog.inherits(ol.source.TileWMS, ol.source.TileImage); diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js index 7e25a17b55..c4a9e3ff4d 100644 --- a/src/ol/source/vectorsource.js +++ b/src/ol/source/vectorsource.js @@ -32,7 +32,7 @@ ol.source.VectorLoadState = { /** * @constructor * @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 */ ol.source.Vector = function(opt_options) { diff --git a/src/ol/source/wmssource.js b/src/ol/source/wmssource.js index eebba21c2d..5799ebaf69 100644 --- a/src/ol/source/wmssource.js +++ b/src/ol/source/wmssource.js @@ -74,7 +74,7 @@ ol.source.wms.getUrl = /** * @param {string} url URL as provided by the url function. * @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. * @param {function(string)} success Callback function for successful queries. * @param {function()=} opt_error Optional callback function for unsuccessful @@ -86,9 +86,9 @@ ol.source.wms.getFeatureInfo = // closure url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo') .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) : {}); - var localOptions = /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({ + var localOptions = /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({ method: ol.source.WMSGetFeatureInfoMethod.IFRAME, params: {} }); diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index 7136aaa3d2..15e2aae7bb 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -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) { diff --git a/src/ol/source/xyzsource.js b/src/ol/source/xyzsource.js index baf5b67b3a..b41ff92de5 100644 --- a/src/ol/source/xyzsource.js +++ b/src/ol/source/xyzsource.js @@ -12,7 +12,7 @@ goog.require('ol.tilegrid.XYZ'); /** * @constructor * @extends {ol.source.TileImage} - * @param {ol.source.XYZOptions} options XYZ options. + * @param {olx.source.XYZOptions} options XYZ options. * @todo stability experimental */ ol.source.XYZ = function(options) { diff --git a/src/ol/style/fillsymbolizer.js b/src/ol/style/fillsymbolizer.js index 53f428dff3..fca7d3ce9d 100644 --- a/src/ol/style/fillsymbolizer.js +++ b/src/ol/style/fillsymbolizer.js @@ -14,7 +14,7 @@ goog.require('ol.style.Symbolizer'); /** * @constructor * @extends {ol.style.Symbolizer} - * @param {ol.style.FillOptions=} opt_options Polygon options. + * @param {olx.style.FillOptions=} opt_options Polygon options. * @todo stability experimental */ ol.style.Fill = function(opt_options) { diff --git a/src/ol/style/iconliteral.js b/src/ol/style/iconliteral.js index 81ee54f326..2613c22c32 100644 --- a/src/ol/style/iconliteral.js +++ b/src/ol/style/iconliteral.js @@ -21,7 +21,7 @@ ol.style.IconLiteralOptions; /** * @constructor * @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) { diff --git a/src/ol/style/iconsymbolizer.js b/src/ol/style/iconsymbolizer.js index b63cd09d05..12e3ab69d7 100644 --- a/src/ol/style/iconsymbolizer.js +++ b/src/ol/style/iconsymbolizer.js @@ -14,7 +14,7 @@ goog.require('ol.style.Point'); /** * @constructor * @extends {ol.style.Point} - * @param {ol.style.IconOptions} options Icon options. + * @param {olx.style.IconOptions} options Icon options. * @todo stability experimental */ ol.style.Icon = function(options) { diff --git a/src/ol/style/lineliteral.js b/src/ol/style/lineliteral.js index c13198c630..f9724394d9 100644 --- a/src/ol/style/lineliteral.js +++ b/src/ol/style/lineliteral.js @@ -17,7 +17,7 @@ ol.style.LineLiteralOptions; /** * @constructor * @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) { goog.base(this); diff --git a/src/ol/style/polygonliteral.js b/src/ol/style/polygonliteral.js index e16c482860..d463b3ec81 100644 --- a/src/ol/style/polygonliteral.js +++ b/src/ol/style/polygonliteral.js @@ -19,7 +19,7 @@ ol.style.PolygonLiteralOptions; /** * @constructor * @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) { goog.base(this); diff --git a/src/ol/style/rule.js b/src/ol/style/rule.js index d8234de95b..5fa062f285 100644 --- a/src/ol/style/rule.js +++ b/src/ol/style/rule.js @@ -11,7 +11,7 @@ goog.require('ol.style.Symbolizer'); /** * @constructor - * @param {ol.style.RuleOptions} options Rule options. + * @param {olx.style.RuleOptions} options Rule options. * @todo stability experimental */ ol.style.Rule = function(options) { diff --git a/src/ol/style/shapeliteral.js b/src/ol/style/shapeliteral.js index 9879f89946..aabe6c3d96 100644 --- a/src/ol/style/shapeliteral.js +++ b/src/ol/style/shapeliteral.js @@ -31,7 +31,7 @@ ol.style.ShapeLiteralOptions; /** * @constructor * @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) { diff --git a/src/ol/style/shapesymbolizer.js b/src/ol/style/shapesymbolizer.js index f1121fcf0b..ed2845d81a 100644 --- a/src/ol/style/shapesymbolizer.js +++ b/src/ol/style/shapesymbolizer.js @@ -17,7 +17,7 @@ goog.require('ol.style.Stroke'); /** * @constructor * @extends {ol.style.Point} - * @param {ol.style.ShapeOptions} options Shape options. + * @param {olx.style.ShapeOptions} options Shape options. * @todo stability experimental */ ol.style.Shape = function(options) { diff --git a/src/ol/style/strokesymbolizer.js b/src/ol/style/strokesymbolizer.js index 9839efb213..9f4e41c6ca 100644 --- a/src/ol/style/strokesymbolizer.js +++ b/src/ol/style/strokesymbolizer.js @@ -16,7 +16,7 @@ goog.require('ol.style.Symbolizer'); /** * @constructor * @extends {ol.style.Symbolizer} - * @param {ol.style.StrokeOptions=} opt_options Stroke options. + * @param {olx.style.StrokeOptions=} opt_options Stroke options. * @todo stability experimental */ ol.style.Stroke = function(opt_options) { diff --git a/src/ol/style/style.js b/src/ol/style/style.js index e9bfee8657..4e15db8cf0 100644 --- a/src/ol/style/style.js +++ b/src/ol/style/style.js @@ -21,7 +21,7 @@ goog.require('ol.style.TextLiteral'); /** * @constructor - * @param {ol.style.StyleOptions} options Style options. + * @param {olx.style.StyleOptions} options Style options. * @todo stability experimental */ ol.style.Style = function(options) { diff --git a/src/ol/style/textliteral.js b/src/ol/style/textliteral.js index 9f6026c080..e94d0a0f71 100644 --- a/src/ol/style/textliteral.js +++ b/src/ol/style/textliteral.js @@ -23,7 +23,7 @@ ol.style.TextLiteralOptions; /** * @constructor * @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) { diff --git a/src/ol/style/textsymbolizer.js b/src/ol/style/textsymbolizer.js index 7b2e8e92cd..d2dc3a679d 100644 --- a/src/ol/style/textsymbolizer.js +++ b/src/ol/style/textsymbolizer.js @@ -13,7 +13,7 @@ goog.require('ol.style.TextLiteral'); /** * @constructor * @extends {ol.style.Symbolizer} - * @param {ol.style.TextOptions} options Text options. + * @param {olx.style.TextOptions} options Text options. */ ol.style.Text = function(options) { diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index e079159cd2..08ee4e4614 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -27,7 +27,7 @@ ol.DEFAULT_MAX_ZOOM = 42; /** * @constructor - * @param {ol.tilegrid.TileGridOptions} options Tile grid options. + * @param {olx.tilegrid.TileGridOptions} options Tile grid options. * @todo stability experimental */ ol.tilegrid.TileGrid = function(options) { diff --git a/src/ol/tilegrid/wmtstilegrid.js b/src/ol/tilegrid/wmtstilegrid.js index 108840ecd4..3393aced51 100644 --- a/src/ol/tilegrid/wmtstilegrid.js +++ b/src/ol/tilegrid/wmtstilegrid.js @@ -10,7 +10,7 @@ goog.require('ol.tilegrid.TileGrid'); /** * @constructor * @extends {ol.tilegrid.TileGrid} - * @param {ol.tilegrid.WMTSOptions} options WMTS options. + * @param {olx.tilegrid.WMTSOptions} options WMTS options. * @todo stability experimental */ ol.tilegrid.WMTS = function(options) { diff --git a/src/ol/tilegrid/xyztilegrid.js b/src/ol/tilegrid/xyztilegrid.js index aba7b4cc16..6325d3602b 100644 --- a/src/ol/tilegrid/xyztilegrid.js +++ b/src/ol/tilegrid/xyztilegrid.js @@ -12,7 +12,7 @@ goog.require('ol.tilegrid.TileGrid'); /** * @constructor * @extends {ol.tilegrid.TileGrid} - * @param {ol.tilegrid.XYZOptions} options XYZ options. + * @param {olx.tilegrid.XYZOptions} options XYZ options. * @todo stability experimental */ ol.tilegrid.XYZ = function(options) { diff --git a/src/ol/view2d.js b/src/ol/view2d.js index e4716f5726..e2c07f90b4 100644 --- a/src/ol/view2d.js +++ b/src/ol/view2d.js @@ -84,7 +84,7 @@ ol.View2DProperty = { * @implements {ol.IView2D} * @implements {ol.IView3D} * @extends {ol.View} - * @param {ol.View2DOptions=} opt_options View2D options. + * @param {olx.View2DOptions=} opt_options View2D options. * @todo stability experimental * @todo observable center {ol.Coordinate} the center 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 * @return {ol.CenterConstraintType} */ @@ -516,7 +516,7 @@ ol.View2D.createCenterConstraint_ = function(options) { /** * @private - * @param {ol.View2DOptions} options View2D options. + * @param {olx.View2DOptions} options View2D options. * @return {{constraint: ol.ResolutionConstraintType, maxResolution: number, * minResolution: number}} */ @@ -563,7 +563,7 @@ ol.View2D.createResolutionConstraint_ = function(options) { /** * @private - * @param {ol.View2DOptions} options View2D options. + * @param {olx.View2DOptions} options View2D options. * @return {ol.RotationConstraintType} Rotation constraint. */ ol.View2D.createRotationConstraint_ = function(options) { From d9e293109e99b71f1cdd5023d39a6360c3f42b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 14:57:42 +0100 Subject: [PATCH 08/15] Change @exportFunction to @exportSymbol sed command used: find src/ol -name '*.exports' -exec sed -ri 's/@exportFunction\s+(\S+)\s+(\S+)\s+(\S+)$/@exportSymbol \1 \1/' \{\} \; --- src/ol/animation.exports | 8 ++++---- src/ol/control/controldefaults.exports | 2 +- src/ol/interaction/interactiondefaults.exports | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/animation.exports b/src/ol/animation.exports index 887adf82d7..f887f38c28 100644 --- a/src/ol/animation.exports +++ b/src/ol/animation.exports @@ -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 diff --git a/src/ol/control/controldefaults.exports b/src/ol/control/controldefaults.exports index a3ee165dd7..0023131772 100644 --- a/src/ol/control/controldefaults.exports +++ b/src/ol/control/controldefaults.exports @@ -1 +1 @@ -@exportFunction ol.control.defaults ol.control.DefaultsOptions ol.Collection +@exportSymbol ol.control.defaults ol.control.defaults diff --git a/src/ol/interaction/interactiondefaults.exports b/src/ol/interaction/interactiondefaults.exports index 6e30aa7234..2ab5e46392 100644 --- a/src/ol/interaction/interactiondefaults.exports +++ b/src/ol/interaction/interactiondefaults.exports @@ -1 +1 @@ -@exportFunction ol.interaction.defaults ol.interaction.DefaultsOptions ol.Collection +@exportSymbol ol.interaction.defaults ol.interaction.defaults From 7b81bfab5cd50af9b7a42a4321e43c4cc920daf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 15:00:02 +0100 Subject: [PATCH 09/15] Change @exportClass to @exportSymbol sed command used: find src/ol -name '*.exports' -exec sed -ri 's/@exportClass\s+(\S+)\s+(\S+)$/@exportSymbol \1/' \{\} \; --- src/ol/attribution.exports | 2 +- src/ol/control/attributioncontrol.exports | 2 +- src/ol/control/control.exports | 2 +- src/ol/control/fullscreencontrol.exports | 2 +- src/ol/control/logocontrol.exports | 2 +- src/ol/control/mousepositioncontrol.exports | 2 +- src/ol/control/scalelinecontrol.exports | 2 +- src/ol/control/zoomcontrol.exports | 2 +- src/ol/control/zoomslidercontrol.exports | 2 +- src/ol/control/zoomtoextentcontrol.exports | 2 +- src/ol/deviceorientation.exports | 2 +- src/ol/geolocation.exports | 2 +- src/ol/interaction/doubleclickzoom.exports | 2 +- src/ol/interaction/dragpan.exports | 2 +- src/ol/interaction/dragrotate.exports | 2 +- src/ol/interaction/dragrotateandzoom.exports | 2 +- src/ol/interaction/dragzoom.exports | 2 +- src/ol/interaction/drawinteraction.exports | 2 +- src/ol/interaction/keyboardpan.exports | 2 +- src/ol/interaction/keyboardzoom.exports | 2 +- src/ol/interaction/modifyinteraction.exports | 2 +- src/ol/interaction/selectinteraction.exports | 2 +- src/ol/interaction/touchpan.exports | 2 +- src/ol/interaction/touchrotate.exports | 2 +- src/ol/layer/imagelayer.exports | 2 +- src/ol/layer/layergroup.exports | 2 +- src/ol/layer/tilelayer.exports | 2 +- src/ol/layer/vectorlayer.exports | 2 +- src/ol/map.exports | 2 +- src/ol/overlay.exports | 2 +- src/ol/proj.exports | 2 +- src/ol/source/bingmapssource.exports | 2 +- src/ol/source/debugtilesource.exports | 2 +- src/ol/source/imagestaticsource.exports | 2 +- src/ol/source/imagewmssource.exports | 2 +- src/ol/source/stamensource.exports | 2 +- src/ol/source/tilejsonsource.exports | 2 +- src/ol/source/tilewmssource.exports | 2 +- src/ol/source/vectorsource.exports | 2 +- src/ol/source/wmtssource.exports | 2 +- src/ol/source/xyzsource.exports | 2 +- src/ol/style.exports | 14 +++++++------- src/ol/tilegrid/tilegrid.exports | 2 +- src/ol/tilegrid/wmtstilegrid.exports | 2 +- src/ol/tilegrid/xyztilegrid.exports | 2 +- src/ol/view2d.exports | 2 +- 46 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/ol/attribution.exports b/src/ol/attribution.exports index 27673d4985..053c0abeae 100644 --- a/src/ol/attribution.exports +++ b/src/ol/attribution.exports @@ -1 +1 @@ -@exportClass ol.Attribution ol.AttributionOptions +@exportSymbol ol.Attribution diff --git a/src/ol/control/attributioncontrol.exports b/src/ol/control/attributioncontrol.exports index b5e1d2983d..a9fa893101 100644 --- a/src/ol/control/attributioncontrol.exports +++ b/src/ol/control/attributioncontrol.exports @@ -1,2 +1,2 @@ -@exportClass ol.control.Attribution ol.control.AttributionOptions +@exportSymbol ol.control.Attribution @exportProperty ol.control.Attribution.prototype.setMap diff --git a/src/ol/control/control.exports b/src/ol/control/control.exports index ad6eba3825..1d184d239e 100644 --- a/src/ol/control/control.exports +++ b/src/ol/control/control.exports @@ -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 diff --git a/src/ol/control/fullscreencontrol.exports b/src/ol/control/fullscreencontrol.exports index ab662df885..6b8c9b566c 100644 --- a/src/ol/control/fullscreencontrol.exports +++ b/src/ol/control/fullscreencontrol.exports @@ -1 +1 @@ -@exportClass ol.control.FullScreen ol.control.FullScreenOptions +@exportSymbol ol.control.FullScreen diff --git a/src/ol/control/logocontrol.exports b/src/ol/control/logocontrol.exports index ee50fb83e3..ccae41d4aa 100644 --- a/src/ol/control/logocontrol.exports +++ b/src/ol/control/logocontrol.exports @@ -1,2 +1,2 @@ -@exportClass ol.control.Logo ol.control.LogoOptions +@exportSymbol ol.control.Logo @exportProperty ol.control.Logo.prototype.setMap diff --git a/src/ol/control/mousepositioncontrol.exports b/src/ol/control/mousepositioncontrol.exports index 925d6c0720..73f28771eb 100644 --- a/src/ol/control/mousepositioncontrol.exports +++ b/src/ol/control/mousepositioncontrol.exports @@ -1,2 +1,2 @@ -@exportClass ol.control.MousePosition ol.control.MousePositionOptions +@exportSymbol ol.control.MousePosition @exportProperty ol.control.MousePosition.prototype.setMap diff --git a/src/ol/control/scalelinecontrol.exports b/src/ol/control/scalelinecontrol.exports index 6d0cbe1cd1..ccdf40d51b 100644 --- a/src/ol/control/scalelinecontrol.exports +++ b/src/ol/control/scalelinecontrol.exports @@ -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 diff --git a/src/ol/control/zoomcontrol.exports b/src/ol/control/zoomcontrol.exports index 91cb9a7fbe..8d8123f761 100644 --- a/src/ol/control/zoomcontrol.exports +++ b/src/ol/control/zoomcontrol.exports @@ -1,2 +1,2 @@ -@exportClass ol.control.Zoom ol.control.ZoomOptions +@exportSymbol ol.control.Zoom @exportProperty ol.control.Zoom.prototype.setMap diff --git a/src/ol/control/zoomslidercontrol.exports b/src/ol/control/zoomslidercontrol.exports index 9b07355c21..3be7924ba6 100644 --- a/src/ol/control/zoomslidercontrol.exports +++ b/src/ol/control/zoomslidercontrol.exports @@ -1 +1 @@ -@exportClass ol.control.ZoomSlider ol.control.ZoomSliderOptions +@exportSymbol ol.control.ZoomSlider diff --git a/src/ol/control/zoomtoextentcontrol.exports b/src/ol/control/zoomtoextentcontrol.exports index ca571c4f86..485e551f42 100644 --- a/src/ol/control/zoomtoextentcontrol.exports +++ b/src/ol/control/zoomtoextentcontrol.exports @@ -1 +1 @@ -@exportClass ol.control.ZoomToExtent ol.control.ZoomToExtentOptions +@exportSymbol ol.control.ZoomToExtent diff --git a/src/ol/deviceorientation.exports b/src/ol/deviceorientation.exports index 31910aa9b1..b0a0b9eaf2 100644 --- a/src/ol/deviceorientation.exports +++ b/src/ol/deviceorientation.exports @@ -1,2 +1,2 @@ -@exportClass ol.DeviceOrientation ol.DeviceOrientationOptions +@exportSymbol ol.DeviceOrientation @exportSymbol ol.DeviceOrientation.SUPPORTED ol.DeviceOrientation.SUPPORTED diff --git a/src/ol/geolocation.exports b/src/ol/geolocation.exports index 3040f335d7..398f9fefea 100644 --- a/src/ol/geolocation.exports +++ b/src/ol/geolocation.exports @@ -1,2 +1,2 @@ -@exportClass ol.Geolocation ol.GeolocationOptions +@exportSymbol ol.Geolocation @exportSymbol ol.Geolocation.SUPPORTED ol.Geolocation.SUPPORTED diff --git a/src/ol/interaction/doubleclickzoom.exports b/src/ol/interaction/doubleclickzoom.exports index 43824d9543..796868f1f1 100644 --- a/src/ol/interaction/doubleclickzoom.exports +++ b/src/ol/interaction/doubleclickzoom.exports @@ -1 +1 @@ -@exportClass ol.interaction.DoubleClickZoom ol.interaction.DoubleClickZoomOptions +@exportSymbol ol.interaction.DoubleClickZoom diff --git a/src/ol/interaction/dragpan.exports b/src/ol/interaction/dragpan.exports index 6c68510100..dbc71bf21a 100644 --- a/src/ol/interaction/dragpan.exports +++ b/src/ol/interaction/dragpan.exports @@ -1 +1 @@ -@exportClass ol.interaction.DragPan ol.interaction.DragPanOptions +@exportSymbol ol.interaction.DragPan diff --git a/src/ol/interaction/dragrotate.exports b/src/ol/interaction/dragrotate.exports index 1ca795259f..b17241c644 100644 --- a/src/ol/interaction/dragrotate.exports +++ b/src/ol/interaction/dragrotate.exports @@ -1 +1 @@ -@exportClass ol.interaction.DragRotate ol.interaction.DragRotateOptions +@exportSymbol ol.interaction.DragRotate diff --git a/src/ol/interaction/dragrotateandzoom.exports b/src/ol/interaction/dragrotateandzoom.exports index c217fc5a82..f39bc1cf2a 100644 --- a/src/ol/interaction/dragrotateandzoom.exports +++ b/src/ol/interaction/dragrotateandzoom.exports @@ -1 +1 @@ -@exportClass ol.interaction.DragRotateAndZoom ol.interaction.DragRotateAndZoomOptions +@exportSymbol ol.interaction.DragRotateAndZoom diff --git a/src/ol/interaction/dragzoom.exports b/src/ol/interaction/dragzoom.exports index e9f5fb88fb..204afabe7e 100644 --- a/src/ol/interaction/dragzoom.exports +++ b/src/ol/interaction/dragzoom.exports @@ -1 +1 @@ -@exportClass ol.interaction.DragZoom ol.interaction.DragZoomOptions +@exportSymbol ol.interaction.DragZoom diff --git a/src/ol/interaction/drawinteraction.exports b/src/ol/interaction/drawinteraction.exports index c085ef69e2..890ae0f515 100644 --- a/src/ol/interaction/drawinteraction.exports +++ b/src/ol/interaction/drawinteraction.exports @@ -1 +1 @@ -@exportClass ol.interaction.Draw ol.interaction.DrawOptions +@exportSymbol ol.interaction.Draw diff --git a/src/ol/interaction/keyboardpan.exports b/src/ol/interaction/keyboardpan.exports index ee8f69fbf0..a09f837004 100644 --- a/src/ol/interaction/keyboardpan.exports +++ b/src/ol/interaction/keyboardpan.exports @@ -1 +1 @@ -@exportClass ol.interaction.KeyboardPan ol.interaction.KeyboardPanOptions +@exportSymbol ol.interaction.KeyboardPan diff --git a/src/ol/interaction/keyboardzoom.exports b/src/ol/interaction/keyboardzoom.exports index e344610661..01a6a9d315 100644 --- a/src/ol/interaction/keyboardzoom.exports +++ b/src/ol/interaction/keyboardzoom.exports @@ -1 +1 @@ -@exportClass ol.interaction.KeyboardZoom ol.interaction.KeyboardZoomOptions +@exportSymbol ol.interaction.KeyboardZoom diff --git a/src/ol/interaction/modifyinteraction.exports b/src/ol/interaction/modifyinteraction.exports index 2b7b78bce7..60378a3759 100644 --- a/src/ol/interaction/modifyinteraction.exports +++ b/src/ol/interaction/modifyinteraction.exports @@ -1 +1 @@ -@exportClass ol.interaction.Modify ol.interaction.ModifyOptions +@exportSymbol ol.interaction.Modify diff --git a/src/ol/interaction/selectinteraction.exports b/src/ol/interaction/selectinteraction.exports index a5cd323f10..7a428aa5c9 100644 --- a/src/ol/interaction/selectinteraction.exports +++ b/src/ol/interaction/selectinteraction.exports @@ -1 +1 @@ -@exportClass ol.interaction.Select ol.interaction.SelectOptions +@exportSymbol ol.interaction.Select diff --git a/src/ol/interaction/touchpan.exports b/src/ol/interaction/touchpan.exports index daf3f02096..e50ab8ec1c 100644 --- a/src/ol/interaction/touchpan.exports +++ b/src/ol/interaction/touchpan.exports @@ -1 +1 @@ -@exportClass ol.interaction.TouchPan ol.interaction.TouchPanOptions +@exportSymbol ol.interaction.TouchPan diff --git a/src/ol/interaction/touchrotate.exports b/src/ol/interaction/touchrotate.exports index 9f00bf6c56..b7045b88ab 100644 --- a/src/ol/interaction/touchrotate.exports +++ b/src/ol/interaction/touchrotate.exports @@ -1 +1 @@ -@exportClass ol.interaction.TouchRotate ol.interaction.TouchRotateOptions +@exportSymbol ol.interaction.TouchRotate diff --git a/src/ol/layer/imagelayer.exports b/src/ol/layer/imagelayer.exports index 81b291a2f1..0027269144 100644 --- a/src/ol/layer/imagelayer.exports +++ b/src/ol/layer/imagelayer.exports @@ -1 +1 @@ -@exportClass ol.layer.Image ol.layer.LayerOptions +@exportSymbol ol.layer.Image diff --git a/src/ol/layer/layergroup.exports b/src/ol/layer/layergroup.exports index 58cd20a73c..54bd439663 100644 --- a/src/ol/layer/layergroup.exports +++ b/src/ol/layer/layergroup.exports @@ -1 +1 @@ -@exportClass ol.layer.Group ol.layer.GroupOptions +@exportSymbol ol.layer.Group diff --git a/src/ol/layer/tilelayer.exports b/src/ol/layer/tilelayer.exports index d3ded24332..941be6ffc8 100644 --- a/src/ol/layer/tilelayer.exports +++ b/src/ol/layer/tilelayer.exports @@ -1 +1 @@ -@exportClass ol.layer.Tile ol.layer.TileOptions +@exportSymbol ol.layer.Tile diff --git a/src/ol/layer/vectorlayer.exports b/src/ol/layer/vectorlayer.exports index 111527584d..3dc18a2d27 100644 --- a/src/ol/layer/vectorlayer.exports +++ b/src/ol/layer/vectorlayer.exports @@ -1 +1 @@ -@exportClass ol.layer.Vector ol.layer.VectorLayerOptions +@exportSymbol ol.layer.Vector diff --git a/src/ol/map.exports b/src/ol/map.exports index 68ff166ae7..179778a8c7 100644 --- a/src/ol/map.exports +++ b/src/ol/map.exports @@ -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 diff --git a/src/ol/overlay.exports b/src/ol/overlay.exports index 74783e7ecb..772a546710 100644 --- a/src/ol/overlay.exports +++ b/src/ol/overlay.exports @@ -1,4 +1,4 @@ -@exportClass ol.Overlay ol.OverlayOptions +@exportSymbol ol.Overlay @exportSymbol ol.OverlayPositioning @exportProperty ol.OverlayPositioning.BOTTOM_LEFT diff --git a/src/ol/proj.exports b/src/ol/proj.exports index e28a06dadd..18aa42ab25 100644 --- a/src/ol/proj.exports +++ b/src/ol/proj.exports @@ -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 diff --git a/src/ol/source/bingmapssource.exports b/src/ol/source/bingmapssource.exports index 7ce0e42656..5f7481f7c9 100644 --- a/src/ol/source/bingmapssource.exports +++ b/src/ol/source/bingmapssource.exports @@ -1,2 +1,2 @@ -@exportClass ol.source.BingMaps ol.source.BingMapsOptions +@exportSymbol ol.source.BingMaps @exportProperty ol.source.BingMaps.TOS_ATTRIBUTION diff --git a/src/ol/source/debugtilesource.exports b/src/ol/source/debugtilesource.exports index cc26dab6ad..35fcf0c02e 100644 --- a/src/ol/source/debugtilesource.exports +++ b/src/ol/source/debugtilesource.exports @@ -1 +1 @@ -@exportClass ol.source.TileDebug ol.source.TileDebugOptions +@exportSymbol ol.source.TileDebug diff --git a/src/ol/source/imagestaticsource.exports b/src/ol/source/imagestaticsource.exports index 4968e8f6f0..b07c04a34a 100644 --- a/src/ol/source/imagestaticsource.exports +++ b/src/ol/source/imagestaticsource.exports @@ -1 +1 @@ -@exportClass ol.source.ImageStatic ol.source.ImageStaticOptions +@exportSymbol ol.source.ImageStatic diff --git a/src/ol/source/imagewmssource.exports b/src/ol/source/imagewmssource.exports index 0396ea145e..afd33970c9 100644 --- a/src/ol/source/imagewmssource.exports +++ b/src/ol/source/imagewmssource.exports @@ -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 diff --git a/src/ol/source/stamensource.exports b/src/ol/source/stamensource.exports index 61702ead25..697330485e 100644 --- a/src/ol/source/stamensource.exports +++ b/src/ol/source/stamensource.exports @@ -1 +1 @@ -@exportClass ol.source.Stamen ol.source.StamenOptions +@exportSymbol ol.source.Stamen diff --git a/src/ol/source/tilejsonsource.exports b/src/ol/source/tilejsonsource.exports index e05dca5e1d..56b3f56285 100644 --- a/src/ol/source/tilejsonsource.exports +++ b/src/ol/source/tilejsonsource.exports @@ -1 +1 @@ -@exportClass ol.source.TileJSON ol.source.TileJSONOptions +@exportSymbol ol.source.TileJSON diff --git a/src/ol/source/tilewmssource.exports b/src/ol/source/tilewmssource.exports index 94fb2c22b3..e9049c25f3 100644 --- a/src/ol/source/tilewmssource.exports +++ b/src/ol/source/tilewmssource.exports @@ -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 diff --git a/src/ol/source/vectorsource.exports b/src/ol/source/vectorsource.exports index b864def335..8132e85a82 100644 --- a/src/ol/source/vectorsource.exports +++ b/src/ol/source/vectorsource.exports @@ -1,2 +1,2 @@ -@exportClass ol.source.Vector ol.source.VectorOptions +@exportSymbol ol.source.Vector @exportProperty ol.source.Vector.prototype.addFeatures diff --git a/src/ol/source/wmtssource.exports b/src/ol/source/wmtssource.exports index f29f7d0ec5..a81ed65df0 100644 --- a/src/ol/source/wmtssource.exports +++ b/src/ol/source/wmtssource.exports @@ -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 diff --git a/src/ol/source/xyzsource.exports b/src/ol/source/xyzsource.exports index 4623a4a9ec..3968a05264 100644 --- a/src/ol/source/xyzsource.exports +++ b/src/ol/source/xyzsource.exports @@ -1,2 +1,2 @@ -@exportClass ol.source.XYZ ol.source.XYZOptions +@exportSymbol ol.source.XYZ @exportProperty ol.source.XYZ.prototype.setUrl diff --git a/src/ol/style.exports b/src/ol/style.exports index f46aad4738..87526beedb 100644 --- a/src/ol/style.exports +++ b/src/ol/style.exports @@ -1,9 +1,9 @@ -@exportClass ol.style.Fill ol.style.FillOptions -@exportClass ol.style.Icon ol.style.IconOptions -@exportClass ol.style.Rule ol.style.RuleOptions -@exportClass ol.style.Shape ol.style.ShapeOptions -@exportClass ol.style.Stroke ol.style.StrokeOptions -@exportClass ol.style.Style ol.style.StyleOptions -@exportClass ol.style.Text ol.style.TextOptions +@exportSymbol ol.style.Fill +@exportSymbol ol.style.Icon +@exportSymbol ol.style.Rule +@exportSymbol ol.style.Shape +@exportSymbol ol.style.Stroke +@exportSymbol ol.style.Style +@exportSymbol ol.style.Text @exportSymbol ol.style.ShapeType @exportProperty ol.style.ShapeType.CIRCLE diff --git a/src/ol/tilegrid/tilegrid.exports b/src/ol/tilegrid/tilegrid.exports index fc8f6db1a0..5e1039d79f 100644 --- a/src/ol/tilegrid/tilegrid.exports +++ b/src/ol/tilegrid/tilegrid.exports @@ -1,4 +1,4 @@ -@exportClass ol.tilegrid.TileGrid ol.tilegrid.TileGridOptions +@exportSymbol ol.tilegrid.TileGrid @exportProperty ol.tilegrid.TileGrid.prototype.getMinZoom @exportProperty ol.tilegrid.TileGrid.prototype.getOrigin @exportProperty ol.tilegrid.TileGrid.prototype.getResolutions diff --git a/src/ol/tilegrid/wmtstilegrid.exports b/src/ol/tilegrid/wmtstilegrid.exports index 73991a2dbe..654b18d9c8 100644 --- a/src/ol/tilegrid/wmtstilegrid.exports +++ b/src/ol/tilegrid/wmtstilegrid.exports @@ -1,2 +1,2 @@ -@exportClass ol.tilegrid.WMTS ol.tilegrid.WMTSOptions +@exportSymbol ol.tilegrid.WMTS @exportProperty ol.tilegrid.WMTS.prototype.getMatrixIds diff --git a/src/ol/tilegrid/xyztilegrid.exports b/src/ol/tilegrid/xyztilegrid.exports index dd5b52245c..f05509aca9 100644 --- a/src/ol/tilegrid/xyztilegrid.exports +++ b/src/ol/tilegrid/xyztilegrid.exports @@ -1 +1 @@ -@exportClass ol.tilegrid.XYZ ol.tilegrid.XYZOptions +@exportSymbol ol.tilegrid.XYZ diff --git a/src/ol/view2d.exports b/src/ol/view2d.exports index 9065c75a51..85318dd373 100644 --- a/src/ol/view2d.exports +++ b/src/ol/view2d.exports @@ -1,4 +1,4 @@ -@exportClass ol.View2D ol.View2DOptions +@exportSymbol ol.View2D @exportProperty ol.View2D.prototype.calculateExtent @exportProperty ol.View2D.prototype.constrainResolution @exportProperty ol.View2D.prototype.constrainRotation From cf14d4e41d5f1e7f840c76ae58af4376c599cc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 13:38:08 +0100 Subject: [PATCH 10/15] Add @typedefs to externs file --- bin/generate-exports.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/generate-exports.py b/bin/generate-exports.py index e00a8e1770..5205f692cb 100755 --- a/bin/generate-exports.py +++ b/bin/generate-exports.py @@ -220,7 +220,7 @@ class ObjectLiteral(Exportable): return ''.join(lines) def extern_name(self): - return re.sub(r'ol\.(\S+)', r'olx.\1Extern', self.name) + return re.sub(r'(olx\.\S+)', r'\1Extern', self.name) def extern_namespace(self): return '.'.join(self.extern_name().split('.')[:-1]) or None @@ -398,6 +398,7 @@ def main(argv): else: sys.stdout.write('var %s;\n' % (namespace,)) for object_literal in object_literals: + sys.stdout.write(object_literal.typedef()) sys.stdout.write(object_literal.extern()) if options.typedef: From 7732c19874e5462368d31021177aaacdcde2c728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 15:19:37 +0100 Subject: [PATCH 11/15] Some options types are defined in the code The sed script caught those, so manually adjusting here. --- src/ol/control/dragboxcontrol.js | 2 +- src/ol/source/imagesource.js | 2 +- src/ol/source/source.js | 2 +- src/ol/source/tileimagesource.js | 2 +- src/ol/source/tilesource.js | 2 +- src/ol/style/iconliteral.js | 2 +- src/ol/style/lineliteral.js | 2 +- src/ol/style/polygonliteral.js | 2 +- src/ol/style/shapeliteral.js | 2 +- src/ol/style/textliteral.js | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ol/control/dragboxcontrol.js b/src/ol/control/dragboxcontrol.js index 4106b2833f..4529d77767 100644 --- a/src/ol/control/dragboxcontrol.js +++ b/src/ol/control/dragboxcontrol.js @@ -26,7 +26,7 @@ ol.control.DragBoxOptions; /** * @constructor * @extends {ol.control.Control} - * @param {olx.control.DragBoxOptions} options Drag box options. + * @param {ol.control.DragBoxOptions} options Drag box options. * @todo stability experimental */ ol.control.DragBox = function(options) { diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js index 323b749068..31b9c1d384 100644 --- a/src/ol/source/imagesource.js +++ b/src/ol/source/imagesource.js @@ -30,7 +30,7 @@ ol.source.ImageOptions; /** * @constructor * @extends {ol.source.Source} - * @param {olx.source.ImageOptions} options Single image source options. + * @param {ol.source.ImageOptions} options Single image source options. * @todo stability experimental */ ol.source.Image = function(options) { diff --git a/src/ol/source/source.js b/src/ol/source/source.js index 759c7db73f..3f5a46d2d1 100644 --- a/src/ol/source/source.js +++ b/src/ol/source/source.js @@ -33,7 +33,7 @@ ol.source.SourceOptions; /** * @constructor * @extends {goog.events.EventTarget} - * @param {olx.source.SourceOptions} options Source options. + * @param {ol.source.SourceOptions} options Source options. * @todo stability experimental */ ol.source.Source = function(options) { diff --git a/src/ol/source/tileimagesource.js b/src/ol/source/tileimagesource.js index 532cb0689a..dd9da53a21 100644 --- a/src/ol/source/tileimagesource.js +++ b/src/ol/source/tileimagesource.js @@ -34,7 +34,7 @@ ol.source.TileImageOptions; /** * @constructor * @extends {ol.source.Tile} - * @param {olx.source.TileImageOptions} options Image tile options. + * @param {ol.source.TileImageOptions} options Image tile options. * @todo stability experimental */ ol.source.TileImage = function(options) { diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js index 960603a9ed..e40c93d937 100644 --- a/src/ol/source/tilesource.js +++ b/src/ol/source/tilesource.js @@ -27,7 +27,7 @@ ol.source.TileOptions; /** * @constructor * @extends {ol.source.Source} - * @param {olx.source.TileOptions} options Tile source options. + * @param {ol.source.TileOptions} options Tile source options. * @todo stability experimental */ ol.source.Tile = function(options) { diff --git a/src/ol/style/iconliteral.js b/src/ol/style/iconliteral.js index 2613c22c32..81ee54f326 100644 --- a/src/ol/style/iconliteral.js +++ b/src/ol/style/iconliteral.js @@ -21,7 +21,7 @@ ol.style.IconLiteralOptions; /** * @constructor * @extends {ol.style.PointLiteral} - * @param {olx.style.IconLiteralOptions} options Icon literal options. + * @param {ol.style.IconLiteralOptions} options Icon literal options. */ ol.style.IconLiteral = function(options) { diff --git a/src/ol/style/lineliteral.js b/src/ol/style/lineliteral.js index f9724394d9..c13198c630 100644 --- a/src/ol/style/lineliteral.js +++ b/src/ol/style/lineliteral.js @@ -17,7 +17,7 @@ ol.style.LineLiteralOptions; /** * @constructor * @extends {ol.style.Literal} - * @param {olx.style.LineLiteralOptions} options Line literal options. + * @param {ol.style.LineLiteralOptions} options Line literal options. */ ol.style.LineLiteral = function(options) { goog.base(this); diff --git a/src/ol/style/polygonliteral.js b/src/ol/style/polygonliteral.js index d463b3ec81..e16c482860 100644 --- a/src/ol/style/polygonliteral.js +++ b/src/ol/style/polygonliteral.js @@ -19,7 +19,7 @@ ol.style.PolygonLiteralOptions; /** * @constructor * @extends {ol.style.Literal} - * @param {olx.style.PolygonLiteralOptions} options Polygon literal options. + * @param {ol.style.PolygonLiteralOptions} options Polygon literal options. */ ol.style.PolygonLiteral = function(options) { goog.base(this); diff --git a/src/ol/style/shapeliteral.js b/src/ol/style/shapeliteral.js index aabe6c3d96..9879f89946 100644 --- a/src/ol/style/shapeliteral.js +++ b/src/ol/style/shapeliteral.js @@ -31,7 +31,7 @@ ol.style.ShapeLiteralOptions; /** * @constructor * @extends {ol.style.PointLiteral} - * @param {olx.style.ShapeLiteralOptions} options Shape literal options. + * @param {ol.style.ShapeLiteralOptions} options Shape literal options. */ ol.style.ShapeLiteral = function(options) { diff --git a/src/ol/style/textliteral.js b/src/ol/style/textliteral.js index e94d0a0f71..9f6026c080 100644 --- a/src/ol/style/textliteral.js +++ b/src/ol/style/textliteral.js @@ -23,7 +23,7 @@ ol.style.TextLiteralOptions; /** * @constructor * @extends {ol.style.Literal} - * @param {olx.style.TextLiteralOptions} options Text literal options. + * @param {ol.style.TextLiteralOptions} options Text literal options. */ ol.style.TextLiteral = function(options) { From f95e0eb785266fb05ee5f1ca19cac7dea93fffc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 15:21:49 +0100 Subject: [PATCH 12/15] Treat WMSGetFeatureInfoOptions as other options types --- src/objectliterals.jsdoc | 6 ++++++ src/ol/source/wmssource.js | 11 ++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index 898a48adb3..59a9c6701b 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -775,6 +775,12 @@ * @todo stability experimental */ +/** + * @typedef {Object} olx.source.WMSGetFeatureInfoOptions + * @property {ol.source.WMSGetFeatureInfoMethod|undefined} method Method. + * @property {Object.|undefined} params Params. + */ + /** * @typedef {Object} olx.source.WMTSOptions * @property {Array.|undefined} attributions Attributions. diff --git a/src/ol/source/wmssource.js b/src/ol/source/wmssource.js index 5799ebaf69..5f9f3eae08 100644 --- a/src/ol/source/wmssource.js +++ b/src/ol/source/wmssource.js @@ -7,13 +7,6 @@ goog.require('goog.object'); goog.require('goog.uri.utils'); -/** - * @typedef {{method: (ol.source.WMSGetFeatureInfoMethod|undefined), - * params: (Object.|undefined)}} - */ -ol.source.WMSGetFeatureInfoOptions; - - /** * Method to use to get WMS feature info. * @enum {string} @@ -74,8 +67,8 @@ ol.source.wms.getUrl = /** * @param {string} url URL as provided by the url function. * @param {ol.Pixel} pixel Pixel. - * @param {olx.source.WMSGetFeatureInfoOptions} options Options as defined in the - * source. + * @param {olx.source.WMSGetFeatureInfoOptions} options Options as defined in + * the source. * @param {function(string)} success Callback function for successful queries. * @param {function()=} opt_error Optional callback function for unsuccessful * queries. From f15694844d262946863437d8abde058322dd037a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 15:22:18 +0100 Subject: [PATCH 13/15] Line is too long --- src/ol/control/mousepositioncontrol.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js index 7381867f59..c103e9ad84 100644 --- a/src/ol/control/mousepositioncontrol.js +++ b/src/ol/control/mousepositioncontrol.js @@ -36,7 +36,8 @@ ol.control.MousePositionProperty = { * * @constructor * @extends {ol.control.Control} - * @param {olx.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 From b709820777f7241a9f5735a16312905c3251b9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 15:22:47 +0100 Subject: [PATCH 14/15] Use olx for some parser options types --- src/ol/parser/ogc/wfsparser_v1.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ol/parser/ogc/wfsparser_v1.js b/src/ol/parser/ogc/wfsparser_v1.js index 15e431d683..0bd8e4ac8b 100644 --- a/src/ol/parser/ogc/wfsparser_v1.js +++ b/src/ol/parser/ogc/wfsparser_v1.js @@ -30,7 +30,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) { /** * @param {olx.parser.WFSWriteGetFeatureOptions} options Options. * @return {{node: Node, - * options: ol.parser.WFSWriteGetFeatureOptions}} Object. + * options: olx.parser.WFSWriteGetFeatureOptions}} Object. * @this {ol.parser.XML} */ 'GetFeature': function(options) { @@ -64,7 +64,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) { * @param {{inserts: Array., * updates: Array., * deletes: Array., - * options: ol.parser.WFSWriteTransactionOptions}} obj Object. + * options: olx.parser.WFSWriteTransactionOptions}} obj Object. * @return {Element} Node. * @this {ol.parser.XML} */ @@ -120,7 +120,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) { }, /** * @param {{feature: ol.Feature, - * options: ol.parser.WFSWriteTransactionOptions}} obj Object. + * options: olx.parser.WFSWriteTransactionOptions}} obj Object. * @return {Element} Node. * @this {ol.parser.XML} */ @@ -140,7 +140,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) { }, /** * @param {{feature: ol.Feature, - * options: ol.parser.WFSWriteTransactionOptions}} obj Object. + * options: olx.parser.WFSWriteTransactionOptions}} obj Object. * @return {Element} Node. * @this {ol.parser.XML} */ @@ -213,7 +213,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) { }, /** * @param {{feature: ol.Feature, - * options: ol.parser.WFSWriteTransactionOptions}} obj Object. + * options: olx.parser.WFSWriteTransactionOptions}} obj Object. * @return {Element} Node. * @this {ol.parser.XML} */ From 7fa3a38081019093a8028cd80864a4536e065a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 12 Dec 2013 16:57:39 +0100 Subject: [PATCH 15/15] external/src/types.js file no longer exists --- apidoc/plugins/exports.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apidoc/plugins/exports.js b/apidoc/plugins/exports.js index f2b19c2d57..6e8eaaf4b0 100644 --- a/apidoc/plugins/exports.js +++ b/apidoc/plugins/exports.js @@ -30,7 +30,6 @@ function collectExports(source) { var encoding = env.conf.encoding || 'utf8'; var fs = require('jsdoc/fs'); collectExports(fs.readFileSync('build/src/external/src/exports.js', encoding)); -collectExports(fs.readFileSync('build/src/external/src/types.js', encoding)); exports.handlers = {