Add ol.proj.EPSG2056 and factor out common code

This commit is contained in:
Tom Payne
2013-06-11 15:50:00 +02:00
parent c02e2530f1
commit 0968e2b00b
6 changed files with 380 additions and 195 deletions

View File

@@ -0,0 +1,3 @@
@exportSymbol ol.proj.CH.add
@exportSymbol ol.proj.EPSG2056.add
@exportSymbol ol.proj.EPSG21781.add

265
src/ol/proj/chprojection.js Normal file
View File

@@ -0,0 +1,265 @@
goog.provide('ol.proj.CH');
goog.provide('ol.proj.EPSG2056');
goog.provide('ol.proj.EPSG21781');
goog.require('goog.asserts');
goog.require('ol.Projection');
goog.require('ol.ProjectionUnits');
goog.require('ol.proj');
goog.require('ol.proj.EPSG4326');
/**
* Internal base class for Swiss grid projections.
* @constructor
* @extends {ol.Projection}
* @param {{code: string, extent: ol.Extent}} options Options.
*/
ol.proj.CH = function(options) {
goog.base(this, {
code: options.code,
extent: options.extent,
global: false,
units: ol.ProjectionUnits.METERS
});
};
goog.inherits(ol.proj.CH, ol.Projection);
/**
* Add EPSG:2056 and EPSG:21781 projections, and transformations between them.
*/
ol.proj.CH.add = function() {
ol.proj.EPSG2056.add();
ol.proj.EPSG21781.add();
var epsg2056 = ol.proj.get('EPSG:2056');
var epsg21781 = ol.proj.get('EPSG:21781');
ol.proj.addTransform(epsg2056, epsg21781,
goog.partial(ol.proj.CH.translate_, -2000000, -1000000));
ol.proj.addTransform(epsg21781, epsg2056,
goog.partial(ol.proj.CH.translate_, 2000000, 1000000));
};
/**
* Transformation from EPSG:4326 to EPSG:2056/EPSG:21781.
*
* This uses an approximation that is accurate to about 1m.
*
* @see http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/products/skripts.html
*
* @param {number} offsetY Y offset.
* @param {number} offsetX X offset.
* @param {Array.<number>} input Input array of coordinate values.
* @param {Array.<number>=} opt_output Output array of coordinate values.
* @param {number=} opt_dimension Dimension (default is 2).
* @private
* @return {Array.<number>} Output array of coordinate values.
*/
ol.proj.CH.fromEPSG4326_ =
function(offsetY, offsetX, input, opt_output, opt_dimension) {
var n = input.length;
var dimension = goog.isDef(opt_dimension) ? opt_dimension : 2;
var output;
if (goog.isDef(opt_output)) {
output = opt_output;
} else {
if (dimension > 2) {
output = input.slice();
} else {
output = new Array(n);
}
}
goog.asserts.assert(dimension >= 2);
goog.asserts.assert(output.length % dimension === 0);
var auxLat, auxLon, i;
for (i = 0; i < n; i += dimension) {
auxLat = 36 * input[i + 1] / 100 - 16.902866;
auxLon = 36 * input[i] / 100 - 2.67825;
output[i] = offsetY + 72.37 +
211455.93 * auxLon -
10938.51 * auxLon * auxLat -
0.36 * auxLon * auxLat * auxLat -
44.54 * auxLon * auxLon * auxLon;
output[i + 1] = offsetX + 147.07 +
308807.95 * auxLat +
3745.25 * auxLon * auxLon +
76.63 * auxLat * auxLat -
194.56 * auxLon * auxLon * auxLat +
119.79 * auxLat * auxLat * auxLat;
}
return output;
};
/**
* Transformation from EPSG:2056/EPSG:21781 to EPSG:4326.
*
* This uses an approximation that is accurate to about 1m.
*
* @see http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/products/skripts.html
*
* @param {number} offsetY Y offset.
* @param {number} offsetX X offset.
* @param {Array.<number>} input Input array of coordinate values.
* @param {Array.<number>=} opt_output Output array of coordinate values.
* @param {number=} opt_dimension Dimension (default is 2).
* @private
* @return {Array.<number>} Output array of coordinate values.
*/
ol.proj.CH.toEPSG4326_ =
function(offsetY, offsetX, input, opt_output, opt_dimension) {
var n = input.length;
var dimension = goog.isDef(opt_dimension) ? opt_dimension : 2;
var output;
if (goog.isDef(opt_output)) {
output = opt_output;
} else {
if (dimension > 2) {
output = input.slice();
} else {
output = new Array(n);
}
}
goog.asserts.assert(dimension >= 2);
goog.asserts.assert(output.length % dimension === 0);
var auxX, auxY, i;
for (i = 0; i < n; i += dimension) {
auxY = (input[i] - offsetY) / 1000000;
auxX = (input[i + 1] - offsetX) / 1000000;
output[i] = 100 * (2.6779094 +
4.728982 * auxY +
0.791484 * auxY * auxX +
0.1306 * auxY * auxX * auxX -
0.0436 * auxY * auxY * auxY) / 36;
output[i + 1] = 100 * (16.9023892 +
3.238272 * auxX -
0.270978 * auxY * auxY -
0.002528 * auxX * auxX -
0.0447 * auxY * auxY * auxX -
0.014 * auxX * auxX * auxX) / 36;
}
return output;
};
/**
* Transformation between EPSG:2056 and EPSG:21781.
*
* Currently a simple offset is used. This is accurate to within 3m.
*
* @param {number} offsetY Y offset.
* @param {number} offsetX X offset.
* @param {Array.<number>} input Input array of coordinate values.
* @param {Array.<number>=} opt_output Output array of coordinate values.
* @param {number=} opt_dimension Dimension (default is 2).
* @private
* @return {Array.<number>} Output array of coordinate values.
*/
ol.proj.CH.translate_ =
function(offsetY, offsetX, input, opt_output, opt_dimension) {
var n = input.length;
var dimension = goog.isDef(opt_dimension) ? opt_dimension : 2;
var output;
if (goog.isDef(opt_output)) {
output = opt_output;
} else {
if (dimension > 2) {
output = input.slice();
} else {
output = new Array(n);
}
}
goog.asserts.assert(dimension >= 2);
goog.asserts.assert(output.length % dimension === 0);
var i;
for (i = 0; i < n; i += dimension) {
output[i] = input[i] + offsetY;
output[i + 1] = input[i + 1] + offsetX;
}
return output;
};
/**
* @inheritDoc
*/
ol.proj.CH.prototype.getPointResolution = function(resolution, point) {
return resolution;
};
/**
* The EPSG:2056 projection, also known as LV95 (CH1903+).
* @constructor
* @extends {ol.proj.CH}
*/
ol.proj.EPSG2056 = function() {
goog.base(this, {
code: 'EPSG:2056',
extent: ol.proj.EPSG2056.EXTENT
});
};
goog.inherits(ol.proj.EPSG2056, ol.proj.CH);
/**
* @const
* @type {ol.Extent}
*/
ol.proj.EPSG2056.EXTENT =
[2485869.5728, 2837076.5648, 1076443.1884, 1299941.7864];
/**
* Add the EPSG:2056 projection and transformations to and from EPSG:4326.
*/
ol.proj.EPSG2056.add = function() {
ol.proj.addEquivalentProjections(ol.proj.EPSG4326.PROJECTIONS);
var epsg2056 = new ol.proj.EPSG2056();
ol.proj.addProjection(epsg2056);
ol.proj.addEquivalentTransforms(
ol.proj.EPSG4326.PROJECTIONS,
[epsg2056],
goog.partial(ol.proj.CH.fromEPSG4326_, 2600000, 1200000),
goog.partial(ol.proj.CH.toEPSG4326_, 2600000, 1200000));
};
/**
* The EPSG:21781 projection, also known as LV03 (CH1903).
* @constructor
* @extends {ol.proj.CH}
*/
ol.proj.EPSG21781 = function() {
goog.base(this, {
code: 'EPSG:21781',
extent: ol.proj.EPSG21781.EXTENT
});
};
goog.inherits(ol.proj.EPSG21781, ol.proj.CH);
/**
* @const
* @type {ol.Extent}
*/
ol.proj.EPSG21781.EXTENT = [485869.5728, 837076.5648, 76443.1884, 299941.7864];
/**
* Add the EPSG:21781 projection and transformations to and from EPSG:4326.
*/
ol.proj.EPSG21781.add = function() {
ol.proj.addEquivalentProjections(ol.proj.EPSG4326.PROJECTIONS);
var epsg21781 = new ol.proj.EPSG21781();
ol.proj.addProjection(epsg21781);
ol.proj.addEquivalentTransforms(
ol.proj.EPSG4326.PROJECTIONS,
[epsg21781],
goog.partial(ol.proj.CH.fromEPSG4326_, 600000, 200000),
goog.partial(ol.proj.CH.toEPSG4326_, 600000, 200000));
};

