<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
<% content_for :greeting do %>
- <%= link_to_function t('layouts.home'), "setPosition(#{@user.home_lat}, #{@user.home_lon}, 15)", { :title => t('layouts.home_tooltip') } %> |
+ <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> |
<% end %>
<% end %>
-<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<% 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 -%>
+
+<%= render :partial => 'sidebar' %>
<%= render :partial => 'key' %>
<%= render :partial => 'search' %>
<div id="noscript">
<p><%= t 'site.index.js_1' %></p>
<p><%= t 'site.index.js_2' %></p>
- <p><%= t 'site.index.js_3' %></p>
</div>
</noscript>
<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>
<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
-%>
-
-<%= javascript_include_tag 'openlayers.js' %>
-<%= javascript_include_tag 'map.js' %>
-
-<%= render :partial => 'resize' %>
+<div id="new-note" class="hidden"><%= render :partial => "notes/new" %></div>
<script type="text/javascript">
var marker;
var map;
+ var params = OSM.mapParams();
- OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
+ <% if @user %>
+ var loginName = "<%= @user.display_name %>"
+ <% end %>
function mapInit(){
map = createMap("map");
<% 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.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", {
+ visibility: false,
+ displayInLayerSwitcher: false
+ });
map.addLayer(map.dataLayer);
- <% end %>
- <% unless object_zoom %>
- <% if bbox %>
- var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
+ map.noteLayer = addNoteLayer(map, "<%= notes_url :format => 'json' %>", $("#createnoteanchor"), $("#new-note"), 11);
- setMapExtent(bbox);
+ <% if params[:notes] == "yes" -%>
+ map.noteLayer.setVisibility(true);
+ <% end -%>
+ <% end %>
- <% if box %>
- $(window).load(function() { addBoxToMap(bbox) });
- <% end %>
- <% else %>
- var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
- var zoom = <%= zoom %>;
+ if (!params.object_zoom) {
+ if (params.bbox) {
+ var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
- <% if params[:scale] and params[:scale].length > 0 then %>
- zoom = scaleToZoom(<%= params[:scale].to_f %>);
- <% end %>
+ map.zoomToExtent(proj(bbox));
- setMapCenter(centre, zoom);
- <% end %>
- <% end %>
+ if (params.box) {
+ $(window).load(function() { addBoxToMap(bbox) });
+ }
+ } 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);
handleResize();
}
- function toggleData() {
- if (map.dataLayer.visibility) {
- $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });
- } else if (map.dataLayer.active) {
- closeSidebar();
- }
- }
-
- function getPosition() {
- return getMapCenter();
- }
-
- function getZoom() {
- return getMapZoom();
- }
+ $(document).ready(function () {
+ $("#show_notes").click(function () {
+ map.noteLayer.setVisibility(true);
+ });
- function setPosition(lat, lon, zoom, min_lon, min_lat, max_lon, max_lat) {
- var centre = new OpenLayers.LonLat(lon, lat);
+ $("#show_data").click(function (e) {
+ $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
+ startBrowse(sidebarHtml);
+ }});
+ e.preventDefault();
+ });
- if (min_lon && min_lat && max_lon && max_lat) {
- var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
+ $("body").on("click", "a.set_position", function () {
+ var lat = parseFloat($(this).attr("data-lat"));
+ var lon = parseFloat($(this).attr("data-lon"));
+ var zoom = parseInt($(this).attr("data-zoom"));
+ var min_lon = parseFloat($(this).attr("data-min-lon"));
+ var min_lat = parseFloat($(this).attr("data-min-lat"));
+ var max_lon = parseFloat($(this).attr("data-max-lon"));
+ var max_lat = parseFloat($(this).attr("data-max-lat"));
+ var centre = new OpenLayers.LonLat(lon, lat);
+
+ if (min_lon && min_lat && max_lon && max_lat) {
+ var bbox = new OpenLayers.Bounds(min_lon, min_lat, max_lon, max_lat);
+
+ map.zoomToExtent(proj(bbox));
+ } else {
+ setMapCenter(centre, zoom);
+ }
- setMapExtent(bbox);
- } else {
- setMapCenter(centre, zoom);
- }
+ if (marker) {
+ removeMarkerFromMap(marker);
+ }
- if (marker)
- removeMarkerFromMap(marker);
+ marker = addMarkerToMap(centre, getArrowIcon());
- marker = addMarkerToMap(centre, getArrowIcon());
- }
+ return false;
+ });
+ });
function updateLocation() {
- var lonlat = getMapCenter();
+ var lonlat = unproj(map.getCenter());
var zoom = map.getZoom();
var layers = getMapLayers();
- var extents = getMapExtent();
+ 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) {
- var extent = getMapExtent();
+ var extent = unproj(map.getExtent());
var loaded = false;
$("#linkloader").load(function () { loaded = true; });
$(document).ready(function () {
$("#exportanchor").click(function (e) {
- $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
- Event.stop(e);
+ $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>", success: function (sidebarHtml) {
+ startExport(sidebarHtml);
+ }});
+ e.preventDefault();
});
- <% if params[:action] == 'export' -%>
- $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
+ <% if params[:export] -%>
+ $("#exportanchor").click();
<% end -%>
<% if params[:query] -%>
projects / rails.git / blobdiff