X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/945d60ea5a52d0c1d41cc63456bd6f60e547e79e..dee70e8daae82961ceda602a0646c4828a996965:/public/export/embed.html?ds=sidebyside

diff --git a/public/export/embed.html b/public/export/embed.html
index bba670255..c0036b632 100644
--- 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;
@@ -31,38 +32,40 @@
                   new OpenLayers.Control.Attribution(),
                   new OpenLayers.Control.Navigation()
               ],
-              maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,
-                                               20037508.34,20037508.34),
               numZoomLevels: 20,
-              maxResolution: 156543.0339,
-              displayProjection: new OpenLayers.Projection("EPSG:4326"),
-              units: 'm',
-              projection: new OpenLayers.Projection("EPSG:900913")
+              displayProjection: new OpenLayers.Projection("EPSG:4326")
             });
 
-            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", {
-                   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", {
-                   displayOutsideMaxExtent: true,
                    wrapDateLine: true,
                    attribution: attribution
                 });
                 map.addLayer(cyclemap);
+            } else if (args.layer == "transportmap") {
+                var transportmap = new OpenLayers.Layer.OSM.TransportMap("Transport Map", {
+                   wrapDateLine: true,
+                   attribution: attribution
+                });
+                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"], {
+                   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 +86,7 @@
             if (size.h > 320) {
                 map.addControl(new OpenLayers.Control.PanZoomBar());
             } else {
-                map.addControl(new OpenLayers.Control.PanZoom());
+                map.addControl(new OpenLayers.Control.Zoom());
             }
         }
     // -->