View File

@@ -1,2 +0,0 @@
@exportSymbol ol.proj.EPSG21781
@exportSymbol ol.proj.EPSG21781.add

View File

@@ -1,143 +0,0 @@
goog.provide('ol.proj.EPSG21781');
goog.require('goog.asserts');
goog.require('ol.Projection');
goog.require('ol.ProjectionUnits');
goog.require('ol.proj');
goog.require('ol.proj.EPSG4326');
/**
* @constructor
* @extends {ol.Projection}
*/
ol.proj.EPSG21781 = function() {
goog.base(this, {
code: 'EPSG:21781',
units: ol.ProjectionUnits.METERS,
extent: ol.proj.EPSG21781.EXTENT,
global: false
});
};
goog.inherits(ol.proj.EPSG21781, ol.Projection);
/**
* @const
* @type {ol.Extent}
*/
ol.proj.EPSG21781.EXTENT = [485869.5728, 837076.5648, 76443.1884, 299941.7864];
/**
* FIXME empty description for jsdoc
*/
ol.proj.EPSG21781.add = function() {
ol.proj.addEquivalentProjections(ol.proj.EPSG4326.PROJECTIONS);
var epsg21781 = new ol.proj.EPSG21781();
ol.proj.addProjection(epsg21781);
ol.proj.addEquivalentTransforms(
ol.proj.EPSG4326.PROJECTIONS,
[epsg21781],
ol.proj.EPSG21781.fromEPSG4326,
ol.proj.EPSG21781.toEPSG4326);
};
/**
* Transformation from EPSG:4326 to EPSG:21781.
*
* @see http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/products/skripts.html
*
* @param {Array.<number>} input Input array of coordinate values.
* @param {Array.<number>=} opt_output Output array of coordinate values.
* @param {number=} opt_dimension Dimension (default is 2).
* @return {Array.<number>} Output array of coordinate values.
*/
ol.proj.EPSG21781.fromEPSG4326 = function(input, opt_output, opt_dimension) {
var n = input.length;
var dimension = goog.isDef(opt_dimension) ? opt_dimension : 2;
var output;
if (goog.isDef(opt_output)) {
output = opt_output;
} else {
if (dimension > 2) {
output = input.slice();
} else {
output = new Array(n);
}
}
goog.asserts.assert(dimension >= 2);
goog.asserts.assert(output.length % dimension === 0);
var auxLat, auxLon, i;
for (i = 0; i < n; i += dimension) {
auxLat = 36 * input[i + 1] / 100 - 16.902866;
auxLon = 36 * input[i] / 100 - 2.67825;
output[i] = 600072.37 +
211455.93 * auxLon -
10938.51 * auxLon * auxLat -
0.36 * auxLon * auxLat * auxLat -
44.54 * auxLon * auxLon * auxLon;
output[i + 1] = 200147.07 +
308807.95 * auxLat +
3745.25 * auxLon * auxLon +
76.63 * auxLat * auxLat -
194.56 * auxLon * auxLon * auxLat +
119.79 * auxLat * auxLat * auxLat;
}
return output;
};
/**
* Transformation from EPSG:21781 to EPSG:4326.
*
* @see http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/products/skripts.html
*
* @param {Array.<number>} input Input array of coordinate values.
* @param {Array.<number>=} opt_output Output array of coordinate values.
* @param {number=} opt_dimension Dimension (default is 2).
* @return {Array.<number>} Output array of coordinate values.
*/
ol.proj.EPSG21781.toEPSG4326 = function(input, opt_output, opt_dimension) {
var n = input.length;
var dimension = goog.isDef(opt_dimension) ? opt_dimension : 2;
var output;
if (goog.isDef(opt_output)) {
output = opt_output;
} else {
if (dimension > 2) {
output = input.slice();
} else {
output = new Array(n);
}
}
goog.asserts.assert(dimension >= 2);
goog.asserts.assert(output.length % dimension === 0);
var auxX, auxY, i;
for (i = 0; i < n; i += dimension) {
auxY = (input[i] - 600000) / 1000000;
auxX = (input[i + 1] - 200000) / 1000000;
output[i] = 100 * (2.6779094 +
4.728982 * auxY +
0.791484 * auxY * auxX +
0.1306 * auxY * auxX * auxX -
0.0436 * auxY * auxY * auxY) / 36;
output[i + 1] = 100 * (16.9023892 +
3.238272 * auxX -
0.270978 * auxY * auxY -
0.002528 * auxX * auxX -
0.0447 * auxY * auxY * auxX -
0.014 * auxX * auxX * auxX) / 36;
}
return output;
};
/**
* @inheritDoc
*/
ol.proj.EPSG21781.prototype.getPointResolution = function(resolution, point) {
return resolution;
};

