Rename ol.ProjectionLike to ol.proj.ProjectionLike

src/objectliterals.jsdoc

@@ -14,7 +14,7 @@
  * @typedef {Object} ol.GeolocationOptions
  * @property {boolean|undefined} tracking Tracking.
  * @property {GeolocationPositionOptions|undefined} trackingOptions Tracking options.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  */
 
 /**
@@ -108,7 +108,7 @@
  * @property {number|undefined} maxZoom The maximum zoom level used to determine
  *     the resolution constraint. It is used together with `maxResolution` and
  *     `zoomFactor`. Default is 28.
- * @property {ol.ProjectionLike} projection The projection. Default is
+ * @property {ol.proj.ProjectionLike} projection The projection. Default is
  *     `EPSG:3857` (Spherical Mercator).
  * @property {number|undefined} resolution The initial resolution for the view.
  *     The units are `projection` units per pixel (e.g. meters per pixel).
@@ -198,7 +198,7 @@
  * @property {string|undefined} className CSS class name. Default is 'ol-mouse-position'.
  * @property {ol.CoordinateFormatType|undefined} coordinateFormat Coordinate
  *     format.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  * @property {Element|undefined} target Target.
  * @property {string|undefined} undefinedHTML Markup for undefined coordinates.
  *     Default is '' (empty string).
@@ -388,7 +388,7 @@
 
 /**
  * @typedef {Object} ol.parser.GMLWriteOptions
- * @property {ol.ProjectionLike} srsName The srsName to use when writing.
+ * @property {ol.proj.ProjectionLike} srsName The srsName to use when writing.
  * @property {string|undefined} axisOrientation The axis orientation.
  */
 
@@ -459,7 +459,7 @@
 /**
  * @typedef {Object} ol.source.TileDebugOptions
  * @property {ol.Extent|undefined} extent Extent.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid.
  */
 
@@ -483,7 +483,7 @@
  *     `LAYERS` param is required. `STYLES` is '' by default. `VERSION` is
  *     '1.3.0' by default. `WIDTH`, `HEIGHT`, `BBOX` and `CRS` (`SRS` for WMS
  *     version < 1.3.0) will be set dynamically.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  * @property {number|undefined} ratio Ratio. 1 means image requests are the size
  *     of the map viewport, 2 means twice the size of the map viewport, and so
  *     on.
@@ -497,7 +497,7 @@
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {ol.Extent|undefined} extent Extent.
  * @property {string|undefined} logo Logo.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  */
 
 /**
@@ -517,7 +517,7 @@
  * @property {ol.Extent|undefined} extent Extent.
  * @property {ol.Extent|undefined} imageExtent Extent of the image.
  * @property {ol.Size|undefined} imageSize Size of the image.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  * @property {string|undefined} url Url.
  */
 
@@ -542,7 +542,7 @@
  *     getFeatureInfoOptions Options for GetFeatureInfo.
  * @property {ol.tilegrid.TileGrid|undefined} tileGrid Tile grid.
  * @property {number|undefined} maxZoom Maximum zoom.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  * @property {string|undefined} url WMS service url.
  * @property {Array.<string>|undefined} urls WMS service urls. Use this instead
  *     of `url` when the WMS supports multiple urls for GetMap requests.
@@ -556,7 +556,7 @@
  * @property {string|undefined} logo Logo.
  * @property {ol.parser.Parser} parser Parser instance to parse data
  *     provided as `data` or fetched from `url`.
- * @property {ol.ProjectionLike|undefined} projection Projection. Usually the
+ * @property {ol.proj.ProjectionLike|undefined} projection Projection. Usually the
  *     projection is provided by the parser, so this only needs to be set if
  *     the parser does not know the SRS (e.g. in some GML flavors), or if the
  *     projection determined by the parser needs to be overridden.
@@ -571,7 +571,7 @@
  *    lineStringCollections Line string collections.
  * @property {Array.<ol.geom2.PointCollection>|undefined} pointCollections
  *    Point collections.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  */
 
 
@@ -591,7 +591,7 @@
  *     requests.
  * @property {ol.Extent|undefined} extent Extent.
  * @property {ol.tilegrid.WMTS} tileGrid Tile grid.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  * @property {ol.source.WMTSRequestEncoding|undefined} requestEncoding Request
  *     encoding.
  * @property {string} layer Layer.
@@ -612,7 +612,7 @@
  *     requests.
  * @property {ol.Extent|undefined} extent Extent.
  * @property {string|undefined} logo Logo.
