Fix editing notes outside of view, closes #57

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2a704f72464f8d697fe02f8b91bd592855b3ac46..15b45d31c34e407bb456e4ac39cad936ebd35b0b 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -9,63 +9,27 @@
 //= require index/browse
 //= require index/export
 //= require index/notes
 //= require index/browse
 //= require index/export
 //= require index/notes

+//= require index/history
+//= require index/note
+//= require index/new_note
+//= require router

 
 $(document).ready(function () {
   var params = OSM.mapParams();
 
 
 $(document).ready(function () {
   var params = OSM.mapParams();
 

-  var map = L.map("map", {
+  var map = new L.OSM.Map("map", {

     zoomControl: false,
     layerControl: false
   });
 
   map.attributionControl.setPrefix('');
 
     zoomControl: false,
     layerControl: false
   });
 
   map.attributionControl.setPrefix('');
 

-  map.hash = L.hash(map);
-
-  var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
-
-  var layers = [
-    new L.OSM.Mapnik({
-      attribution: copyright,
-      code: "M",
-      keyid: "mapnik",
-      name: I18n.t("javascripts.map.base.standard")
-    }),
-    new L.OSM.CycleMap({
-      attribution: copyright + ". Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-      code: "C",
-      keyid: "cyclemap",
-      name: I18n.t("javascripts.map.base.cycle_map")
-    }),
-    new L.OSM.TransportMap({
-      attribution: copyright + ". Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-      code: "T",
-      keyid: "transportmap",
-      name: I18n.t("javascripts.map.base.transport_map")
-    }),
-    new L.OSM.MapQuestOpen({
-      attribution: copyright + ". Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
-      code: "Q",
-      keyid: "mapquest",
-      name: I18n.t("javascripts.map.base.mapquest")
-    })
-  ];
-
-  for (var i = layers.length - 1; i >= 0; i--) {
-    if (i === 0 || params.layers.indexOf(layers[i].options.code) >= 0) {
-      map.addLayer(layers[i]);
-      break;
-    }
-  }
-
-  map.noteLayer = new L.LayerGroup();
-  map.noteLayer.options = {code: 'N'};
-
-  map.dataLayer = new L.OSM.DataLayer(null);
-  map.dataLayer.options.code = 'D';
+  map.updateLayers(params.layers);

 
 

-  $("#sidebar").on("opened closed", function () {
-    map.invalidateSize();
+  map.on("baselayerchange", function (e) {
+    if (map.getZoom() > e.layer.options.maxZoom) {
+      map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+    }

   });
 
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
   });
 
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';


@@ -86,7 +50,7 @@ $(document).ready(function () {
 
   L.OSM.layers({
     position: position,
 
   L.OSM.layers({
     position: position,

-    layers: layers,
+    layers: map.baseLayers,

     sidebar: sidebar
   }).addTo(map);
 
     sidebar: sidebar
   }).addTo(map);
 


@@ -109,36 +73,56 @@ $(document).ready(function () {
   L.control.scale()
     .addTo(map);
 
   L.control.scale()
     .addTo(map);
 

+  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    initializeNotes(map);
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);
+    }
+
+    initializeBrowse(map);
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }
+  }
+

   $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 
   $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 

-  map.on('moveend layeradd layerremove', updateLocation);
+  map.on('moveend layeradd layerremove', function() {
+    updatelinks(
+      map.getCenter().wrap(),
+      map.getZoom(),
+      map.getLayersCode(),
+      map._object);

 
 

-  var marker = L.marker([0, 0], {icon: getUserIcon()});
+    var expiry = new Date();
+    expiry.setYear(expiry.getFullYear() + 10);
+    $.cookie("_osm_location", cookieContent(map), { expires: expiry });
+  });

 
 

-  if (!params.object_zoom) {
-    if (params.bounds) {
-      map.fitBounds(params.bounds);
-    } else {
-      map.setView([params.lat, params.lon], params.zoom);
-    }
+  if (OSM.PIWIK) {
+    map.on('layeradd', function (e) {
+      if (e.layer.options) {
+        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+
+        if (goal) {
+          $('body').trigger('piwikgoal', goal);
+        }
+      }
+    });

   }
 
   }
 

-  if (params.box) {
-    L.rectangle(params.box, {
-      weight: 2,
-      color: '#e90',
-      fillOpacity: 0
-    }).addTo(map);
+  if (params.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);

   }
 
   }
 

+  var marker = L.marker([0, 0], {icon: getUserIcon()});
+

   if (params.marker) {
     marker.setLatLng([params.mlat, params.mlon]).addTo(map);
   }
 
   if (params.marker) {
     marker.setLatLng([params.mlat, params.mlon]).addTo(map);
   }
 

-  if (params.object) {
-    map.addObject(params.object, { zoom: params.object_zoom });
-  }
-

   $("#homeanchor").on("click", function(e) {
     e.preventDefault();
 
   $("#homeanchor").on("click", function(e) {
     e.preventDefault();
 


@@ -172,22 +156,96 @@ $(document).ready(function () {
     });
   }
 
     });
   }
 

-  initializeSearch(map);
-  initializeExport(map);
-  initializeBrowse(map, params);
-  initializeNotes(map, params);
-});
+  OSM.Index = function(map) {
+    var page = {};

 
 

-function updateLocation() {
-  updatelinks(this.getCenter().wrap(),
-      this.getZoom(),
-      this.getLayersCode(),
-      this.getBounds().wrap());
+    function loadContent(path) {
+      $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
+        if (xhr.getResponseHeader('X-Page-Title')) {
+          document.title = xhr.getResponseHeader('X-Page-Title');
+        }
+      });
+    }

 
 

-  var expiry = new Date();
-  expiry.setYear(expiry.getFullYear() + 10);
-  $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+    page.pushstate = function(path) {
+      $("#content").addClass("overlay-sidebar");
+      map.invalidateSize({pan: false})
+        .panBy([-300, 0], {animate: false});
+      loadContent(path);
+    };
+
+    page.popstate = function(path) {
+      $("#content").addClass("overlay-sidebar");
+      map.invalidateSize({pan: false});
+      loadContent(path);
+    };
+
+    page.unload = function() {
+      map.panBy([300, 0], {animate: false});
+      $("#content").removeClass("overlay-sidebar");
+      map.invalidateSize({pan: false});
+    };
+
+    return page;
+  };
+
+  OSM.Browse = function(map) {
+    var page = {};
+
+    page.pushstate = page.popstate = function(path, type, id) {
+      $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
+        if (xhr.getResponseHeader('X-Page-Title')) {
+          document.title = xhr.getResponseHeader('X-Page-Title');
+        }
+        page.load(path, type, id);
+      });
+    };
+
+    page.load = function(path, type, id) {
+      if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
+
+      map.addObject({type: type, id: parseInt(id)}, {zoom: window.location.hash == ""});
+    };
+
+    page.unload = function() {
+      map.removeObject();
+    };
+
+    return page;
+  };
+
+  var history = OSM.History(map),
+    note = OSM.Note(map);
+
+  OSM.route = OSM.Router(map, {
+    "/":                           OSM.Index(map),
+    "/search":                     OSM.Search(map),
+    "/export":                     OSM.Export(map),
+    "/history":                    history,
+    "/new_note":                   OSM.NewNote(map),
+    "/user/:display_name/edits":   history,
+    "/browse/friends":             history,
+    "/browse/nearby":              history,
+    "/browse/note/:id":            note,
+    "/browse/:type/:id(/history)": OSM.Browse(map)
+  });

 
 

-  // Trigger hash update on layer changes.
-  this.hash.onMapMove();
-}
+  $(document).on("click", "a", function(e) {
+    if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
+    if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault();
+  });
+
+  $(".search_form").on("submit", function(e) {
+    e.preventDefault();
+    $("header").addClass("closed");
+    OSM.route("/search?query=" + encodeURIComponent($(this).find("input[name=query]").val()) + OSM.formatHash(map));
+  });
+
+  $(".describe_location").on("click", function(e) {
+    e.preventDefault();
+    var precision = zoomPrecision(map.getZoom());
+    OSM.route("/search?query=" + encodeURIComponent(
+      map.getCenter().lat.toFixed(precision) + "," +
+      map.getCenter().lng.toFixed(precision)));
+  });
+});