View File

@@ -0,0 +1,112 @@
goog.provide('ol.test.proj.CH');
goog.provide('ol.test.proj.EPSG2056');
goog.provide('ol.test.proj.EPSG21781');
describe('ol.proj.CH', function() {
beforeEach(function() {
ol.proj.CH.add();
});
it('can transform from EPSG:2056 to EPSG:21781', function() {
var output = ol.proj.transform(
[2660389.515487, 1185731.630396], 'EPSG:2056', 'EPSG:21781');
expect(output).to.be.an(Array);
expect(output).to.have.length(2);
expect(output[0]).to.roughlyEqual(660389.515487, 1e-9);
expect(output[1]).to.roughlyEqual(185731.630396, 1e-9);
});
it('can transform from EPSG:21781 to EPSG:2056', function() {
var output = ol.proj.transform(
[660389.515487, 185731.630396], 'EPSG:21781', 'EPSG:2056');
expect(output).to.be.an(Array);
expect(output).to.have.length(2);
expect(output[0]).to.roughlyEqual(2660389.515487, 1e-10);
expect(output[1]).to.roughlyEqual(1185731.630396, 1e-10);
});
});
describe('ol.proj.EPSG2056', function() {
var epsg2056;
beforeEach(function() {
ol.proj.EPSG2056.add();
epsg2056 = ol.proj.get('EPSG:2056');
expect(epsg2056).to.be.an(ol.Projection);
});
it('transforms from EPSG:2056 to EPSG:4326', function() {
var wgs84 = ol.proj.transform(
[2660389.515487, 1185731.630396], 'EPSG:2056', 'EPSG:4326');
expect(wgs84).to.be.an(Array);
expect(wgs84).to.have.length(2);
expect(wgs84[0]).to.roughlyEqual(8.23, 1e-3);
expect(wgs84[1]).to.roughlyEqual(46.82, 1e-3);
});
it('transforms from EPSG:4326 to EPSG:2056', function() {
var ch1903 = ol.proj.transform([8.23, 46.82], 'EPSG:4326', 'EPSG:2056');
expect(ch1903).to.be.an(Array);
expect(ch1903).to.have.length(2);
expect(ch1903[0]).to.roughlyEqual(2660389.515487, 1);
expect(ch1903[1]).to.roughlyEqual(1185731.630396, 1);
});
});
describe('ol.proj.EPSG21781', function() {
var epsg21781;
beforeEach(function() {
ol.proj.EPSG21781.add();
epsg21781 = ol.proj.get('EPSG:21781');
expect(epsg21781).to.be.an(ol.Projection);
});
it('does not lose too much accuracy when round-tripping', function() {
var extent = epsg21781.getExtent();
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) {
roundTripped = fromEPSG4326(toEPSG4326([x, y]));
expect(roundTripped).to.be.an(Array);
expect(roundTripped).to.have.length(2);
expect(roundTripped[0]).to.roughlyEqual(x, 1e1);
expect(roundTripped[1]).to.roughlyEqual(y, 1e1);
}
}
});
it('transforms from EPSG:21781 to EPSG:4326', function() {
var wgs84 = ol.proj.transform(
[660389.515487, 185731.630396], 'EPSG:21781', 'EPSG:4326');
expect(wgs84).to.be.an(Array);
expect(wgs84).to.have.length(2);
expect(wgs84[0]).to.roughlyEqual(8.23, 1e-3);
expect(wgs84[1]).to.roughlyEqual(46.82, 1e-3);
});
it('transforms from EPSG:4326 to EPSG:21781', function() {
var ch1903 = ol.proj.transform([8.23, 46.82], 'EPSG:4326', 'EPSG:21781');
expect(ch1903).to.be.an(Array);
expect(ch1903).to.have.length(2);
expect(ch1903[0]).to.roughlyEqual(660389.515487, 1);
expect(ch1903[1]).to.roughlyEqual(185731.630396, 1);
});
});
goog.require('ol.Projection');
goog.require('ol.proj');
goog.require('ol.proj.CH');
goog.require('ol.proj.EPSG2056');
goog.require('ol.proj.EPSG21781');

