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

Use machine-readable lat/lon format

Browse source
This commit is contained in:
John Firebaugh 2013-11-21 11:31:58 -08:00
parent ee10cb1290
commit fbd5a88b24
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/index/note.js.erb
View file

@ -61,16 +61,17 @@ OSM.Note = function (map) {
content.find("textarea").val('').trigger("input"); content.find("textarea").val('').trigger("input");
var data = $('.details').data(); var data = $('.details').data(),
latLng = data.coordinates.split(',');
if (!window.location.hash) { if (!window.location.hash) {
var coords = data.coordinates.split(',');
OSM.route.moveListenerOff(); OSM.route.moveListenerOff();
map.once('moveend', OSM.route.moveListenerOn); map.once('moveend', OSM.route.moveListenerOn);
map.getZoom() > 15 ? map.panTo(coords) : map.setView(coords, 16); map.getZoom() > 15 ? map.panTo(latLng) : map.setView(latLng, 16);
} }
if (!map.hasLayer(halo)) { if (!map.hasLayer(halo)) {
halo = L.circleMarker(data.coordinates.split(','), { halo = L.circleMarker(latLng, {
weight: 2.5, weight: 2.5,
radius: 20, radius: 20,
fillOpacity: 0.5, fillOpacity: 0.5,
@ -80,7 +81,7 @@ OSM.Note = function (map) {
} }
if (map.hasLayer(currentNote)) map.removeLayer(currentNote); if (map.hasLayer(currentNote)) map.removeLayer(currentNote);
currentNote = L.marker(data.coordinates.split(','), { currentNote = L.marker(latLng, {
icon: noteIcons[data.status], icon: noteIcons[data.status],
opacity: 1, opacity: 1,
clickable: true clickable: true

2
app/views/browse/note.html.erb
View file

@ -11,7 +11,7 @@
<%= h(@note.comments.first.body.to_html) %> <%= h(@note.comments.first.body.to_html) %>
</div> </div>
<div class="details" data-coordinates="<%= number_with_delimiter(@note.lat) %>,<%=number_with_delimiter(@note.lon) %>" data-status="<%= @note.status %>"> <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
<%= note_event('open', @note.created_at, @note.author) %> <%= note_event('open', @note.created_at, @note.author) %>
<% if @note.status == "closed" %> <% if @note.status == "closed" %>
<br/> <br/>