From: Antoine Beaupré <anarcat@koumbit.org>
Date: Thu, 9 Aug 2012 04:40:17 +0000 (-0400)
Subject: osm: be explicit about projection of data
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=b57cad3131218c7d1a027a60c71ede74f0f14829

osm: be explicit about projection of data
---

diff --git a/underlays/osm/ikiwiki/osm.js b/underlays/osm/ikiwiki/osm.js
index 644d4b573..388d625f1 100644
--- a/underlays/osm/ikiwiki/osm.js
+++ b/underlays/osm/ikiwiki/osm.js
@@ -47,7 +47,7 @@ function mapsetup(divname, options) {
 	if (options.format == 'CSV') {
 		pois = new OpenLayers.Layer.Text( "CSV",
 			{ location: options.csvurl,
-			  projection: map.displayProjection
+			  projection: new OpenLayers.Projection("EPSG:4326")
 			});
 	} else if (options.format == 'GeoJSON') {
 		pois = new OpenLayers.Layer.Vector("GeoJSON", {
@@ -55,7 +55,8 @@ function mapsetup(divname, options) {
 				url: options.jsonurl,
 				format: new OpenLayers.Format.GeoJSON()
 			}),
-			strategies: [new OpenLayers.Strategy.Fixed()]
+			strategies: [new OpenLayers.Strategy.Fixed()],
+			projection: new OpenLayers.Projection("EPSG:4326")
 		});
 	} else {
 		pois = new OpenLayers.Layer.Vector("KML", {
@@ -66,7 +67,9 @@ function mapsetup(divname, options) {
 					extractAttributes: true
 				})
 			}),
-		strategies: [new OpenLayers.Strategy.Fixed()]});
+			strategies: [new OpenLayers.Strategy.Fixed()],
+			projection: new OpenLayers.Projection("EPSG:4326")
+                });
 	}
 	map.addLayer(pois);
 	select = new OpenLayers.Control.SelectFeature(pois);