Merge branch 'master' into openstreetbugs

[rails.git] / public / export / embed.html

diff --git a/public/export/embed.html b/public/export/embed.html
index 20e1d2ac9672c0fddb66917d8485626aac8178e9..43678db0382fbec905918d23b9cb6a64c8abee32 100644 (file)
--- a/public/export/embed.html
+++ b/public/export/embed.html
@@ -20,8 +20,8 @@
             bottom: 3px!important;
         }
     </style>
             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;
     <script type="text/javascript">
     <!--
         var map, layer;


@@ -40,7 +40,7 @@
               projection: new OpenLayers.Projection("EPSG:900913")
             });
 
               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", {
             var args = OpenLayers.Util.getParameters();
             if (!args.layer || args.layer == "mapnik") {
                 var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {


@@ -56,7 +56,7 @@
                    attribution: attribution
                 });
                 map.addLayer(osmarender);
                    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,
                 var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
                    displayOutsideMaxExtent: true,
                    wrapDateLine: true,