<% content_for :greeting do %>
<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
- <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)", { :title => t('layouts.home_tooltip') } %> |
+ <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> |
<% end %>
<% end %>
<div id="map">
<div id="permalink">
- <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
- <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
- <a id="ReportBug">Report a problem</a>
+ <a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a><br/>
+ <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
+ <a href="#" id="createnoteanchor">Report a problem</a>
</div>
-</div>
+</div>
+
+<iframe id="linkloader" style="display: none">
+</iframe>
<div id="attribution">
<table width="100%">
<tr>
- <td align="left"><%= t'site.index.license.license_url' %></td>
- <td align="right"><%= t'site.index.license.project_url' %></td>
+ <td class="attribution_license"><%= t'site.index.license.license_url' %></td>
+ <td class="attribution_project"><%= t'site.index.license.project_url' %></td>
</tr>
<tr>
- <td colspan="2" align="center"><%=
+ <td colspan="2" class="attribution_notice"><%=
t'site.index.license.notice',
:license_name => t('site.index.license.license_name'),
:project_name => t('site.index.license.project_name')
</div>
<%
-if params['mlon'] and params['mlat']
+if params['mlon'] and params['mlat']
marker = true
mlon = h(params['mlon'])
mlat = h(params['mlat'])
end
end
-if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+# Decide on a lat lon to initialise the map with. Various ways of doing this
+if params['bbox']
+ bbox = true
+ minlon, minlat, maxlon, maxlat = h(params['bbox']).split(",")
+ layers = h(params['layers'])
+ box = true if params['box']=="yes"
+ object_zoom = false
+elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
bbox = true
minlon = h(params['minlon'])
minlat = h(params['minlat'])
maxlon = h(params['maxlon'])
maxlat = h(params['maxlat'])
- box = true if params['box']=="yes"
+ layers = h(params['layers'])
+ box = true if params['box']=="yes"
object_zoom = false
-end
-
-# Decide on a lat lon to initialise the map with. Various ways of doing this
-if params['lon'] and params['lat']
+elsif params['lon'] and params['lat']
lon = h(params['lon'])
lat = h(params['lat'])
zoom = h(params['zoom'] || '5')
layers = h(params['layers'])
object_zoom = false
elsif params['mlon'] and params['mlat']
- lon = h(params['mlon'])
+ lon = h(params['mlon'])
lat = h(params['mlat'])
zoom = h(params['zoom'] || '12')
layers = h(params['layers'])
object_zoom = false
elsif cookies.key?("_osm_location")
lon,lat,zoom,layers = cookies["_osm_location"].split("|")
-elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
+elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
lon = @user.home_lon
lat = @user.home_lat
zoom = '10'
else
- session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
+ unless STATUS == :database_readonly or STATUS == :database_offline
+ session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location]
+ end
if session[:location]
bbox = true
maxlon = session[:location][:maxlon]
maxlat = session[:location][:maxlat]
else
- lon = '-0.1'
- lat = '51.5'
- zoom = h(params['zoom'] || '5')
+ lon = '-0.1'
+ lat = '51.5'
+ zoom = h(params['zoom'] || '5')
end
- layers = h(params['layers'])
+ layers = h(params['layers'])
end
%>
-<!--Use stock OpenLayers for now, as the OSM one is missing some needed classes-->
-<script src="http://www.openlayers.org/api/OpenLayers.js"></script>
-<!-- < %= javascript_include_tag '/openlayers/OpenLayers.js' % > -->
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
-<%= javascript_include_tag 'openstreetbugs.js' %>
<%= javascript_include_tag 'map.js' %>
-<script type="text/javascript" defer="defer">
- <!--
- var brokenContentSize = $("content").offsetWidth == 0;
+<%= render :partial => 'resize' %>
+
+<script type="text/javascript">
var marker;
var map;
OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
+ <% if @user %>
+ var loginName = "<%= @user.display_name %>"
+ <% end %>
+
function mapInit(){
map = createMap("map");
- <% unless OSM_STATUS == :api_offline or OSM_STATUS == :database_offline %>
+ <% unless STATUS == :api_offline or STATUS == :database_offline %>
map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", { "visibility": false });
map.dataLayer.events.register("visibilitychanged", map.dataLayer, toggleData);
map.addLayer(map.dataLayer);
- map.osbLayer = new OpenLayers.Layer.OpenStreetBugs("OpenStreetBugs", {
- serverURL : "/api/0.6/bugs/",
- iconOpen : new OpenLayers.Icon("http://openstreetbugs.schokokeks.org/client/open_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
- iconClosed : new OpenLayers.Icon("http://openstreetbugs.schokokeks.org/client/closed_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
- readonly : false,
- setCookie : false,
- cookieLifetime : 1000,
- cookiePath : "/my/map/",
- permalinkURL : "http://www.openstreetmap.org/",
- theme : "http://osm.cdauth.de/map/openstreetbugs.css"
+ map.noteLayer = new OpenLayers.Layer.Vector("Notes", {
+ visibility: false,
+ projection: new OpenLayers.Projection("EPSG:4326"),
+ styleMap: new OpenLayers.StyleMap(new OpenLayers.Style({
+ graphicWidth: 22,
+ graphicHeight: 22,
+ graphicOpacity: 0.7,
+ graphicXOffset: -11,
+ graphicYOffset: -11
+ }, {
+ rules: [
+ new OpenLayers.Rule({
+ filter: new OpenLayers.Filter.Comparison({
+ type: OpenLayers.Filter.Comparison.EQUAL_TO,
+ property: "status",
+ value: "open"
+ }),
+ symbolizer: {
+ externalGraphic: "<%= image_path 'open_note_marker.png' %>"
+ }
+ }),
+ new OpenLayers.Rule({
+ filter: new OpenLayers.Filter.Comparison({
+ type: OpenLayers.Filter.Comparison.EQUAL_TO,
+ property: "status",
+ value: "closed"
+ }),
+ symbolizer: {
+ externalGraphic: "<%= image_path 'closed_note_marker.png' %>"
+ }
+ })
+ ]
+ })),
+ strategies: [
+ new OpenLayers.Strategy.BBOX()
+ ],
+ protocol: new OpenLayers.Protocol.HTTP({
+ url: "<%= url_for :controller => :note, :action => :list, :format => :json %>",
+ format: new OpenLayers.Format.GeoJSON(),
+ callback: noteCallback
+ })
});
+ map.noteLayer.events.register("featureselected", map, noteSelected);
+ map.noteLayer.events.register("featureunselected", map, noteUnselected);
+ map.addLayer(map.noteLayer);
- map.addLayer(map.osbLayer);
+ var noteControl = new OpenLayers.Control.SelectFeature(map.noteLayer, {
+ autoActivate: true
+ });
+ map.addControl(noteControl);
- map.osbControl = new OpenLayers.Control.OpenStreetBugs(map.osbLayer);
- map.addControl(map.osbControl);
-
- var lBug = document.getElementById('ReportBug');
- lBug.addEventListener('click',function (e) {
- map.osbControl.activate(); document.getElementById("map_OpenLayers_Container").style.cursor = "crosshair"; if (e.stopPropagation) e.stopPropagation(); },false);
+ <% if params[:notes] == "yes" -%>
+ map.noteLayer.setVisibility(true);
+ <% end -%>
+ $("createnoteanchor").observe("click", addNote);
+ map.events.register("zoomend", map, allowNoteReports);
<% end %>
<% unless object_zoom %>
setMapExtent(bbox);
<% if box %>
- // IE requires Vector layers be initialised on page load, and not under deferred script conditions
- Event.observe(window, 'load', function() { addBoxToMap(bbox) });
+ Event.observe(window, "load", function() { addBoxToMap(bbox) });
<% end %>
<% else %>
var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
url += "/full";
<% end %>
- // IE requires Vector layers be initialised on page load, and not under deferred script conditions
- Event.observe(window, 'load', function() { addObjectToMap(url, <%= object_zoom %>) });
+ Event.observe(window, "load", function() { addObjectToMap(url, <%= object_zoom %>) });
<% end %>
map.events.register("moveend", map, updateLocation);
updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, objtype, objid);
- expiry.setYear(expiry.getFullYear() + 10);
+ expiry.setYear(expiry.getFullYear() + 10);
document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();
}
- function resizeContent() {
- var content = $("content");
- var rightMargin = parseInt(getStyle(content, "right"));
- var bottomMargin = parseInt(getStyle(content, "bottom"));
+ function remoteEditHandler(event) {
+ var extent = getMapExtent();
+ var loaded = false;
+
+ $("linkloader").observe("load", function () { loaded = true; });
+ $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom;
- content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
- content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
+ setTimeout(function () {
+ if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
+ }, 1000);
+
+ event.stop();
}
-
- function resizeMap() {
- var centre = map.getCenter();
- var zoom = map.getZoom();
- var sidebar_width = $("sidebar").offsetWidth;
- if (sidebar_width > 0) {
- sidebar_width = sidebar_width + 5
- }
+ function installEditHandler() {
+ $("remoteanchor").observe("click", remoteEditHandler);
- $("map").style.left = (sidebar_width) + "px";
- $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";
- $("map").style.height = ($("content").offsetHeight - 2) + "px";
+ <% if preferred_editor == "remote" %>
+ $("editanchor").observe("click", remoteEditHandler);
- map.setCenter(centre, zoom);
+ <% if params[:action] == "edit" %>
+ remoteEditHandler();
+ <% end %>
+ <% end %>
}
- function handleResize() {
- if (brokenContentSize) {
- resizeContent();
+ function noteCallback(scope, response) {
+ for (var f = 0; f < response.features.length; f++) {
+ var feature = response.features[f];
}
+ }
- resizeMap();
+ function noteSelected(o) {
+ var feature = o.feature;
+ var location = feature.geometry.getBounds().getCenterLonLat();
+
+ feature.popup = new OpenLayers.Popup.FramedCloud(feature.attributes.id,
+ location, null,
+ "<p>" + feature.attributes.id + "</p>",
+ null, true);
+
+ map.addPopup(feature.popup);
+// feature.popup.show();
}
-
- mapInit();
- window.onload = handleResize;
- window.onresize = handleResize;
+ function noteUnselected(o) {
+ var feature = o.feature;
+
+ map.removePopup(feature.popup);
+ delete feature.popup;
+ }
+
+ function addNote() {
+ map.noteLayer.setVisibility(true);
+ map.noteLayer.addNote(map.getCenter());
+ }
+
+ function allowNoteReports() {
+ if (map.getZoom() > 11) {
+ $("createnoteanchor").style.visibility = "visible";
+ } else {
+ $("createnoteanchor").style.visibility = "hidden";
+ }
+ }
+
+ document.observe("dom:loaded", mapInit);
+ document.observe("dom:loaded", installEditHandler);
+ document.observe("dom:loaded", handleResize);
+
+ Event.observe(window, "resize", function() {
+ var centre = map.getCenter();
+ var zoom = map.getZoom();
+
+ handleResize();
+
+ map.setCenter(centre, zoom);
+ });
<% if params['action'] == 'export' %>
<%= remote_function :url => { :controller => 'export', :action => 'start' } %>
<% end %>
-// -->
</script>
projects / rails.git / blobdiff