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

Separate ol.projection module from ol.Projection class

Browse Source
This commit is contained in:
Tom Payne
2013-03-03 13:09:13 +01:00
parent 3e420313a2
commit fcc620af7d
28 changed files with 165 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/control/mousepositioncontrol.js
View File

@@ -15,6 +15,7 @@ goog.require('ol.Pixel');
goog.require('ol.Projection');
goog.require('ol.TransformFunction');
goog.require('ol.control.Control');
goog.require('ol.projection');
@@ -71,7 +72,7 @@ ol.control.MousePosition = function(mousePositionOptions) {
* @private
* @type {ol.TransformFunction}
*/
this.transform_ = ol.Projection.identityTransform;
this.transform_ = ol.projection.identityTransform;
/**
* @private
@@ -166,10 +167,10 @@ ol.control.MousePosition.prototype.updateHTML_ = function(pixel) {
if (!goog.isNull(pixel)) {
if (this.renderedProjection_ != this.mapProjection_) {
if (goog.isDef(this.projection_)) {
this.transform_ = ol.Projection.getTransform(
this.transform_ = ol.projection.getTransform(
this.mapProjection_, this.projection_);
} else {
this.transform_ = ol.Projection.identityTransform;
this.transform_ = ol.projection.identityTransform;
}
this.renderedProjection_ = this.mapProjection_;
}

5
src/ol/geolocation.js
View File

@@ -9,6 +9,7 @@ goog.require('goog.math');
goog.require('ol.Coordinate');
goog.require('ol.Object');
goog.require('ol.Projection');
goog.require('ol.projection');
/**
@@ -75,8 +76,8 @@ ol.Geolocation.prototype.disposeInternal = function() {
ol.Geolocation.prototype.handleProjectionChanged_ = function() {
var projection = this.getProjection();
if (goog.isDefAndNotNull(projection)) {
this.transformCoords_ = ol.Projection.getTransform(
ol.Projection.getFromCode('EPSG:4326'), projection);
this.transformCoords_ = ol.projection.getTransform(
ol.projection.getFromCode('EPSG:4326'), projection);
if (!goog.isNull(this.position_)) {
this.set(ol.GeolocationProperty.POSITION,
this.transformCoords_(this.position_));

1
src/ol/map.js
View File

@@ -58,6 +58,7 @@ goog.require('ol.interaction.TouchPan');
goog.require('ol.interaction.TouchRotateAndZoom');
goog.require('ol.interaction.condition');
goog.require('ol.layer.Layer');
goog.require('ol.projection');
goog.require('ol.projection.addCommonProjections');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.Map');

4
src/ol/parser/ogc/wmtscapabilities_v1_0_0.js
View File

@@ -1,9 +1,9 @@
goog.provide('ol.parser.ogc.WMTSCapabilities_v1_0_0');
goog.require('goog.dom.xml');
goog.require('ol.Coordinate');
goog.require('ol.Projection');
goog.require('ol.parser.XML');
goog.require('ol.parser.ogc.OWSCommon_v1_1_0');
goog.require('ol.projection');
@@ -77,7 +77,7 @@ ol.parser.ogc.WMTSCapabilities_v1_0_0 = function() {
var topLeftCorner = this.getChildValue(node);
var coords = topLeftCorner.split(' ');
var axisOrientation =
ol.Projection.getFromCode(obj['supportedCRS']).getAxisOrientation();
ol.projection.getFromCode(obj['supportedCRS']).getAxisOrientation();
obj['topLeftCorner'] = ol.Coordinate.fromProjectedArray(
[parseFloat(coords[0]), parseFloat(coords[1])], axisOrientation);
},

13
src/ol/projection.exports
View File

@@ -1,10 +1,4 @@
@exportSymbol ol.Projection
@exportProperty ol.Projection.addProjection
@exportProperty ol.Projection.getFromCode
@exportProperty ol.Projection.getTransform
@exportProperty ol.Projection.getTransformFromCodes
@exportProperty ol.Projection.transform
@exportProperty ol.Projection.transformWithCodes
@exportProperty ol.Projection.prototype.getAxisOrientation
@exportProperty ol.Projection.prototype.getCode
@exportProperty ol.Projection.prototype.getExtent
@@ -13,3 +7,10 @@
@exportSymbol ol.ProjectionUnits
@exportProperty ol.ProjectionUnits.DEGREES
@exportProperty ol.ProjectionUnits.METERS
@exportSymbol ol.projection.addProjection
@exportSymbol ol.projection.getFromCode
@exportSymbol ol.projection.getTransform
@exportSymbol ol.projection.getTransformFromCodes
@exportSymbol ol.projection.transform
@exportSymbol ol.projection.transformWithCodes

107
src/ol/projection.js
View File

@@ -1,5 +1,6 @@
goog.provide('ol.Projection');
goog.provide('ol.ProjectionUnits');
goog.provide('ol.projection');
goog.require('goog.array');
goog.require('goog.asserts');
@@ -135,21 +136,21 @@ ol.Proj4jsProjection.prototype.getProj4jsProj = function() {
* @private
* @type {Object.<string, ol.Proj4jsProjection>}
*/
ol.Projection.proj4jsProjections_ = {};
ol.projection.proj4jsProjections_ = {};
/**
* @private
* @type {Object.<string, ol.Projection>}
*/
ol.Projection.projections_ = {};
ol.projection.projections_ = {};
/**
* @private
* @type {Object.<string, Object.<string, ol.TransformFunction>>}
*/
ol.Projection.transforms_ = {};
ol.projection.transforms_ = {};
/**
@@ -158,13 +159,13 @@ ol.Projection.transforms_ = {};
*
* @param {Array.<ol.Projection>} projections Projections.
*/
ol.Projection.addEquivalentProjections = function(projections) {
ol.Projection.addProjections(projections);
ol.projection.addEquivalentProjections = function(projections) {
ol.projection.addProjections(projections);
goog.array.forEach(projections, function(source) {
goog.array.forEach(projections, function(destination) {
if (source !== destination) {
ol.Projection.addTransform(
source, destination, ol.Projection.cloneTransform);
ol.projection.addTransform(
source, destination, ol.projection.cloneTransform);
}
});
});
@@ -182,12 +183,12 @@ ol.Projection.addEquivalentProjections = function(projections) {
* @param {ol.TransformFunction} inverseTransform Transform from any projection
* in projection2 to any projection in projection1..
*/
ol.Projection.addEquivalentTransforms =
ol.projection.addEquivalentTransforms =
function(projections1, projections2, forwardTransform, inverseTransform) {
goog.array.forEach(projections1, function(projection1) {
goog.array.forEach(projections2, function(projection2) {
ol.Projection.addTransform(projection1, projection2, forwardTransform);
ol.Projection.addTransform(projection2, projection1, inverseTransform);
ol.projection.addTransform(projection1, projection2, forwardTransform);
ol.projection.addTransform(projection2, projection1, inverseTransform);
});
});
};
@@ -196,8 +197,8 @@ ol.Projection.addEquivalentTransforms =
/**
* @param {ol.Proj4jsProjection} proj4jsProjection Proj4js projection.
*/
ol.Projection.addProj4jsProjection = function(proj4jsProjection) {
var proj4jsProjections = ol.Projection.proj4jsProjections_;
ol.projection.addProj4jsProjection = function(proj4jsProjection) {
var proj4jsProjections = ol.projection.proj4jsProjections_;
var code = proj4jsProjection.getCode();
goog.asserts.assert(!goog.object.containsKey(proj4jsProjections, code));
proj4jsProjections[code] = proj4jsProjection;
@@ -207,22 +208,22 @@ ol.Projection.addProj4jsProjection = function(proj4jsProjection) {
/**
* @param {ol.Projection} projection Projection.
*/
ol.Projection.addProjection = function(projection) {
var projections = ol.Projection.projections_;
ol.projection.addProjection = function(projection) {
var projections = ol.projection.projections_;
var code = projection.getCode();
goog.asserts.assert(!goog.object.containsKey(projections, code));
projections[code] = projection;
ol.Projection.addTransform(
projection, projection, ol.Projection.cloneTransform);
ol.projection.addTransform(
projection, projection, ol.projection.cloneTransform);
};
/**
* @param {Array.<ol.Projection>} projections Projections.
*/
ol.Projection.addProjections = function(projections) {
ol.projection.addProjections = function(projections) {
goog.array.forEach(projections, function(projection) {
ol.Projection.addProjection(projection);
ol.projection.addProjection(projection);
});
};
@@ -230,12 +231,12 @@ ol.Projection.addProjections = function(projections) {
/**
* FIXME empty description for jsdoc
*/
ol.Projection.clearAllProjections = function() {
ol.projection.clearAllProjections = function() {
if (ol.ENABLE_PROJ4JS) {
ol.Projection.proj4jsProjections_ = {};
ol.projection.proj4jsProjections_ = {};
}
ol.Projection.projections_ = {};
ol.Projection.transforms_ = {};
ol.projection.projections_ = {};
ol.projection.transforms_ = {};
};
@@ -244,11 +245,11 @@ ol.Projection.clearAllProjections = function() {
* @param {string} defaultCode Default code.
* @return {ol.Projection} Projection.
*/
ol.Projection.createProjection = function(projection, defaultCode) {
ol.projection.createProjection = function(projection, defaultCode) {
if (!goog.isDefAndNotNull(projection)) {
return ol.Projection.getFromCode(defaultCode);
return ol.projection.getFromCode(defaultCode);
} else if (goog.isString(projection)) {
return ol.Projection.getFromCode(projection);
return ol.projection.getFromCode(projection);
} else {
goog.asserts.assert(projection instanceof ol.Projection);
return projection;
@@ -264,10 +265,10 @@ ol.Projection.createProjection = function(projection, defaultCode) {
* @param {ol.Projection} destination Destination.
* @param {ol.TransformFunction} transformFn Transform.
*/
ol.Projection.addTransform = function(source, destination, transformFn) {
ol.projection.addTransform = function(source, destination, transformFn) {
var sourceCode = source.getCode();
var destinationCode = destination.getCode();
var transforms = ol.Projection.transforms_;
var transforms = ol.projection.transforms_;
if (!goog.object.containsKey(transforms, sourceCode)) {
transforms[sourceCode] = {};
}
@@ -286,10 +287,10 @@ ol.Projection.addTransform = function(source, destination, transformFn) {
* @param {ol.Projection} destination Destination projection.
* @return {ol.TransformFunction} transformFn The unregistered transform.
*/
ol.Projection.removeTransform = function(source, destination) {
ol.projection.removeTransform = function(source, destination) {
var sourceCode = source.getCode();
var destinationCode = destination.getCode();
var transforms = ol.Projection.transforms_;
var transforms = ol.projection.transforms_;
goog.asserts.assert(sourceCode in transforms);
goog.asserts.assert(destinationCode in transforms[sourceCode]);
var transform = transforms[sourceCode][destinationCode];
@@ -307,10 +308,10 @@ ol.Projection.removeTransform = function(source, destination) {
* such as “EPSG:4326”.
* @return {ol.Projection} Projection.
*/
ol.Projection.getFromCode = function(code) {
var projection = ol.Projection.projections_[code];
ol.projection.getFromCode = function(code) {
var projection = ol.projection.projections_[code];
if (ol.HAVE_PROJ4JS && !goog.isDef(projection)) {
projection = ol.Projection.getProj4jsProjectionFromCode_(code);
projection = ol.projection.getProj4jsProjectionFromCode_(code);
}
if (!goog.isDef(projection)) {
goog.asserts.assert(goog.isDef(projection));
@@ -325,8 +326,8 @@ ol.Projection.getFromCode = function(code) {
* @private
* @return {ol.Proj4jsProjection} Proj4js projection.
*/
ol.Projection.getProj4jsProjectionFromCode_ = function(code) {
var proj4jsProjections = ol.Projection.proj4jsProjections_;
ol.projection.getProj4jsProjectionFromCode_ = function(code) {
var proj4jsProjections = ol.projection.proj4jsProjections_;
var proj4jsProjection = proj4jsProjections[code];
if (!goog.isDef(proj4jsProjection)) {
var proj4jsProj = new Proj4js.Proj(code);
@@ -346,14 +347,14 @@ ol.Projection.getProj4jsProjectionFromCode_ = function(code) {
* @param {ol.Projection} projection2 Projection 2.
* @return {boolean} Equivalent.
*/
ol.Projection.equivalent = function(projection1, projection2) {
ol.projection.equivalent = function(projection1, projection2) {
if (projection1 === projection2) {
return true;
} else if (projection1.getUnits() != projection2.getUnits()) {
return false;
} else {
var transformFn = ol.Projection.getTransform(projection1, projection2);
return transformFn === ol.Projection.cloneTransform;
var transformFn = ol.projection.getTransform(projection1, projection2);
return transformFn === ol.projection.cloneTransform;
}
};
@@ -366,8 +367,8 @@ ol.Projection.equivalent = function(projection1, projection2) {
* @param {ol.Projection} destination Destination.
* @return {ol.TransformFunction} Transform.
*/
ol.Projection.getTransform = function(source, destination) {
var transforms = ol.Projection.transforms_;
ol.projection.getTransform = function(source, destination) {
var transforms = ol.projection.transforms_;
var sourceCode = source.getCode();
var destinationCode = destination.getCode();
var transform;
@@ -381,7 +382,7 @@ ol.Projection.getTransform = function(source, destination) {
proj4jsSource = source;
} else {
proj4jsSource =
ol.Projection.getProj4jsProjectionFromCode_(source.getCode());
ol.projection.getProj4jsProjectionFromCode_(source.getCode());
}
var sourceProj4jsProj = proj4jsSource.getProj4jsProj();
var proj4jsDestination;
@@ -389,7 +390,7 @@ ol.Projection.getTransform = function(source, destination) {
proj4jsDestination = destination;
} else {
proj4jsDestination =
ol.Projection.getProj4jsProjectionFromCode_(destination.getCode());
ol.projection.getProj4jsProjectionFromCode_(destination.getCode());
}
var destinationProj4jsProj = proj4jsDestination.getProj4jsProj();
transform =
@@ -403,11 +404,11 @@ ol.Projection.getTransform = function(source, destination) {
sourceProj4jsProj, destinationProj4jsProj, proj4jsPoint);
return new ol.Coordinate(proj4jsPoint.x, proj4jsPoint.y);
};
ol.Projection.addTransform(source, destination, transform);
ol.projection.addTransform(source, destination, transform);
}
if (!goog.isDef(transform)) {
goog.asserts.assert(goog.isDef(transform));
transform = ol.Projection.identityTransform;
transform = ol.projection.identityTransform;
}
return transform;
};
@@ -422,10 +423,10 @@ ol.Projection.getTransform = function(source, destination) {
* @param {string} destinationCode Destination code.
* @return {ol.TransformFunction} Transform.
*/
ol.Projection.getTransformFromCodes = function(sourceCode, destinationCode) {
var source = ol.Projection.getFromCode(sourceCode);
var destination = ol.Projection.getFromCode(destinationCode);
return ol.Projection.getTransform(source, destination);
ol.projection.getTransformFromCodes = function(sourceCode, destinationCode) {
var source = ol.projection.getFromCode(sourceCode);
var destination = ol.projection.getFromCode(destinationCode);
return ol.projection.getTransform(source, destination);
};
@@ -433,7 +434,7 @@ ol.Projection.getTransformFromCodes = function(sourceCode, destinationCode) {
* @param {ol.Coordinate} point Point.
* @return {ol.Coordinate} Unaltered point (same reference).
*/
ol.Projection.identityTransform = function(point) {
ol.projection.identityTransform = function(point) {
return point;
};
@@ -442,7 +443,7 @@ ol.Projection.identityTransform = function(point) {
* @param {ol.Coordinate} point Point.
* @return {ol.Coordinate} Equal point (different reference).
*/
ol.Projection.cloneTransform = function(point) {
ol.projection.cloneTransform = function(point) {
return new ol.Coordinate(point.x, point.y);
};
@@ -455,8 +456,8 @@ ol.Projection.cloneTransform = function(point) {
* @param {ol.Projection} destination Destination.
* @return {ol.Coordinate} Point.
*/
ol.Projection.transform = function(point, source, destination) {
var transformFn = ol.Projection.getTransform(source, destination);
ol.projection.transform = function(point, source, destination) {
var transformFn = ol.projection.getTransform(source, destination);
return transformFn(point);
};
@@ -467,9 +468,9 @@ ol.Projection.transform = function(point, source, destination) {
* @param {string} destinationCode Destination code.
* @return {ol.Coordinate} Point.
*/
ol.Projection.transformWithCodes =
ol.projection.transformWithCodes =
function(point, sourceCode, destinationCode) {
var transformFn = ol.Projection.getTransformFromCodes(
var transformFn = ol.projection.getTransformFromCodes(
sourceCode, destinationCode);
return transformFn(point);
};

8
src/ol/projection/common.js
View File

@@ -1,6 +1,6 @@
goog.provide('ol.projection.addCommonProjections');
goog.require('ol.Projection');
goog.require('ol.projection');
goog.require('ol.projection.EPSG3857');
goog.require('ol.projection.EPSG4326');
@@ -11,11 +11,11 @@ goog.require('ol.projection.EPSG4326');
ol.projection.addCommonProjections = function() {
// Add transformations that don't alter coordinates to convert within set of
// projections with equal meaning.
ol.Projection.addEquivalentProjections(ol.projection.EPSG3857.PROJECTIONS);
ol.Projection.addEquivalentProjections(ol.projection.EPSG4326.PROJECTIONS);
ol.projection.addEquivalentProjections(ol.projection.EPSG3857.PROJECTIONS);
ol.projection.addEquivalentProjections(ol.projection.EPSG4326.PROJECTIONS);
// Add transformations to convert EPSG:4326 like coordinates to EPSG:3857 like
// coordinates and back.
ol.Projection.addEquivalentTransforms(
ol.projection.addEquivalentTransforms(
ol.projection.EPSG4326.PROJECTIONS,
ol.projection.EPSG3857.PROJECTIONS,
ol.projection.EPSG3857.fromEPSG4326,

1
src/ol/projection/epsg3857.js
View File

@@ -5,6 +5,7 @@ goog.require('ol.Coordinate');
goog.require('ol.Extent');
goog.require('ol.Projection');
goog.require('ol.ProjectionUnits');
goog.require('ol.projection');

1
src/ol/projection/epsg4326.js
View File

@@ -3,6 +3,7 @@ goog.provide('ol.projection.EPSG4326');
goog.require('ol.Extent');
goog.require('ol.Projection');
goog.require('ol.ProjectionUnits');
goog.require('ol.projection');

8
src/ol/source/bingmapssource.js
View File

@@ -6,11 +6,11 @@ goog.require('goog.array');
goog.require('goog.net.Jsonp');
goog.require('ol.Attribution');
goog.require('ol.Extent');
goog.require('ol.Projection');
goog.require('ol.Size');
goog.require('ol.TileCoord');
goog.require('ol.TileRange');
goog.require('ol.TileUrlFunction');
goog.require('ol.projection');
goog.require('ol.source.ImageTileSource');
goog.require('ol.tilegrid.XYZ');
@@ -36,7 +36,7 @@ ol.BingMapsStyle = {
ol.source.BingMaps = function(bingMapsOptions) {
goog.base(this, {
projection: ol.Projection.getFromCode('EPSG:3857')
projection: ol.projection.getFromCode('EPSG:3857')
});
/**
@@ -123,8 +123,8 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse =
};
})));
var transform = ol.Projection.getTransform(
ol.Projection.getFromCode('EPSG:4326'), this.getProjection());
var transform = ol.projection.getTransform(
ol.projection.getFromCode('EPSG:4326'), this.getProjection());
var attributions = goog.array.map(
resource.imageryProviders,
function(imageryProvider) {

4
src/ol/source/singleimagewmssource.js
View File

@@ -4,8 +4,8 @@ goog.require('goog.uri.utils');
goog.require('ol.Extent');
goog.require('ol.Image');
goog.require('ol.ImageUrlFunction');
goog.require('ol.Projection');
goog.require('ol.Size');
goog.require('ol.projection');
goog.require('ol.source.ImageSource');
@@ -17,7 +17,7 @@ goog.require('ol.source.ImageSource');
*/
ol.source.SingleImageWMS = function(options) {
var projection = ol.Projection.createProjection(
var projection = ol.projection.createProjection(
options.projection, 'EPSG:3857');
var projectionExtent = projection.getExtent();

4
src/ol/source/tiledwmssource.js
View File

@@ -7,9 +7,9 @@ goog.require('goog.array');
goog.require('goog.object');
goog.require('goog.uri.utils');
goog.require('ol.Extent');
goog.require('ol.Projection');
goog.require('ol.TileCoord');
goog.require('ol.TileUrlFunction');
goog.require('ol.projection');
goog.require('ol.source.ImageTileSource');
@@ -20,7 +20,7 @@ goog.require('ol.source.ImageTileSource');
* @param {ol.source.TiledWMSOptions} tiledWMSOptions options.
*/
ol.source.TiledWMS = function(tiledWMSOptions) {
var projection = ol.Projection.createProjection(
var projection = ol.projection.createProjection(
tiledWMSOptions.projection, 'EPSG:3857');
var projectionExtent = projection.getExtent();

8
src/ol/source/tilejsonsource.js
View File

@@ -13,10 +13,10 @@ goog.require('goog.asserts');
goog.require('goog.net.jsloader');
goog.require('ol.Attribution');
goog.require('ol.Extent');
goog.require('ol.Projection');
goog.require('ol.TileCoord');
goog.require('ol.TileRange');
goog.require('ol.TileUrlFunction');
goog.require('ol.projection');
goog.require('ol.source.ImageTileSource');
goog.require('ol.tilegrid.XYZ');
@@ -52,7 +52,7 @@ goog.exportSymbol('grid', grid);
ol.source.TileJSON = function(tileJsonOptions) {
goog.base(this, {
projection: ol.Projection.getFromCode('EPSG:3857')
projection: ol.projection.getFromCode('EPSG:3857')
});
/**
@@ -80,7 +80,7 @@ ol.source.TileJSON.prototype.handleTileJSONResponse = function() {
var tileJSON = ol.tilejson.grids_.pop();
var epsg4326Projection = ol.Projection.getFromCode('EPSG:4326');
var epsg4326Projection = ol.projection.getFromCode('EPSG:4326');
var epsg4326Extent, extent;
if (goog.isDef(tileJSON.bounds)) {
@@ -88,7 +88,7 @@ ol.source.TileJSON.prototype.handleTileJSONResponse = function() {
epsg4326Extent = new ol.Extent(
bounds[0], bounds[1], bounds[2], bounds[3]);
extent = epsg4326Extent.transform(
ol.Projection.getTransform(epsg4326Projection, this.getProjection()));
ol.projection.getTransform(epsg4326Projection, this.getProjection()));
this.setExtent(extent);
} else {
epsg4326Extent = null;

3
src/ol/source/xyzsource.js
View File

@@ -10,6 +10,7 @@ goog.require('ol.Projection');
goog.require('ol.TileCoord');
goog.require('ol.TileUrlFunction');
goog.require('ol.TileUrlFunctionType');
goog.require('ol.projection');
goog.require('ol.source.ImageTileSource');
goog.require('ol.tilegrid.XYZ');
@@ -36,7 +37,7 @@ ol.source.XYZOptions;
ol.source.XYZ = function(xyzOptions) {
var projection = xyzOptions.projection ||
ol.Projection.getFromCode('EPSG:3857');
ol.projection.getFromCode('EPSG:3857');
/**
* @type {ol.TileUrlFunctionType}

1
src/ol/tilegrid/xyztilegrid.js
View File

@@ -3,6 +3,7 @@ goog.provide('ol.tilegrid.XYZ');
goog.require('ol.Coordinate');
goog.require('ol.Size');
goog.require('ol.TileRange');
goog.require('ol.projection');
goog.require('ol.projection.EPSG3857');
goog.require('ol.tilegrid.TileGrid');

5
src/ol/view2d.js
View File

@@ -15,6 +15,7 @@ goog.require('ol.RotationConstraint');
goog.require('ol.Size');
goog.require('ol.View');
goog.require('ol.animation');
goog.require('ol.projection');
/**
@@ -46,7 +47,7 @@ ol.View2D = function(opt_view2DOptions) {
var values = {};
values[ol.View2DProperty.CENTER] = goog.isDef(view2DOptions.center) ?
view2DOptions.center : null;
values[ol.View2DProperty.PROJECTION] = ol.Projection.createProjection(
values[ol.View2DProperty.PROJECTION] = ol.projection.createProjection(
view2DOptions.projection, 'EPSG:3857');
if (goog.isDef(view2DOptions.resolution)) {
values[ol.View2DProperty.RESOLUTION] = view2DOptions.resolution;
@@ -353,7 +354,7 @@ ol.View2D.createConstraints_ = function(view2DOptions) {
numZoomLevels = view2DOptions.numZoomLevels;
zoomFactor = view2DOptions.zoomFactor;
} else {
var projectionExtent = ol.Projection.createProjection(
var projectionExtent = ol.projection.createProjection(
view2DOptions.projection, 'EPSG:3857').getExtent();
maxResolution = Math.max(
projectionExtent.maxX - projectionExtent.minX,