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

Proj support for new extent structure

Browse Source
This commit is contained in:
Tim Schaub
2013-09-03 17:47:57 -06:00
parent 7d00159bff
commit 0eb4cd6dd4
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/proj/chprojection.js
View File

@@ -410,7 +410,7 @@ goog.inherits(ol.proj.EPSG2056, ol.proj.CH);
* @type {ol.Extent}
*/
ol.proj.EPSG2056.EXTENT =
[2485869.5728, 2837076.5648, 1076443.1884, 1299941.7864];
[[2485869.5728, 1076443.1884], [2837076.5648, 1299941.7864]];
/**
@@ -447,7 +447,10 @@ goog.inherits(ol.proj.EPSG21781, ol.proj.CH);
* @const
* @type {ol.Extent}
*/
ol.proj.EPSG21781.EXTENT = [485869.5728, 837076.5648, 76443.1884, 299941.7864];
ol.proj.EPSG21781.EXTENT = [
[485869.5728, 76443.1884],
[837076.5648, 299941.7864]
];
/**

4
src/ol/proj/epsg3857projection.js
View File

@@ -44,8 +44,8 @@ ol.proj.EPSG3857.HALF_SIZE = Math.PI * ol.proj.EPSG3857.RADIUS;
* @type {ol.Extent}
*/
ol.proj.EPSG3857.EXTENT = [
-ol.proj.EPSG3857.HALF_SIZE, ol.proj.EPSG3857.HALF_SIZE,
-ol.proj.EPSG3857.HALF_SIZE, ol.proj.EPSG3857.HALF_SIZE
[-ol.proj.EPSG3857.HALF_SIZE, -ol.proj.EPSG3857.HALF_SIZE],
[ol.proj.EPSG3857.HALF_SIZE, ol.proj.EPSG3857.HALF_SIZE]
];

2
src/ol/proj/epsg4326projection.js
View File

@@ -30,7 +30,7 @@ goog.inherits(ol.proj.EPSG4326, ol.Projection);
* @const
* @type {ol.Extent}
*/
ol.proj.EPSG4326.EXTENT = [-180, 180, -90, 90];
ol.proj.EPSG4326.EXTENT = [[-180, -90], [180, 90]];
/**

4
test/spec/ol/proj/chprojection.test.js
View File

@@ -90,8 +90,8 @@ describe('ol.proj.EPSG21781', function() {
var fromEPSG4326 = ol.proj.getTransform('EPSG:4326', 'EPSG:21781');
var toEPSG4326 = ol.proj.getTransform('EPSG:21781', 'EPSG:4326');
var roundTripped, x, y;
for (x = extent[0]; x < extent[1]; x += 50000) {
for (y = extent[2]; y < extent[3]; y += 50000) {
for (x = extent[0][0]; x < extent[1][0]; x += 50000) {
for (y = extent[0][1]; y < extent[1][1]; y += 50000) {
roundTripped = fromEPSG4326(toEPSG4326([x, y]));
expect(roundTripped).to.be.an(Array);
expect(roundTripped).to.have.length(2);

4
test/spec/ol/proj/proj.test.js
View File

@@ -284,7 +284,7 @@ describe('ol.proj', function() {
describe('ol.proj.removeTransform()', function() {
var extent = [180, 180, -90, 90];
var extent = [[180, -90], [180, 90]];
var units = ol.ProjectionUnits.DEGREES;
it('removes functions cached by addTransform', function() {
@@ -347,7 +347,7 @@ describe('ol.proj', function() {
});
it('returns a configured projection', function() {
var extent = [485869.5728, 837076.5648, 76443.1884, 299941.7864];
var extent = [[485869.5728, 76443.1884], [837076.5648, 299941.7864]];
var epsg21781 = ol.proj.configureProj4jsProjection({
code: 'EPSG:21781',
extent: extent