link goes into external frame, not in the iframe

[rails.git] / public / export / embed.html

diff --git a/public/export/embed.html b/public/export/embed.html
index 58bfdec21487a4b9b6f7005f8d09cf1ff3b0965a..8e4ea2651cc4b809aa76e6f5bc2ef57132a6963e 100644 (file)
--- a/public/export/embed.html
+++ b/public/export/embed.html
@@ -43,7 +43,8 @@
             if(href.indexOf('?') != -1) {
                 href = href.substring( 0, href.indexOf('?') );
             }
-
+            
+           this.element.target="_blank";
             href += '?' + OpenLayers.Util.getParameterString(params);
             this.element.href = href;
         }
@@ -71,31 +72,32 @@
                 var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
                    displayOutsideMaxExtent: true,
                    wrapDateLine: true,
-                   attribution: attribution 
+                   attribution: attribution
                 });
                 map.addLayer(mapnik);
-            } else {        
+            } else {
                 var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
                    displayOutsideMaxExtent: true,
                    wrapDateLine: true,
-                   attribution: attribution 
+                   attribution: attribution
                 });
-                map.addLayer(osmarender); 
-            } 
+                map.addLayer(osmarender);
+            }
+
             if (args.marker) {
                 var markers = new OpenLayers.Layer.Markers();
                 map.addLayer(markers);
-                var center = args.marker.split(","); 
-                markers.addMarker( new OpenLayers.Marker(new OpenLayers.LonLat(center[1], center[0]).transform(map.displayProjection, map.getProjectionObject())));
+                markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(args.marker[1], args.marker[0]).transform(map.displayProjection, map.getProjectionObject())));
                 map.marker = true;
-            }    
-            if (args.bbox) {  
-                var bounds = OpenLayers.Bounds.fromString(args.bbox).transform(map.displayProjection, map.getProjectionObject());
-                var center = bounds.getCenterLonLat();
-                map.setCenter(center, map.getZoomForExtent(bounds, true);
+            }
+
+            if (args.bbox) {
+                var bounds = OpenLayers.Bounds.fromArray(args.bbox).transform(map.displayProjection, map.getProjectionObject());
+                map.zoomToExtent(bounds)
             } else {
-                map.zoomToMaxExtent(); 
+                map.zoomToMaxExtent();
             }
+
             var size = map.getSize();
             if (size.h > 320) {
                 map.addControl(new OpenLayers.Control.PanZoomBar());