-//= require templates/notes/show
-//= require templates/notes/new
-
-$(document).ready(function () {
- var params = OSM.mapParams();
+function initializeNotes(map) {
+ var noteLayer = map.noteLayer,
+ notes = {};
var noteIcons = {
"new": L.icon({
iconUrl: "<%= image_path 'new_note_marker.png' %>",
- iconSize: [22, 22],
- iconAnchor: [11, 11]
+ iconSize: [25, 40],
+ iconAnchor: [12, 40]
}),
"open": L.icon({
iconUrl: "<%= image_path 'open_note_marker.png' %>",
- iconSize: [22, 22],
- iconAnchor: [11, 11]
+ iconSize: [25, 40],
+ iconAnchor: [12, 40]
}),
"closed": L.icon({
iconUrl: "<%= image_path 'closed_note_marker.png' %>",
- iconSize: [22, 22],
- iconAnchor: [11, 11]
+ iconSize: [25, 40],
+ iconAnchor: [12, 40]
})
};
- var noteLayer = new L.LayerGroup();
- var notes = {};
-
map.on("layeradd", function (e) {
if (e.layer == noteLayer) {
loadNotes();
map.on("moveend", loadNotes);
}
- });
-
- map.on("layerremove", function (e) {
+ }).on("layerremove", function (e) {
if (e.layer == noteLayer) {
map.off("moveend", loadNotes);
noteLayer.clearLayers();
+ notes = {};
}
});
- if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
- map.layersControl.addOverlay(noteLayer, I18n.t("browse.start_rjs.notes_layer_name"));
-
- if (params.notes) map.addLayer(noteLayer);
- }
+ noteLayer.on('click', function(e) {
+ OSM.route('/browse/note/' + e.layer.id);
+ });
function updateMarker(marker, feature) {
- var icon = noteIcons[feature.properties.status];
- var popupContent = createPopupContent(marker, feature.properties);
-
- if (marker)
- {
+ if (marker) {
marker.setIcon(noteIcons[feature.properties.status]);
- marker._popup.setContent(popupContent);
- }
- else
- {
+ } else {
marker = L.marker(feature.geometry.coordinates.reverse(), {
- icon: icon,
- opacity: 0.7
+ icon: noteIcons[feature.properties.status],
+ opacity: 0.9,
+ clickable: true
});
-
- marker.addTo(noteLayer).bindPopup(popupContent, popupOptions());
+ marker.id = feature.properties.id;
+ marker.addTo(noteLayer);
}
-
return marker;
}
+ noteLayer.getLayerId = function(marker) {
+ return marker.id;
+ };
+
var noteLoader;
function loadNotes() {
var size = bounds.getSize();
if (size <= OSM.MAX_NOTE_REQUEST_AREA) {
- var url = "/api/" + OSM.API_VERSION + "/notes.json?bbox=" + bounds.toBBOX();
+ var url = "/api/" + OSM.API_VERSION + "/notes.json?bbox=" + bounds.toBBoxString();
if (noteLoader) noteLoader.abort();
noteLoader = $.ajax({
url: url,
- success: function (json) {
- var oldNotes = notes;
-
- notes = {};
-
- json.features.forEach(function (feature) {
- var marker = oldNotes[feature.properties.id];
-
- delete oldNotes[feature.properties.id];
-
- notes[feature.properties.id] = updateMarker(marker, feature);
- });
-
- for (id in oldNotes) {
- noteLayer.removeLayer(oldNotes[id]);
- }
-
- noteLoader = null;
- }
+ success: success
});
}
- };
-
- function popupOptions() {
- var mapSize = map.getSize();
-
- return {
- minWidth: 320,
- maxWidth: mapSize.y * 1 / 3,
- maxHeight: mapSize.y * 2 / 3,
- autoPanPadding: new L.Point(60, 40)
- };
- }
-
- function createPopupContent(marker, properties) {
- var content = $(JST["templates/notes/show"]({ note: properties }));
- content.find("textarea").on("input", function (e) {
- var form = e.target.form;
+ function success(json) {
+ var oldNotes = notes;
+ notes = {};
+ json.features.forEach(updateMarkers);
- if ($(e.target).val() == "") {
- $(form.close).val(I18n.t("javascripts.notes.show.close"));
- $(form.comment).prop("disabled", true);
- } else {
- $(form.close).val(I18n.t("javascripts.notes.show.comment_and_close"));
- $(form.comment).prop("disabled", false);
- }
- });
-
- content.find("input[type=submit]").on("click", function (e) {
- e.preventDefault();
- updateNote(marker, e.target.form, $(e.target).data("url"));
- });
-
- return content[0];
- }
-
- function createNote(marker, form, url) {
- var location = marker.getLatLng();
-
- $(form).find("input[type=submit]").prop("disabled", true);
-
- $.ajax({
- url: url,
- type: "POST",
- data: {
- lat: location.lat,
- lon: location.lng,
- text: $(form.text).val()
- },
- success: function (feature) {
+ function updateMarkers(feature) {
+ var marker = oldNotes[feature.properties.id];
+ delete oldNotes[feature.properties.id];
notes[feature.properties.id] = updateMarker(marker, feature);
-
- $(".leaflet-popup-close-button").off("click.close");
}
- });
- }
- function updateNote(marker, form, url) {
- $(form).find("input[type=submit]").prop("disabled", true);
-
- $.ajax({
- url: url,
- type: "POST",
- data: {
- text: $(form.text).val()
- },
- success: function (feature) {
- var popupContent = createPopupContent(marker, feature.properties);
-
- marker.setIcon(noteIcons[feature.properties.status]);
- marker._popup.setContent(popupContent);
+ for (var id in oldNotes) {
+ noteLayer.removeLayer(oldNotes[id]);
}
- });
- }
- $("#createnoteanchor").click(function (e) {
- e.preventDefault();
-
- if ($(e.target).hasClass("disabled")) return;
-
- map.addLayer(noteLayer);
-
- var marker = L.marker(map.getCenter(), {
- icon: noteIcons["new"],
- opacity: 0.7,
- draggable: true
- });
-
- var popupContent = $(JST["templates/notes/new"]({ create_url: $(e.target).attr("href") }));
-
- popupContent.find("input[type=submit]").on("click", function (e) {
- e.preventDefault();
- createNote(marker, e.target.form, $(e.target).data("url"));
- });
-
- marker.addTo(noteLayer).bindPopup(popupContent[0], popupOptions()).openPopup();
-
- $(".leaflet-popup-close-button").on("click.close", function (e) {
- map.removeLayer(marker);
- });
-
- marker.on("dragend", function (e) {
- e.target.openPopup();
- });
- });
-});
+ noteLoader = null;
+ }
+ }
+}
projects / rails.git / blobdiff