t/passwordauth.t: new automated test for passwordauth

[git.ikiwiki.info.git] / underlays / osm / ikiwiki / osm.js

diff --git a/underlays/osm/ikiwiki/osm.js b/underlays/osm/ikiwiki/osm.js
index 7994c62fc8ff61bb795391aeae3587d9dac91a35..d7e3d53f42e7c832423d21ea6b82b1305ddec22d 100644 (file)
--- 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",
        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({
                          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()]
                                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({
        } 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
                                format: new OpenLayers.Format.KML({
                                        extractStyles: true,
                                        extractAttributes: true