diff --git a/examples/wmts-capabilities.js b/examples/wmts-capabilities.js index 50373bde61..41cb7f921a 100644 --- a/examples/wmts-capabilities.js +++ b/examples/wmts-capabilities.js @@ -1,7 +1,7 @@ goog.require('ol.parser.ogc.WMTSCapabilities'); -goog.require('ol.proj.addCommonProjections'); +goog.require('ol.proj.common'); -ol.proj.addCommonProjections(); +ol.proj.common.add(); Proj4js.defs['EPSG:31256'] = '+proj=tmerc +lat_0=0 ' + '+lon_0=16.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +ellps=bessel ' + '+towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232 ' + diff --git a/src/ol/map.js b/src/ol/map.js index bdd1332ff0..e0738cdb8f 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -56,7 +56,7 @@ goog.require('ol.interaction.defaults'); goog.require('ol.layer.LayerBase'); goog.require('ol.layer.LayerGroup'); goog.require('ol.proj'); -goog.require('ol.proj.addCommonProjections'); +goog.require('ol.proj.common'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.canvas.Map'); goog.require('ol.renderer.canvas.SUPPORTED'); @@ -1217,7 +1217,7 @@ ol.RendererHints.createFromQueryData = function(opt_queryData) { }; -ol.proj.addCommonProjections(); +ol.proj.common.add(); if (goog.DEBUG) { diff --git a/src/ol/proj.exports b/src/ol/proj.exports index 21c35d5652..6ad6796116 100644 --- a/src/ol/proj.exports +++ b/src/ol/proj.exports @@ -13,10 +13,11 @@ @exportProperty ol.ProjectionUnits.METERS @exportSymbol ol.proj.addProjection -@exportSymbol ol.proj.addCommonProjections @exportSymbol ol.proj.get @exportSymbol ol.proj.getTransform @exportSymbol ol.proj.getTransformFromProjections @exportSymbol ol.proj.transform @exportSymbol ol.proj.transformWithProjections @exportSymbol ol.proj.configureProj4jsProjection + +@exportSymbol ol.proj.common.add diff --git a/src/ol/proj/common.js b/src/ol/proj/common.js index a5e77cf62e..00965a28e6 100644 --- a/src/ol/proj/common.js +++ b/src/ol/proj/common.js @@ -1,4 +1,4 @@ -goog.provide('ol.proj.addCommonProjections'); +goog.provide('ol.proj.common'); goog.require('ol.proj'); goog.require('ol.proj.EPSG3857'); @@ -8,7 +8,7 @@ goog.require('ol.proj.EPSG4326'); /** * FIXME empty description for jsdoc */ -ol.proj.addCommonProjections = function() { +ol.proj.common.add = function() { // Add transformations that don't alter coordinates to convert within set of // projections with equal meaning. ol.proj.addEquivalentProjections(ol.proj.EPSG3857.PROJECTIONS);