split_node_tags: Merge changes from main branch.

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

diff --git a/public/export/embed.html b/public/export/embed.html
index 58bfdec21487a4b9b6f7005f8d09cf1ff3b0965a..ae82eb54a9361af21ce84fb484d43aeb875c237a 100644 (file)
--- a/public/export/embed.html
+++ b/public/export/embed.html
@@ -13,48 +13,11 @@
     <script src="http://openstreetmap.org/openlayers/OpenStreetMap.js"></script>
     <script type="text/javascript">
         var map, layer;
-        function localUpdateLink() {
-            var center = this.map.getCenter();
-
-            // Map not initialized yet. Break out of this function.
-            if (!center) {
-                return;
-            }
-
-            var params = OpenLayers.Util.getParameters(this.base);
-
-            params.zoom = this.map.getZoom();
-            var lat = center.lat;
-            var lon = center.lon;
-
-            if (this.displayProjection) {
-                var mapPosition = OpenLayers.Projection.transform(
-                  { x: lon, y: lat },
-                  this.map.getProjectionObject(),
-                  this.displayProjection );
-                lon = mapPosition.x;
-                lat = mapPosition.y;
-            }
-
-            params.lat = Math.round(lat*100000)/100000;
-            params.lon = Math.round(lon*100000)/100000;
-
-            var href = this.base;
-            if(href.indexOf('?') != -1) {
-                href = href.substring( 0, href.indexOf('?') );
-            }
-
-            href += '?' + OpenLayers.Util.getParameterString(params);
-            this.element.href = href;
-        }
-
         function init(){
-            OpenLayers.Lang.en.permalink = "Larger Map";
             map = new OpenLayers.Map ("map", {
               controls: [
                   new OpenLayers.Control.Attribution(),
-                  new OpenLayers.Control.Navigation(),
-                  new OpenLayers.Control.Permalink(null, "http://openstreetmap.org/", { updateLink: localUpdateLink })
+                  new OpenLayers.Control.Navigation()
               ],
               maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,
                                                20037508.34,20037508.34),
@@ -71,31 +34,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());