cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetic tidy up, and fix hardcoding of server name.

Browse source
This commit is contained in:
Tom Hughes 2008-04-29 17:11:22 +00:00
parent 57050172c8
commit f2ae082a1f
3 changed files with 63 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/views/export/_start.rhtml
View file

@ -18,13 +18,13 @@
<div class="export_details">
<p>
<%= radio_button_tag("format", "osm") %>OpenStreetMap XML Data
<%= radio_button_tag("format", "osm") %> OpenStreetMap XML Data
<br/>
<%= radio_button_tag("format", "mapnik") %>Mapnik Image
<%= radio_button_tag("format", "mapnik") %> Mapnik Image
<br/>
<%= radio_button_tag("format", "osmarender") %>Osmarender Image
<%= radio_button_tag("format", "osmarender") %> Osmarender Image
<br/>
<%= radio_button_tag("format", "html") %>Embeddable HTML
<%= radio_button_tag("format", "html") %> Embeddable HTML
</p>
</div>
@ -57,17 +57,14 @@
<div id="export_html">
<p class="export_heading">Options</p>
<p>
<%= check_box_tag("html_marker", "true") %> Include Marker on Map
</p>
<div class="export_details">
<p><%= check_box_tag("html_marker", "true") %> Include Marker on Map</p>
</div>
<p class="export_heading">Output</p>
<div class="export_details">
<p>
<input type="text" id="export_html_text" style="width:95%" />
</p>
<p>
Paste HTML to embed in website
</p>
<p><input type="text" id="export_html_text" style="width:95%" /></p>
<p>Paste HTML to embed in website</p>
</div>
</div>

35
app/views/export/start.rjs
View file

@ -109,7 +109,7 @@ page << <<EOJ
$("maxlat").value = Math.round(bounds.top * decimals) / decimals;
mapnikSizeChanged();
htmlBoundsChanged(bounds);
htmlBoundsChanged();
}
function clearBox() {
@ -161,25 +161,29 @@ page << <<EOJ
}
function htmlBoundsChanged() {
var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
var projBounds = bounds.clone().transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:900913"));
var zoom = map.getZoomForExtent(projBounds);
var center = bounds.getCenterLonLat();
var marker = $("html_marker").checked;
var url = 'http://crschmidt2.dev.openstreetmap.org/export/embed.html?lat='+center.lat.toFixed(5)+'&lon='+center.lon.toFixed(5)+'&zoom='+zoom;
if (marker) {
url += "&marker=true";
}
var html = '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'+url+'"></iframe>';
$("export_html_text").value = html;
if ($("format_html").checked) {
$("export_html_text").select();
}
var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
var projBounds = bounds.clone().transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:900913"));
var zoom = map.getZoomForExtent(projBounds);
var center = bounds.getCenterLonLat();
var url = "http://#{SERVER_URL}/export/embed.html?lat=" + center.lat.toFixed(5) + "&lon=" + center.lon.toFixed(5) + "&zoom=" + zoom;
if ($("html_marker").checked) {
url += "&marker=true";
}
var html = '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'+url+'"></iframe>';
$("export_html_text").value = html;
if ($("format_html").checked) {
$("export_html_text").select();
}
}
$("html_marker").onclick = htmlBoundsChanged;
function formatChanged() {
$("export_commit").style.display = "inline";
if ($("format_osm").checked) {
$("export_osm").style.display = "inline";
} else {
@ -201,6 +205,7 @@ page << <<EOJ
} else {
$("export_osmarender").style.display = "none";
}
if ($("format_html").checked) {
$("export_html").style.display = "inline";
$("export_commit").style.display = "none";