View File

@@ -1,50 +0,0 @@
goog.provide('ol.test.proj.EPSG21781');
describe('ol.proj.EPSG21781', function() {
var epsg21781;
beforeEach(function() {
ol.proj.EPSG21781.add();
epsg21781 = ol.proj.get('EPSG:21781');
expect(epsg21781).to.be.an(ol.Projection);
});
it('does not lose too much accuracy when round-tripping', function() {
var extent = epsg21781.getExtent();
var roundTripped, x, y;
for (x = extent[0]; x < extent[1]; x += 50000) {
for (y = extent[2]; y < extent[3]; y += 50000) {
roundTripped = ol.proj.EPSG21781.fromEPSG4326(
ol.proj.EPSG21781.toEPSG4326([x, y]));
expect(roundTripped).to.be.an(Array);
expect(roundTripped).to.have.length(2);
expect(roundTripped[0]).to.roughlyEqual(x, 1e1);
expect(roundTripped[1]).to.roughlyEqual(y, 1e1);
}
}
});
it('transforms from EPSG:21781 to EPSG:4326', function() {
var wgs84 = ol.proj.transform(
[660389.515487, 185731.630396], 'EPSG:21781', 'EPSG:4326');
expect(wgs84).to.be.an(Array);
expect(wgs84).to.have.length(2);
expect(wgs84[0]).to.roughlyEqual(8.23, 1e-3);
expect(wgs84[1]).to.roughlyEqual(46.82, 1e-3);
});
it('transforms from EPSG:4326 to EPSG:21781', function() {
var ch1903 = ol.proj.transform([8.23, 46.82], 'EPSG:4326', 'EPSG:21781');
expect(ch1903).to.be.an(Array);
expect(ch1903).to.have.length(2);
expect(ch1903[0]).to.roughlyEqual(660389.515487, 1);
expect(ch1903[1]).to.roughlyEqual(185731.630396, 1);
});
});
goog.require('ol.Projection');
goog.require('ol.proj');
goog.require('ol.proj.EPSG21781');