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

Merge pull request #12608 from tschaub/more-proj-ids

Browse Source 
Support more OGC CRS identifiers
This commit is contained in:
Tim Schaub
2021-08-08 15:58:07 -06:00
committed by GitHub
parent 22a48fe939 08583b4a41
commit 3bff0f23ca
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/proj/epsg3857.js
+1
View File
@@ -71,6 +71,7 @@ export const PROJECTIONS = [
new EPSG3857Projection('EPSG:102100'), new EPSG3857Projection('EPSG:102100'),
new EPSG3857Projection('EPSG:102113'), new EPSG3857Projection('EPSG:102113'),
new EPSG3857Projection('EPSG:900913'), new EPSG3857Projection('EPSG:900913'),
new EPSG3857Projection('http://www.opengis.net/def/crs/EPSG/0/3857'),
new EPSG3857Projection('http://www.opengis.net/gml/srs/epsg.xml#3857'), new EPSG3857Projection('http://www.opengis.net/gml/srs/epsg.xml#3857'),
]; ];
src/ol/proj/epsg4326.js
+2
View File
@@ -63,5 +63,7 @@ export const PROJECTIONS = [
new EPSG4326Projection('EPSG:4326', 'neu'), new EPSG4326Projection('EPSG:4326', 'neu'),
new EPSG4326Projection('urn:ogc:def:crs:OGC:1.3:CRS84'), new EPSG4326Projection('urn:ogc:def:crs:OGC:1.3:CRS84'),
new EPSG4326Projection('urn:ogc:def:crs:OGC:2:84'), new EPSG4326Projection('urn:ogc:def:crs:OGC:2:84'),
new EPSG4326Projection('http://www.opengis.net/def/crs/OGC/1.3/CRS84', 'neu'),
new EPSG4326Projection('http://www.opengis.net/gml/srs/epsg.xml#4326', 'neu'), new EPSG4326Projection('http://www.opengis.net/gml/srs/epsg.xml#4326', 'neu'),
new EPSG4326Projection('http://www.opengis.net/def/crs/EPSG/0/4326', 'neu'),
]; ];
test/node/ol/proj.test.js
+14 -13
View File
@@ -190,12 +190,14 @@ describe('ol/proj.js', function () {
}); });
} }
it('gives that 3857, 102100, 102113, 900913 are equivalent ', function () { it('treats EPSG:3857 variants as equivalent', function () {
_testAllEquivalent([ _testAllEquivalent([
'EPSG:3857', 'EPSG:3857',
'EPSG:102100', 'EPSG:102100',
'EPSG:102113', 'EPSG:102113',
'EPSG:900913', 'EPSG:900913',
'http://www.opengis.net/def/crs/EPSG/0/3857',
'http://www.opengis.net/gml/srs/epsg.xml#3857',
]); ]);
}); });
@@ -217,18 +219,17 @@ describe('ol/proj.js', function () {
_testAllEquivalent(['EPSG:3857', 'EPSG:3857']); _testAllEquivalent(['EPSG:3857', 'EPSG:3857']);
}); });
it( it('treats EPSG:4326 variants as equivalent', function () {
'gives that CRS:84, urn:ogc:def:crs:EPSG:6.6:4326, EPSG:4326, ' + _testAllEquivalent([
'urn:x-ogc:def:crs:EPSG:6.6:4326 are equivalent', 'CRS:84',
function () { 'urn:ogc:def:crs:EPSG:6.6:4326',
_testAllEquivalent([ 'urn:x-ogc:def:crs:EPSG:6.6:4326',
'CRS:84', 'EPSG:4326',
'urn:ogc:def:crs:EPSG:6.6:4326', 'http://www.opengis.net/def/crs/OGC/1.3/CRS84',
'urn:x-ogc:def:crs:EPSG:6.6:4326', 'http://www.opengis.net/gml/srs/epsg.xml#4326',
'EPSG:4326', 'http://www.opengis.net/def/crs/EPSG/0/4326',
]); ]);
} });
);
it('requires code and units to be equal for projection evquivalence', function () { it('requires code and units to be equal for projection evquivalence', function () {
const proj1 = new Projection({ const proj1 = new Projection({