From b9b70ea3ec48ec4139098d7c4dbf8455dccd8ca5 Mon Sep 17 00:00:00 2001 From: Willie Nordmann Date: Wed, 26 Jul 2017 12:52:37 -0500 Subject: [PATCH 1/2] Changing the EPSG3857.PROJECTION array assignment and adding urn:ogc:crs:EPSG::3857 while removing a duplicate --- src/ol/proj/epsg3857.js | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/src/ol/proj/epsg3857.js b/src/ol/proj/epsg3857.js index 361ead8c14..273da4b8f1 100644 --- a/src/ol/proj/epsg3857.js +++ b/src/ol/proj/epsg3857.js @@ -63,31 +63,21 @@ ol.proj.EPSG3857.EXTENT = [ ol.proj.EPSG3857.WORLD_EXTENT = [-180, -85, 180, 85]; -/** - * Lists several projection codes with the same meaning as EPSG:3857. - * - * @type {Array.} - */ -ol.proj.EPSG3857.CODES = [ - 'EPSG:3857', - 'EPSG:102100', - 'EPSG:102113', - 'EPSG:900913', - 'urn:ogc:def:crs:EPSG:6.18:3:3857', - 'urn:ogc:def:crs:EPSG::3857', - 'http://www.opengis.net/gml/srs/epsg.xml#3857' -]; - - /** * Projections equal to EPSG:3857. * * @const * @type {Array.} */ -ol.proj.EPSG3857.PROJECTIONS = ol.proj.EPSG3857.CODES.map(function(code) { - return new ol.proj.EPSG3857.Projection_(code); -}); +ol.proj.EPSG3857.PROJECTIONS = [ + new ol.proj.EPSG3857.Projection_('EPSG:3857'), + new ol.proj.EPSG3857.Projection_('EPSG:102100'), + new ol.proj.EPSG3857.Projection_('EPSG:102113'), + new ol.proj.EPSG3857.Projection_('urn:ogc:def:crs:EPSG:6.18:3:3857'), + new ol.proj.EPSG3857.Projection_('urn:ogc:def:crs:EPSG:3857'), + new ol.proj.EPSG3857.Projection_('urn:ogc:def:crs:EPSG::3857'), + new ol.proj.EPSG3857.Projection_('http://www.opengis.net/gml/srs/epsg.xml#3857') +]; /** From 648cd0ca6159ce233ef7ba8a2f060fba2c35f958 Mon Sep 17 00:00:00 2001 From: Willie Nordmann Date: Wed, 26 Jul 2017 13:08:39 -0500 Subject: [PATCH 2/2] Missed EPSG:900913 --- src/ol/proj/epsg3857.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ol/proj/epsg3857.js b/src/ol/proj/epsg3857.js index 273da4b8f1..85f4b7a11c 100644 --- a/src/ol/proj/epsg3857.js +++ b/src/ol/proj/epsg3857.js @@ -73,6 +73,7 @@ ol.proj.EPSG3857.PROJECTIONS = [ new ol.proj.EPSG3857.Projection_('EPSG:3857'), new ol.proj.EPSG3857.Projection_('EPSG:102100'), new ol.proj.EPSG3857.Projection_('EPSG:102113'), + new ol.proj.EPSG3857.Projection_('EPSG:900913'), new ol.proj.EPSG3857.Projection_('urn:ogc:def:crs:EPSG:6.18:3:3857'), new ol.proj.EPSG3857.Projection_('urn:ogc:def:crs:EPSG:3857'), new ol.proj.EPSG3857.Projection_('urn:ogc:def:crs:EPSG::3857'),