Merge branch 'master' into openstreetbugs

[rails.git] / public / export / embed.html
diff --git a/public/export/embed.html b/public/export/embed.html

index 55d11ebbe9fc5e6a826e37b0e6ea4942508173bd..43678db0382fbec905918d23b9cb6a64c8abee32 100644 (file)
--- a/public/export/embed.html
+++ b/public/export/embed.html
@@ -3,6 +3,15 @@
    <head>
      <title>OpenStreetMap Embedded</title>
      <style type="text/css">
+        html {
+            width: 100%;
+            height: 100%;
+       }
+        body {
+            width: 100%;
+            height: 100%;
+            margin: 0px;
+        }
          #map {
              width: 100%;
              height: 100%;
@@ -11,8 +20,8 @@
              bottom: 3px!important;
          }
      </style>
-    <script src="http://openstreetmap.org/openlayers/OpenLayers.js" type="text/javascript"></script>
-    <script src="http://openstreetmap.org/openlayers/OpenStreetMap.js" type="text/javascript"></script>
+    <script src="/openlayers/OpenLayers.js" type="text/javascript"></script>
+    <script src="/openlayers/OpenStreetMap.js" type="text/javascript"></script>
      <script type="text/javascript">
      <!--
          var map, layer;
@@ -31,7 +40,7 @@
                projection: new OpenLayers.Projection("EPSG:900913")
              });
  
-            var attribution = 'Data by <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a>';
+            var attribution = '(C) <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, <a target="_parent" href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>';
              var args = OpenLayers.Util.getParameters();
              if (!args.layer || args.layer == "mapnik") {
                  var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
@@ -47,7 +56,7 @@
                     attribution: attribution
                  });
                  map.addLayer(osmarender);
-            } else if (args.layer == "cycle map") {
+            } else if (args.layer == "cyclemap" || args.layer == "cycle map") {
                  var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
                     displayOutsideMaxExtent: true,
                     wrapDateLine: true,