Use the HTML5 doctype and specify the character set explicitly

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

index bba67025572fc05642d44511f876b51032b2c5a5..c638725ad9019c5464e21e2ae9566b068c4e80ad 100644 (file)
--- a/public/export/embed.html
+++ b/public/export/embed.html
@@ -1,6 +1,7 @@
-<!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">
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
    <head>
+    <meta charset="utf-8">
      <title>OpenStreetMap Embedded</title>
      <style type="text/css">
          html {
@@ -20,8 +21,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;
@@ -40,29 +41,40 @@
                projection: new OpenLayers.Projection("EPSG:900913")
              });
  
-            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 attribution = '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>';
              var args = OpenLayers.Util.getParameters();
-            if (!args.layer || args.layer == "mapnik") {
+            if (!args.layer || args.layer == "mapnik" || args.layer == "osmarender") {
                  var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
                     displayOutsideMaxExtent: true,
                     wrapDateLine: true,
                     attribution: attribution
                  });
                  map.addLayer(mapnik);
-            } else if (args.layer == "osmarender") {
-                var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
+            } else if (args.layer == "cyclemap" || args.layer == "cycle map") {
+                var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
                     displayOutsideMaxExtent: true,
                     wrapDateLine: true,
                     attribution: attribution
                  });
-                map.addLayer(osmarender);
-            } else if (args.layer == "cyclemap" || args.layer == "cycle map") {
-                var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
+                map.addLayer(cyclemap);
+            } else if (args.layer == "transportmap") {
+                var transportmap = new OpenLayers.Layer.OSM.TransportMap("Transport Map", {
                     displayOutsideMaxExtent: true,
                     wrapDateLine: true,
                     attribution: attribution
                  });
-                map.addLayer(cyclemap);
+                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"], {
+                   displayOutsideMaxExtent: true,
+                   wrapDateLine: true,
+                   attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>"
+                });
+                map.addLayer(mapquestmap);
              }
  
              if (args.marker) {
@@ -83,7 +95,7 @@
              if (size.h > 320) {
                  map.addControl(new OpenLayers.Control.PanZoomBar());
              } else {
-                map.addControl(new OpenLayers.Control.PanZoom());
+                map.addControl(new OpenLayers.Control.Zoom());
              }
          }
      // -->