From: Tom Hughes <tom@compton.nu>
Date: Wed, 30 Apr 2008 08:44:57 +0000 (+0000)
Subject: Tidy things up a bit.
X-Git-Tag: live~7821^2~2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/209dece7d3b3b4161ede2f84784ab0cd63ed2166

Tidy things up a bit.
---

diff --git a/app/views/export/_start.rhtml b/app/views/export/_start.rhtml
index 4fbbff047..9776261ea 100644
--- a/app/views/export/_start.rhtml
+++ b/app/views/export/_start.rhtml
@@ -58,11 +58,10 @@
   <div id="export_html">
     <p class="export_heading">Options</p>
     <div class="export_details">
-      <p>
-        <a id='add_marker' href="#">Add a marker to the map</a> 
-	<div id="marker_inputs" style="display:none">
-	Lat: <input type="text" id="marker_lat" size="9" /> Lon: <input type="text" id="marker_lon" size="9" />
-	</div>
+      <p><a id="add_marker" href="#">Add a marker to the map</a></p>
+      <p id="marker_inputs" style="display:none">
+        Lat: <input type="text" id="marker_lat" size="9" />
+        Lon: <input type="text" id="marker_lon" size="9" />
       </p>
     </div>
 
diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 7f9453122..2a7985037 100644
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -99,34 +99,47 @@ page << <<EOJ
 
   function startMarker() {
     $("add_marker").innerHTML='Click on the map to add a marker';
+
     if (!markerLayer) {
-        markerLayer = new OpenLayers.Layer.Vector("",{
-          displayInLayerSwitcher: false,
-          style: { externalGraphic: OpenLayers.Util.getImagesLocation()+"marker.png", graphicXOffset:-10.5, graphicYOffset:-25, graphicWidth: 21, graphicHeight: 25} 
-        });
-        markerControl = new OpenLayers.Control.DrawFeature(markerLayer, OpenLayers.Handler.Point);
-        map.addLayer(markerLayer);
-        map.addControl(markerControl);
-        markerLayer.events.on({"featureadded": endMarker});
+      markerLayer = new OpenLayers.Layer.Vector("",{
+        displayInLayerSwitcher: false,
+        style: { 
+          externalGraphic: OpenLayers.Util.getImagesLocation() + "marker.png",
+          graphicXOffset: -10.5,
+          graphicYOffset: -25, 
+          graphicWidth: 21,
+          graphicHeight: 25
+        } 
+      });
+      map.addLayer(markerLayer);
+
+      markerControl = new OpenLayers.Control.DrawFeature(markerLayer, OpenLayers.Handler.Point);
+      map.addControl(markerControl);
+
+      markerLayer.events.on({ "featureadded": endMarker });
     }
+
     markerLayer.destroyFeatures();
     markerControl.activate();
+
     return false;
-  }   
+  }
 
   $("add_marker").onclick = startMarker;
 
   function endMarker(event) {
-    
     markerControl.deactivate();
-    $("add_marker").innerHTML='Change marker position';
-    $("marker_inputs").style.display="block";
+
+    $("add_marker").innerHTML = "Change marker position";
+    $("marker_inputs").style.display = "block";
     
     var epsg4326 = new OpenLayers.Projection("EPSG:4326");
     var epsg900913 = new OpenLayers.Projection("EPSG:900913");
-    var geom = event.feature.geometry.clone().transform( epsg900913, epsg4326 );
+    var geom = event.feature.geometry.clone().transform(epsg900913, epsg4326);
+
     $("marker_lon").value = geom.x.toFixed(5);
     $("marker_lat").value = geom.y.toFixed(5);
+
     htmlUrlChanged(); 
   }
 
@@ -134,12 +147,13 @@ page << <<EOJ
     $("marker_lon").value = "";
     $("marker_lat").value = "";
     $("marker_inputs").style.display = "none";
-    $("add_marker").innerHTML='Add a marker to the map';
+    $("add_marker").innerHTML = "Add a marker to the map";
+
     if (markerLayer) { 
-        markerControl.destroy();
-        markerLayer.destroy();
-        markerLayer = null;
-        markerControl = null;
+      markerControl.destroy();
+      markerLayer.destroy();
+      markerLayer = null;
+      markerControl = null;
     }
   }  
 
@@ -213,15 +227,13 @@ page << <<EOJ
 
   function htmlUrlChanged() {
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
-    var url = "http://#{SERVER_URL}/export/embed.html?bbox=" + bounds.toBBOX();
+    var layerName = map.baseLayer.name.toLowerCase();
+    var url = "http://#{SERVER_URL}/export/embed.html?bbox=" + bounds.toBBOX() + "&layer=" + layerName;
+
     if ($("marker_lat").value && $("marker_lon").value) {
-        url += "&marker=" + $("marker_lat").value + "," + $("marker_lon").value;
+      url += "&marker=" + $("marker_lat").value + "," + $("marker_lon").value;
     } 
 
-    var layerName = map.baseLayer.name.toLowerCase();
-    if (layerName != "mapnik") {
-        url += "&layer="+layerName;
-    }   
     var html = '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'+url+'" style="border: 1px solid black"></iframe>';
     $("export_html_text").value = html;
 
diff --git a/public/export/embed.html b/public/export/embed.html
index 7fe7d4683..41cd75f43 100644
--- a/public/export/embed.html
+++ b/public/export/embed.html
@@ -71,29 +71,32 @@
                 var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
                    displayOutsideMaxExtent: true,
                    wrapDateLine: true,
-                   attribution: attribution 
+                   attribution: attribution
                 });
                 map.addLayer(mapnik);
-            } else {        
+            } else {
                 var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
                    displayOutsideMaxExtent: true,
                    wrapDateLine: true,
-                   attribution: attribution 
+                   attribution: attribution
                 });
-                map.addLayer(osmarender); 
-            } 
+                map.addLayer(osmarender);
+            }
+
             if (args.marker) {
                 var markers = new OpenLayers.Layer.Markers();
                 map.addLayer(markers);
-                markers.addMarker( new OpenLayers.Marker(new OpenLayers.LonLat(args.marker[1], args.marker[0]).transform(map.displayProjection, map.getProjectionObject())));
+                markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(args.marker[1], args.marker[0]).transform(map.displayProjection, map.getProjectionObject())));
                 map.marker = true;
-            }    
-            if (args.bbox) { 
+            }
+
+            if (args.bbox) {
                 var bounds = OpenLayers.Bounds.fromArray(args.bbox).transform(map.displayProjection, map.getProjectionObject());
                 map.zoomToExtent(bounds)
             } else {
-                map.zoomToMaxExtent(); 
+                map.zoomToMaxExtent();
             }
+
             var size = map.getSize();
             if (size.h > 320) {
                 map.addControl(new OpenLayers.Control.PanZoomBar());