Merge branch 'master' into openstreetbugs

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

index af45a6b1f99cea1eb631c0e19a6863d76763a128..43678db0382fbec905918d23b9cb6a64c8abee32 100644 (file)
--- a/public/export/embed.html
+++ b/public/export/embed.html
@@ -1,6 +1,17 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
    <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%;
@@ -9,9 +20,10 @@
              bottom: 3px!important;
          }
      </style>
-    <script src="http://openstreetmap.org/openlayers/OpenLayers.js"></script>
-    <script src="http://openstreetmap.org/openlayers/OpenStreetMap.js"></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;
          function init(){
              map = new OpenLayers.Map ("map", {
@@ -28,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", {
@@ -44,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,
@@ -74,8 +86,10 @@
                  map.addControl(new OpenLayers.Control.PanZoom());
              }
          }
+    // -->
      </script>
    </head>
+
    <body onload="init()">
      <div id="map"></div>
    </body>