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

Fix for GeoJSON + Reprojection problems for GeometryCollections. Original

Browse Source 
patch/ diagnosis by ibolmo, refactored by me. Includes manual test. 
(Closes #2024)


git-svn-id: http://svn.openlayers.org/trunk/openlayers@9181 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2009-04-03 20:26:35 +00:00
parent d1898d1a7d
commit b0f71c2702
2 changed files with 79 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Format/GeoJSON.js
+5 -2
View File
@@ -212,7 +212,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
if (obj == null) { if (obj == null) {
return null; return null;
} }
var geometry; var geometry, collection = false;
if(obj.type == "GeometryCollection") { if(obj.type == "GeometryCollection") {
if(!(obj.geometries instanceof Array)) { if(!(obj.geometries instanceof Array)) {
throw "GeometryCollection must have geometries array: " + obj; throw "GeometryCollection must have geometries array: " + obj;
@@ -225,6 +225,7 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
); );
} }
geometry = new OpenLayers.Geometry.Collection(components); geometry = new OpenLayers.Geometry.Collection(components);
collection = true;
} else { } else {
if(!(obj.coordinates instanceof Array)) { if(!(obj.coordinates instanceof Array)) {
throw "Geometry must have coordinates array: " + obj; throw "Geometry must have coordinates array: " + obj;
@@ -241,7 +242,9 @@ OpenLayers.Format.GeoJSON = OpenLayers.Class(OpenLayers.Format.JSON, {
throw err; throw err;
} }
} }
if (this.internalProjection && this.externalProjection) { // We don't reproject collections because the children are reprojected
// for us when they are created.
if (this.internalProjection && this.externalProjection && !collection) {
geometry.transform(this.externalProjection, geometry.transform(this.externalProjection,
this.internalProjection); this.internalProjection);
} }
tests/manual/geojson-geomcoll-reprojection.html
+74
View File
@@ -0,0 +1,74 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<style type="text/css" media="screen">
#map { height: 500px; }
</style>
<script src="../../lib/OpenLayers.js" type="text/javascript" charset="utf-8"></script>
<script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
function init(){
var map = new OpenLayers.Map ("map", {
controls: [
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.Attribution()
],
maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
maxResolution: 156543.0399,
numZoomLevels: 19,
units: 'm',
projection: new OpenLayers.Projection("EPSG:900913"),
displayProjection: new OpenLayers.Projection("EPSG:4326")
});
var osm = new OpenLayers.Layer.OSM.Mapnik('OSM');
map.addLayer(osm);
var lonLat = new OpenLayers.LonLat(5, 40).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
map.setCenter (lonLat, 5);
var featurecollection = {
"type": "FeatureCollection",
"features": [{
"geometry": {
"type": "GeometryCollection",
"geometries": [
{
"type": "LineString",
"coordinates":
[[11.0878902207, 45.1602390564],
[15.01953125, 48.1298828125]]
},
{
"type": "Polygon",
"coordinates":
[[[11.0878902207, 45.1602390564],
[14.931640625, 40.9228515625],
[0.8251953125, 41.0986328125],
[7.63671875, 48.96484375],
[11.0878902207, 45.1602390564]]]
},
{
"type":"Point",
"coordinates":[15.87646484375, 44.1748046875]
}
]
},
"type": "Feature",
"properties": {}
}]
};
var geojson_format = new OpenLayers.Format.GeoJSON({
'internalProjection': new OpenLayers.Projection("EPSG:900913"),
'externalProjection': new OpenLayers.Projection("EPSG:4326")
});
var vector_layer = new OpenLayers.Layer.Vector();
map.addLayer(vector_layer);
vector_layer.addFeatures(geojson_format.read(featurecollection));
};
</script>
</head>
<body onload="init()">
<div id="map"></div>
</body>
</html>