]> git.openstreetmap.org Git - rails.git/blobdiff - public/export/embed.html
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into notes
[rails.git] / public / export / embed.html
diff --git a/public/export/embed.html b/public/export/embed.html
index 402f0410b0728a0f3538010633fd8d6e29c252c4..c0036b632ed96c5ed26ce8eef128a818bdd4a5bf 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>
   <head>
+    <meta charset="utf-8">
     <title>OpenStreetMap Embedded</title>
     <style type="text/css">
         html {
     <title>OpenStreetMap Embedded</title>
     <style type="text/css">
         html {
@@ -31,34 +32,26 @@
                   new OpenLayers.Control.Attribution(),
                   new OpenLayers.Control.Navigation()
               ],
                   new OpenLayers.Control.Attribution(),
                   new OpenLayers.Control.Navigation()
               ],
-              maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,
-                                               20037508.34,20037508.34),
               numZoomLevels: 20,
               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" || args.layer == "osmarender") {
                 var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
             var args = OpenLayers.Util.getParameters();
             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 == "cyclemap" || args.layer == "cycle map") {
                 var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
                    wrapDateLine: true,
                    attribution: attribution
                 });
                 map.addLayer(mapnik);
             } 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(cyclemap);
             } else if (args.layer == "transportmap") {
                 var transportmap = new OpenLayers.Layer.OSM.TransportMap("Transport Map", {
-                   displayOutsideMaxExtent: true,
                    wrapDateLine: true,
                    attribution: attribution
                 });
                    wrapDateLine: true,
                    attribution: attribution
                 });
@@ -69,7 +62,6 @@
                     "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"], {
                     "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'>"
                 });
                    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'>"
                 });
@@ -94,7 +86,7 @@
             if (size.h > 320) {
                 map.addControl(new OpenLayers.Control.PanZoomBar());
             } else {
             if (size.h > 320) {
                 map.addControl(new OpenLayers.Control.PanZoomBar());
             } else {
-                map.addControl(new OpenLayers.Control.PanZoom());
+                map.addControl(new OpenLayers.Control.Zoom());
             }
         }
     // -->
             }
         }
     // -->
The OpenStreetMap web site