X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=underlays%2Fosm%2Fikiwiki%2Fosm.js;fp=underlays%2Fosm%2Fikiwiki%2Fosm.js;h=d7e3d53f42e7c832423d21ea6b82b1305ddec22d;hp=7994c62fc8ff61bb795391aeae3587d9dac91a35;hb=917cdb7ade640c1e88f26d99acb42cff55a4c6fc;hpb=3867f038a79784119e67ad36a191b64d2f574a3b diff --git a/underlays/osm/ikiwiki/osm.js b/underlays/osm/ikiwiki/osm.js index 7994c62fc..d7e3d53f4 100644 --- a/underlays/osm/ikiwiki/osm.js +++ b/underlays/osm/ikiwiki/osm.js @@ -41,13 +41,13 @@ function mapsetup(divname, options) { map.addLayer(new OpenLayers.Layer.OSM()); if (options.format == 'CSV') { pois = new OpenLayers.Layer.Text( "CSV", - { location:"/" + options.map + "/pois.txt", + { location: options.csvurl, projection: map.displayProjection }); } else if (options.format == 'GeoJSON') { pois = new OpenLayers.Layer.Vector("GeoJSON", { protocol: new OpenLayers.Protocol.HTTP({ - url: "/" + options.map + "/pois.json", + url: options.jsonurl, format: new OpenLayers.Format.GeoJSON() }), strategies: [new OpenLayers.Strategy.Fixed()] @@ -55,7 +55,7 @@ function mapsetup(divname, options) { } else { pois = new OpenLayers.Layer.Vector("KML", { protocol: new OpenLayers.Protocol.HTTP({ - url: "/" + options.map + "/pois.kml", + url: options.kmlurl, format: new OpenLayers.Format.KML({ extractStyles: true, extractAttributes: true