- * @property {ol.ProjectionLike} projection Projection.
+ * @property {ol.proj.ProjectionLike} projection Projection.
  * @property {number|undefined} maxZoom Optional max zoom level.  The default is
  *     18.
  * @property {number|undefined} minZoom Unsupported (TODO: remove this).

src/ol/parser/featureparser.js

@@ -98,7 +98,7 @@ ol.parser.ReadFeaturesCallback;
 
 
 /**
- * @typedef {{projection: ol.ProjectionLike}}
+ * @typedef {{projection: ol.proj.ProjectionLike}}
  */
 ol.parser.ReadFeaturesMetadata;
 

src/ol/proj/proj.js

@@ -1,7 +1,7 @@
-goog.provide('ol.ProjectionLike');
 goog.provide('ol.ProjectionUnits');
 goog.provide('ol.proj');
 goog.provide('ol.proj.Projection');
+goog.provide('ol.proj.ProjectionLike');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
@@ -27,9 +27,9 @@ ol.HAVE_PROJ4JS = ol.ENABLE_PROJ4JS && typeof Proj4js == 'object';
 /**
  * A projection as {@link ol.proj.Projection}, SRS identifier string or
  * undefined.
- * @typedef {ol.proj.Projection|string|undefined} ol.ProjectionLike
+ * @typedef {ol.proj.Projection|string|undefined} ol.proj.ProjectionLike
  */
-ol.ProjectionLike;
+ol.proj.ProjectionLike;
 
 
 /**
@@ -455,8 +455,8 @@ ol.proj.removeTransform = function(source, destination) {
 
 
 /**
- * @param {ol.ProjectionLike} projectionLike Either a code string which is a
+ * @param {ol.proj.ProjectionLike} projectionLike Either a code string which is
- *     combination of authority and identifier such as "EPSG:4326", or an
+ *     a combination of authority and identifier such as "EPSG:4326", or an
  *     existing projection object, or undefined.
  * @return {ol.proj.Projection} Projection.
  */
@@ -537,8 +537,8 @@ ol.proj.equivalent = function(projection1, projection2) {
  * function to convert a coordinates array from the source projection to the
  * destination projection.
  *
- * @param {ol.ProjectionLike} source Source.
+ * @param {ol.proj.ProjectionLike} source Source.
- * @param {ol.ProjectionLike} destination Destination.
+ * @param {ol.proj.ProjectionLike} destination Destination.
  * @return {ol.TransformFunction} Transform.
  */
 ol.proj.getTransform = function(source, destination) {
@@ -672,8 +672,8 @@ ol.proj.cloneTransform = function(input, opt_output, opt_dimension) {
 
 /**
  * @param {ol.Coordinate} point Point.
- * @param {ol.ProjectionLike} source Source.
+ * @param {ol.proj.ProjectionLike} source Source.
- * @param {ol.ProjectionLike} destination Destination.
+ * @param {ol.proj.ProjectionLike} destination Destination.
  * @return {ol.Coordinate} Point.
  */
 ol.proj.transform = function(point, source, destination) {

src/ol/source/imagesource.js

@@ -17,7 +17,7 @@ goog.require('ol.source.Source');
  *            crossOrigin: (null|string|undefined),
  *            extent: (null|ol.Extent|undefined),
  *            logo: (string|undefined),
- *            projection: ol.ProjectionLike,
+ *            projection: ol.proj.ProjectionLike,
  *            resolutions: (Array.<number>|undefined),
  *            imageUrlFunction: (ol.ImageUrlFunctionType|
  *                undefined)}}

src/ol/source/tileimagesource.js

@@ -20,7 +20,7 @@ goog.require('ol.tilegrid.TileGrid');
  *            extent: (ol.Extent|undefined),
  *            logo: (string|undefined),
  *            opaque: (boolean|undefined),
- *            projection: ol.ProjectionLike,
+ *            projection: ol.proj.ProjectionLike,
  *            tileGrid: (ol.tilegrid.TileGrid|undefined),
  *            tileUrlFunction: (ol.TileUrlFunctionType|undefined)}}
  */

src/ol/source/tilesource.js

@@ -16,7 +16,7 @@ goog.require('ol.tilegrid.TileGrid');
  *            extent: (ol.Extent|undefined),
  *            logo: (string|undefined),
  *            opaque: (boolean|undefined),
- *            projection: ol.ProjectionLike,
+ *            projection: ol.proj.ProjectionLike,
  *            tileGrid: (ol.tilegrid.TileGrid|undefined)}}
  */
 ol.source.TileOptions;