Reminder to remove workaround when GeoServer GeoJSON issue is fixed
See #1566 and http://jira.codehaus.org/browse/GEOS-5996
This commit is contained in:
@@ -35,6 +35,8 @@ var GeoJSONCRS = function() {};
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {!GeoJSONCRSCode|!GeoJSONCRSName|!GeoJSONLink}
|
* @type {!GeoJSONCRSCode|!GeoJSONCRSName|!GeoJSONLink}
|
||||||
|
* TODO: remove GeoJSONCRSCode when http://jira.codehaus.org/browse/GEOS-5996
|
||||||
|
* is fixed and widely deployed.
|
||||||
*/
|
*/
|
||||||
GeoJSONCRS.prototype.properties;
|
GeoJSONCRS.prototype.properties;
|
||||||
|
|
||||||
@@ -43,6 +45,8 @@ GeoJSONCRS.prototype.properties;
|
|||||||
/**
|
/**
|
||||||
* `GeoJSONCRSCode` is not part of the GeoJSON specification, but is generated
|
* `GeoJSONCRSCode` is not part of the GeoJSON specification, but is generated
|
||||||
* by GeoServer.
|
* by GeoServer.
|
||||||
|
* TODO: remove GeoJSONCRSCode when http://jira.codehaus.org/browse/GEOS-5996
|
||||||
|
* is fixed and widely deployed.
|
||||||
* @constructor
|
* @constructor
|
||||||
*/
|
*/
|
||||||
var GeoJSONCRSCode = function() {};
|
var GeoJSONCRSCode = function() {};
|
||||||
@@ -50,6 +54,8 @@ var GeoJSONCRSCode = function() {};
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {string}
|
* @type {string}
|
||||||
|
* TODO: remove this when http://jira.codehaus.org/browse/GEOS-5996 is fixed
|
||||||
|
* and widely deployed.
|
||||||
*/
|
*/
|
||||||
GeoJSONCRSName.prototype.code;
|
GeoJSONCRSName.prototype.code;
|
||||||
|
|
||||||
|
|||||||
@@ -373,6 +373,8 @@ ol.format.GeoJSON.prototype.readProjection = function(object) {
|
|||||||
} else if (crs.type == 'EPSG') {
|
} else if (crs.type == 'EPSG') {
|
||||||
// 'EPSG' is not part of the GeoJSON specification, but is generated by
|
// 'EPSG' is not part of the GeoJSON specification, but is generated by
|
||||||
// GeoServer.
|
// GeoServer.
|
||||||
|
// TODO: remove this when http://jira.codehaus.org/browse/GEOS-5996
|
||||||
|
// is fixed and widely deployed.
|
||||||
return ol.proj.get('EPSG:' + crs.properties.code);
|
return ol.proj.get('EPSG:' + crs.properties.code);
|
||||||
} else {
|
} else {
|
||||||
goog.asserts.fail();
|
goog.asserts.fail();
|
||||||
|
|||||||
@@ -392,6 +392,8 @@ describe('ol.format.GeoJSON', function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('can read out-of-specification CRS generated by GeoServer', function() {
|
it('can read out-of-specification CRS generated by GeoServer', function() {
|
||||||
|
// TODO: remove this when http://jira.codehaus.org/browse/GEOS-5996
|
||||||
|
// is fixed and widely deployed.
|
||||||
var json = {
|
var json = {
|
||||||
crs: {
|
crs: {
|
||||||
type: 'EPSG',
|
type: 'EPSG',
|
||||||
|
|||||||
Reference in New Issue
Block a user