From 376d75ea4f004c798fda3ef8e9adee689711b726 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Wed, 18 Jul 2012 23:01:53 +0200 Subject: [PATCH] Rename ol.Projection.createFromCode to getFromCode --- src/ol/createmap.js | 2 +- src/ol/projection.js | 6 +++--- src/ol/projection_test.js | 4 ++-- src/ol/tilestore/openstreetmap.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ol/createmap.js b/src/ol/createmap.js index 64515f186c..dc5a783039 100644 --- a/src/ol/createmap.js +++ b/src/ol/createmap.js @@ -79,7 +79,7 @@ ol.createMap = function(target, opt_values, opt_rendererHints) { if (!goog.object.containsKey(values, ol.MapProperty.PROJECTION)) { values[ol.MapProperty.PROJECTION] = - ol.Projection.createFromCode(ol.DEFAULT_PROJECTION_CODE); + ol.Projection.getFromCode(ol.DEFAULT_PROJECTION_CODE); } /** diff --git a/src/ol/projection.js b/src/ol/projection.js index b8ba0ec2de..0bd6b5a00a 100644 --- a/src/ol/projection.js +++ b/src/ol/projection.js @@ -162,7 +162,7 @@ ol.Projection.addTransform = function(source, destination, transform) { * @param {string} code Code. * @return {ol.Projection} Projection. */ -ol.Projection.createFromCode = function(code) { +ol.Projection.getFromCode = function(code) { var projections = ol.Projection.projections_; goog.asserts.assert(goog.object.containsKey(projections, code)); return projections[code]; @@ -208,8 +208,8 @@ ol.Projection.getTransform = function(source, destination) { * @return {ol.TransformFunction} Transform. */ ol.Projection.getTransformFromCodes = function(sourceCode, destinationCode) { - var source = ol.Projection.createFromCode(sourceCode); - var destination = ol.Projection.createFromCode(destinationCode); + var source = ol.Projection.getFromCode(sourceCode); + var destination = ol.Projection.getFromCode(destinationCode); return ol.Projection.getTransform(source, destination); }; diff --git a/src/ol/projection_test.js b/src/ol/projection_test.js index a47a037882..7200f1236a 100644 --- a/src/ol/projection_test.js +++ b/src/ol/projection_test.js @@ -5,7 +5,7 @@ goog.require('ol.Projection'); function _testAllEquivalent(codes) { - var projections = goog.array.map(codes, ol.Projection.createFromCode); + var projections = goog.array.map(codes, ol.Projection.getFromCode); goog.array.forEach(projections, function(source) { goog.array.forEach(projections, function(destination) { assertTrue(ol.Projection.equivalent(source, destination)); @@ -34,7 +34,7 @@ function testEpsg4326Equivalence() { function testIdentityTransform() { - var epsg4326 = ol.Projection.createFromCode('EPSG:4326'); + var epsg4326 = ol.Projection.getFromCode('EPSG:4326'); var uniqueObject = {}; var sourcePoint = new goog.math.Coordinate(uniqueObject, uniqueObject); var destinationPoint = ol.Projection.transform( diff --git a/src/ol/tilestore/openstreetmap.js b/src/ol/tilestore/openstreetmap.js index fe725bfe1a..08684d91d5 100644 --- a/src/ol/tilestore/openstreetmap.js +++ b/src/ol/tilestore/openstreetmap.js @@ -14,7 +14,7 @@ goog.require('ol.tilegrid.createOpenStreetMap'); */ ol.tilestore.createOpenStreetMap = function() { - var projection = ol.Projection.createFromCode('EPSG:3857'); + var projection = ol.Projection.getFromCode('EPSG:3857'); var tileGrid = ol.tilegrid.createOpenStreetMap(18); var tileUrlFunction = ol.TileUrlFunction.withTileCoordTransform( function(tileCoord) {