Basic framework for map UI

[rails.git] / app / assets / javascripts / index / notes.js.erb

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index 9fb03bb0dd62af9ad4ec7c5be0a75a70fd0b20b4..e540826ecb77de37b24151fa91ba17de71d8915c 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -7,18 +7,18 @@ $(document).ready(function () {
   var noteIcons = {
     "new": L.icon({
       iconUrl: "<%= image_path 'new_note_marker.png' %>",
   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' %>",
     }),
     "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' %>",
     }),
     "closed": L.icon({
       iconUrl: "<%= image_path 'closed_note_marker.png' %>",

-      iconSize: [22, 22],
-      iconAnchor: [11, 11]
+      iconSize: [25, 40],
+      iconAnchor: [12, 40]

     })
   };
 
     })
   };
 


@@ -26,6 +26,11 @@ $(document).ready(function () {
   var notes = {};
   var newNote;
 
   var notes = {};
   var newNote;
 

+  layers.push({
+    layer: noteLayer,
+    layerCode: "N"
+  });
+

   map.on("layeradd", function (e) {
     if (e.layer == noteLayer) {
       loadNotes();
   map.on("layeradd", function (e) {
     if (e.layer == noteLayer) {
       loadNotes();


@@ -41,9 +46,12 @@ $(document).ready(function () {
     }
   });
 
     }
   });
 

-  map.on("popupopen", function (e) {
-    $(e.popup._container).find(".comment").focus();
-  });
+  // Don't focus the text area on touch devices to avoid flashing the keyboard
+  if (!('ontouchstart' in document.documentElement)) {
+    map.on("popupopen", function (e) {
+      $(e.popup._container).find(".comment").focus();
+    });
+  }

 
   map.on("popupclose", function (e) {
     if (newNote && e.popup == newNote._popup) {
 
   map.on("popupclose", function (e) {
     if (newNote && e.popup == newNote._popup) {


@@ -55,8 +63,9 @@ $(document).ready(function () {
   });
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
   });
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {

-    map.layersControl.addOverlay(noteLayer, I18n.t("browse.start_rjs.notes_layer_name"));
+//    map.layersControl.addOverlay(noteLayer, I18n.t("browse.start_rjs.notes_layer_name"));

 
 

+    if (params.layers) setMapLayers(params.layers);

     if (params.notes) map.addLayer(noteLayer);
 
     if (params.note) {
     if (params.notes) map.addLayer(noteLayer);
 
     if (params.note) {


@@ -78,13 +87,16 @@ $(document).ready(function () {
     if (marker)
     {
       marker.setIcon(noteIcons[feature.properties.status]);
     if (marker)
     {
       marker.setIcon(noteIcons[feature.properties.status]);

-      marker._popup.setContent(createPopupContent(marker, feature.properties));
+      marker.setPopupContent(createPopupContent(
+        marker, feature.properties, 
+        $(marker._popup._content).find("textarea").val()
+      ));

     }
     else
     {
       marker = L.marker(feature.geometry.coordinates.reverse(), {
         icon: noteIcons[feature.properties.status],
     }
     else
     {
       marker = L.marker(feature.geometry.coordinates.reverse(), {
         icon: noteIcons[feature.properties.status],

-        opacity: 0.7
+        opacity: 0.9

       });
 
       marker.addTo(noteLayer).bindPopup(
       });
 
       marker.addTo(noteLayer).bindPopup(


@@ -103,7 +115,7 @@ $(document).ready(function () {
     var size = bounds.getSize();
 
     if (size <= OSM.MAX_NOTE_REQUEST_AREA) {
     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();
 
 
       if (noteLoader) noteLoader.abort();
 


@@ -139,12 +151,12 @@ $(document).ready(function () {
       minWidth: 320,
       maxWidth: mapSize.y * 1 / 3,
       maxHeight: mapSize.y * 2 / 3,
       minWidth: 320,
       maxWidth: mapSize.y * 1 / 3,
       maxHeight: mapSize.y * 2 / 3,

-      offset: new L.Point(0, -3),
+      offset: new L.Point(0, -40),

       autoPanPadding: new L.Point(60, 40)
     };
   }
 
       autoPanPadding: new L.Point(60, 40)
     };
   }
 

-  function createPopupContent(marker, properties) {
+  function createPopupContent(marker, properties, comment) {

     var content = $(JST["templates/notes/show"]({ note: properties }));
 
     content.find("textarea").on("input", function (e) {
     var content = $(JST["templates/notes/show"]({ note: properties }));
 
     content.find("textarea").on("input", function (e) {


@@ -161,15 +173,23 @@ $(document).ready(function () {
 
     content.find("input[type=submit]").on("click", function (e) {
       e.preventDefault();
 
     content.find("input[type=submit]").on("click", function (e) {
       e.preventDefault();

-      updateNote(marker, e.target.form, $(e.target).data("url"));
+      var data = $(e.target).data();
+      updateNote(marker, e.target.form, data.method, data.url);

     });
 
     });
 

+    if (comment) {
+      content.find("textarea").val(comment).trigger("input");
+    }
+

     return content[0];
   }
 
   function createNote(marker, form, url) {
     var location = marker.getLatLng();
 
     return content[0];
   }
 
   function createNote(marker, form, url) {
     var location = marker.getLatLng();
 

+    marker.options.draggable = false;
+    marker.dragging.disable();
+

     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({
     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({


@@ -182,6 +202,8 @@ $(document).ready(function () {
         text: $(form.text).val()
       },
       success: function (feature) {
         text: $(form.text).val()
       },
       success: function (feature) {

+        $(marker._popup._content).find("textarea").val("");
+

         notes[feature.properties.id] = updateMarker(marker, feature);
         newNote = null;
 
         notes[feature.properties.id] = updateMarker(marker, feature);
         newNote = null;
 


@@ -190,26 +212,32 @@ $(document).ready(function () {
     });
   }
 
     });
   }
 

-  function updateNote(marker, form, url) {
+  function updateNote(marker, form, method, url) {

     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({
       url: url,
     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({
       url: url,

-      type: "POST",
+      type: method,

       oauth: true,
       data: {
         text: $(form.text).val()
       },
       success: function (feature) {
       oauth: true,
       data: {
         text: $(form.text).val()
       },
       success: function (feature) {

-        var popupContent = createPopupContent(marker, feature.properties);
+        if (feature.properties.status == "hidden") {
+          noteLayer.removeLayer(marker);
+
+          delete notes[feature.properties.id];
+        } else {
+          var popupContent = createPopupContent(marker, feature.properties);

 
 

-        marker.setIcon(noteIcons[feature.properties.status]);
-        marker._popup.setContent(popupContent);
+          marker.setIcon(noteIcons[feature.properties.status]);
+          marker.setPopupContent(popupContent);
+        }

       }
     });
   }
 
       }
     });
   }
 

-  $("#createnoteanchor").click(function (e) {
+  $(".leaflet-control-attribution").on("click", "#createnoteanchor", function (e) {

     e.preventDefault();
 
     if ($(e.target).hasClass("disabled")) return;
     e.preventDefault();
 
     if ($(e.target).hasClass("disabled")) return;


@@ -236,7 +264,7 @@ $(document).ready(function () {
 
     newNote = L.marker(map.containerPointToLatLng(markerPosition), {
       icon: noteIcons["new"],
 
     newNote = L.marker(map.containerPointToLatLng(markerPosition), {
       icon: noteIcons["new"],

-      opacity: 0.7,
+      opacity: 0.9,

       draggable: true
     });
 
       draggable: true
     });