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

GeoJSON format output produces invalid CRS, p=hoxworth, r=me (closes #3022)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11876 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2011-04-05 07:07:01 +00:00
parent f33c5ef112
commit fd145c82b1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Format/GeoJSON.js
+4 -4
View File
@@ -495,16 +495,16 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
var code = parseInt(proj.substring(proj.indexOf(":") + 1)); var code = parseInt(proj.substring(proj.indexOf(":") + 1));
if (code == 4326) { if (code == 4326) {
crs = { crs = {
"type": "OGC", "type": "name",
"properties": { "properties": {
"urn": "urn:ogc:def:crs:OGC:1.3:CRS84" "name": "urn:ogc:def:crs:OGC:1.3:CRS84"
} }
}; };
} else { } else {
crs = { crs = {
"type": "EPSG", "type": "name",
"properties": { "properties": {
"code": code "name": "EPSG:" + code
} }
}; };
} }
tests/Format/GeoJSON.html
+2 -2
View File
@@ -251,7 +251,7 @@
t.plan(2); t.plan(2);
var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,2)); var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,2));
feature.fid = 0; feature.fid = 0;
var output = '{"type":"Feature","id":0,"properties":{},"geometry":{"type":"Point","coordinates":[1,2]},"crs":{"type":"OGC","properties":{"urn":"urn:ogc:def:crs:OGC:1.3:CRS84"}}}'; var output = '{"type":"Feature","id":0,"properties":{},"geometry":{"type":"Point","coordinates":[1,2]},"crs":{"type":"name","properties":{"name":"urn:ogc:def:crs:OGC:1.3:CRS84"}}}';
var layer = new OpenLayers.Layer.Vector(); var layer = new OpenLayers.Layer.Vector();
layer.projection = "EPSG:4326"; layer.projection = "EPSG:4326";
feature.layer = layer; feature.layer = layer;
@@ -259,7 +259,7 @@
var test_out = parser.write(feature); var test_out = parser.write(feature);
t.eq(test_out, output, "Output is equal for vector with layer in EPSG:4326 "); t.eq(test_out, output, "Output is equal for vector with layer in EPSG:4326 ");
feature.layer.projection = "EPSG:2805"; feature.layer.projection = "EPSG:2805";
output = '{"type":"Feature","id":0,"properties":{},"geometry":{"type":"Point","coordinates":[1,2]},"crs":{"type":"EPSG","properties":{"code":2805}}}'; output = '{"type":"Feature","id":0,"properties":{},"geometry":{"type":"Point","coordinates":[1,2]},"crs":{"type":"name","properties":{"name":"EPSG:2805"}}}';
test_out = parser.write(feature); test_out = parser.write(feature);
t.eq(test_out, output, "Output is equal for vector with point"); t.eq(test_out, output, "Output is equal for vector with point");
} }