X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8ec415b060c4321fad3fa42f3038148aa94c9b90..74543b630eaff87f9c7013a933927fa8785e6497:/app/views/site/index.html.erb?ds=inline
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 4e725f906..58bc59c20 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -6,6 +6,7 @@
<% unless STATUS == :api_offline or STATUS == :database_offline -%>
<% content_for :editmenu do -%>
+ <li><%= link_to t("browse.start_rjs.notes_layer_name"), "#", :id => "show_notes" %></li>
<li><%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %></li>
<% end -%>
<% end -%>
@@ -25,6 +26,7 @@
<div id="permalink">
<a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a>
<a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
+ <a href="#" id="createnoteanchor">Report a problem</a>
</div>
</div>
@@ -38,98 +40,19 @@
<td class="attribution_project"><%= t'site.index.license.project_url' %></td>
</tr>
<tr>
- <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')
- %></td>
+ <td colspan="2" class="attribution_notice"><%= t'site.index.license.copyright' %></td>
</tr>
</table>
</div>
-<%
-if params[:mlon] and params[:mlat]
- marker = true
- mlon = params[:mlon].to_f
- mlat = params[:mlat].to_f
-end
-
-if params[:node] or params[:way] or params[:relation]
- object = true
- object_zoom = true
-
- if params[:node]
- object_type = 'node'
- object_id = params[:node].to_i
- elsif params[:way]
- object_type = 'way'
- object_id = params[:way].to_i
- elsif params[:relation]
- object_type = 'relation'
- object_id = params[:relation].to_i
- end
-end
-
-# Decide on a lat lon to initialise the map with. Various ways of doing this
-if params[:bbox]
- bbox = true
- minlon, minlat, maxlon, maxlat = params[:bbox].split(",").collect { |c| c.to_f }
- layers = 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 = params[:minlon].to_f
- minlat = params[:minlat].to_f
- maxlon = params[:maxlon].to_f
- maxlat = params[:maxlat].to_f
- layers = params[:layers]
- box = true if params[:box]=="yes"
- object_zoom = false
-elsif params[:lon] and params[:lat]
- lon = params[:lon].to_f
- lat = params[:lat].to_f
- zoom = params.fetch(:zoom, 5).to_i
- layers = params[:layers]
- object_zoom = false
-elsif params[:mlon] and params[:mlat]
- lon = params[:mlon].to_f
- lat = params[:mlat].to_f
- zoom = params.fetch(:zoom, 12).to_i
- layers = 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?
- lon = @user.home_lon
- lat = @user.home_lat
- zoom = 10
-else
- 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
- minlon = session[:location][:minlon]
- minlat = session[:location][:minlat]
- maxlon = session[:location][:maxlon]
- maxlat = session[:location][:maxlat]
- else
- lon = -0.1
- lat = 51.5
- zoom = params.fetch(:zoom, 5).to_i
- end
-
- layers = params[:layers]
-end
-%>
-
-<%= render :partial => 'resize' %>
-
<script type="text/javascript">
var marker;
var map;
+ var params = OSM.mapParams();
+
+ <% if @user %>
+ var loginName = "<%= @user.display_name %>"
+ <% end %>
function mapInit(){
map = createMap("map");
@@ -140,46 +63,45 @@ end
displayInLayerSwitcher: false
});
map.addLayer(map.dataLayer);
+
+ map.noteLayer = addNoteLayer(map, "<%= notes_url :format => 'json' %>", $("#createnoteanchor"), 11);
+
+ <% if params[:notes] == "yes" -%>
+ map.noteLayer.setVisibility(true);
+ <% end -%>
<% end %>
- <% unless object_zoom %>
- <% if bbox %>
- var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
+ if (!params.object_zoom) {
+ if (params.bbox) {
+ var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
map.zoomToExtent(proj(bbox));
- <% if box %>
+ if (params.box) {
$(window).load(function() { addBoxToMap(bbox) });
- <% end %>
- <% else %>
- var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
- <% if params[:scale].to_f > 0 then -%>
- var zoom = <%= scale_to_zoom params[:scale] %>;
- <% else -%>
- var zoom = <%= zoom %>;
- <% end -%>
-
- setMapCenter(centre, zoom);
- <% end %>
- <% end %>
+ }
+ } else {
+ setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+ }
+ }
- <% if !layers.nil? and !layers.empty? %>
- setMapLayers("<%= layers %>");
- <% end %>
+ if (params.layers) {
+ setMapLayers(params.layers);
+ }
- <% if marker %>
- marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
- <% end %>
+ if (params.marker) {
+ marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
+ }
- <% if object %>
- var url = "/api/<%= "#{API_VERSION}" %>/<%= object_type %>/<%= object_id %>";
+ if (params.object) {
+ var url = "/api/" + OSM.API_VERSION + "/" + params.object_type + "/" + params.object_id;
- <% if object_type != "node" %>
+ if (params.object_type != "node") {
url += "/full";
- <% end %>
+ }
- $(window).load(function() { addObjectToMap(url, <%= object_zoom %>) });
- <% end %>
+ $(window).load(function() { addObjectToMap(url, params.object_zoom) });
+ }
map.events.register("moveend", map, updateLocation);
map.events.register("changelayer", map, updateLocation);
@@ -189,6 +111,10 @@ end
}
$(document).ready(function () {
+ $("#show_notes").click(function () {
+ map.noteLayer.setVisibility(true);
+ });
+
$("#show_data").click(function (e) {
$.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
startBrowse(sidebarHtml);
@@ -230,18 +156,11 @@ end
var layers = getMapLayers();
var extents = unproj(map.getExtent());
var expiry = new Date();
- var objtype;
- var objid;
-
- <% if object %>
- objtype = "<%= object_type %>";
- objid = <%= object_id %>;
- <% end %>
- updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, objtype, objid);
+ updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id);
expiry.setYear(expiry.getFullYear() + 10);
- document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();
+ $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
}
function remoteEditHandler(event) {