From 1120eb77ffab476d9f5de589691d555ba64b8da1 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 15 Oct 2012 17:17:11 -0700 Subject: [PATCH 1/1] Port embed.html to leaflet --- public/export/embed.html | 114 ++++++++++++++------------------------- 1 file changed, 41 insertions(+), 73 deletions(-) diff --git a/public/export/embed.html b/public/export/embed.html index c0036b632..3559f8f35 100644 --- a/public/export/embed.html +++ b/public/export/embed.html @@ -7,7 +7,7 @@ html { width: 100%; height: 100%; - } + } body { width: 100%; height: 100%; @@ -17,83 +17,51 @@ width: 100%; height: 100%; } - .olControlAttribution { - bottom: 3px!important; - } - - - + + - var attribution = 'Â© OpenStreetMap and contributors, under an open license'; - var args = OpenLayers.Util.getParameters(); - if (!args.layer || args.layer == "mapnik" || args.layer == "osmarender") { - var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", { - wrapDateLine: true, - attribution: attribution - }); - map.addLayer(mapnik); - } else if (args.layer == "cyclemap" || args.layer == "cycle map") { - var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", { - wrapDateLine: true, - attribution: attribution - }); - map.addLayer(cyclemap); - } else if (args.layer == "transportmap") { - var transportmap = new OpenLayers.Layer.OSM.TransportMap("Transport Map", { - wrapDateLine: true, - attribution: attribution - }); - map.addLayer(transportmap); - } else if (args.layer == "mapquest") { - var mapquestmap = new OpenLayers.Layer.OSM("MapQuest Open Map", [ - "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", - "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", - "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", - "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png"], { - wrapDateLine: true, - attribution: "Tiles courtesy of MapQuest

" - }); - map.addLayer(mapquestmap); - } + +

+ - + if (!args.layer || args.layer == "mapnik" || args.layer == "osmarender") { + new L.OSM.Mapnik().addTo(map); + } else if (args.layer == "cyclemap" || args.layer == "cycle map") { + new L.OSM.CycleMap().addTo(map); + } else if (args.layer == "transportmap") { + new L.OSM.TransportMap().addTo(map); + } else if (args.layer == "mapquest") { + new L.OSM.MapQuestOpen().addTo(map); + } - -

+ if (args.marker) { + L.marker(args.marker).addTo(map); + } + + if (args.bbox) { + map.fitBounds([L.latLng(args.bbox[1], args.bbox[0]), + L.latLng(args.bbox[3], args.bbox[2])]) + } else { + map.fitWorld(); + } + -- 2.43.2