Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 3ce1a02da3d0a2ada5f01f9d9f79df19e18fea2e..66dfa5b6fac3975a2c00daa6b651d76034303ef0 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,6 +5,8 @@
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share

+//= require leaflet.polyline
+//= require leaflet.query

 //= require index/search
 //= require index/browse
 //= require index/export
 //= require index/search
 //= require index/browse
 //= require index/export


@@ -12,12 +14,17 @@
 //= require index/history
 //= require index/note
 //= require index/new_note
 //= require index/history
 //= require index/note
 //= require index/new_note

+//= require index/directions
+//= require index/changeset
+//= require index/query

 //= require router
 
 //= require router
 

-(function() {
+$(document).ready(function () {

   var loaderTimeout;
 
   OSM.loadSidebarContent = function(path, callback) {
   var loaderTimeout;
 
   OSM.loadSidebarContent = function(path, callback) {

+    map.setSidebarOverlaid(false);
+

     clearTimeout(loaderTimeout);
 
     loaderTimeout = setTimeout(function() {
     clearTimeout(loaderTimeout);
 
     loaderTimeout = setTimeout(function() {


@@ -46,7 +53,8 @@
         var content = $(xhr.responseText);
 
         if (xhr.getResponseHeader('X-Page-Title')) {
         var content = $(xhr.responseText);
 
         if (xhr.getResponseHeader('X-Page-Title')) {

-          document.title = xhr.getResponseHeader('X-Page-Title');
+          var title = xhr.getResponseHeader('X-Page-Title');
+          document.title = decodeURIComponent(escape(title));

         }
 
         $('head')
         }
 
         $('head')


@@ -64,9 +72,7 @@
       }
     });
   };
       }
     });
   };

-})();

 
 

-$(document).ready(function () {

   var params = OSM.mapParams();
 
   var map = new L.OSM.Map("map", {
   var params = OSM.mapParams();
 
   var map = new L.OSM.Map("map", {


@@ -122,6 +128,11 @@ $(document).ready(function () {
     sidebar: sidebar
   }).addTo(map);
 
     sidebar: sidebar
   }).addTo(map);
 

+  L.OSM.query({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+

   L.control.scale()
     .addTo(map);
 
   L.control.scale()
     .addTo(map);
 


@@ -139,16 +150,27 @@ $(document).ready(function () {
 
   $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 
 
   $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
 

+  var expiry = new Date();
+  expiry.setYear(expiry.getFullYear() + 10);
+

   map.on('moveend layeradd layerremove', function() {
   map.on('moveend layeradd layerremove', function() {

-    updatelinks(
+    updateLinks(

       map.getCenter().wrap(),
       map.getZoom(),
       map.getLayersCode(),
       map._object);
 
       map.getCenter().wrap(),
       map.getZoom(),
       map.getLayersCode(),
       map._object);
 

-    var expiry = new Date();
-    expiry.setYear(expiry.getFullYear() + 10);
-    $.cookie("_osm_location", cookieContent(map), { expires: expiry });
+    $.removeCookie("_osm_location");
+    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+  });
+
+  if ($.cookie('_osm_welcome') == 'hide') {
+    $('.welcome').hide();
+  }
+
+  $('.welcome .close').on('click', function() {
+    $('.welcome').hide();
+    $.cookie("_osm_welcome", 'hide', { expires: expiry });

   });
 
   if (OSM.PIWIK) {
   });
 
   if (OSM.PIWIK) {


@@ -186,14 +208,11 @@ $(document).ready(function () {
   });
 
   $("a[data-editor=remote]").click(function(e) {
   });
 
   $("a[data-editor=remote]").click(function(e) {

-      remoteEditHandler(map.getBounds());
-      e.preventDefault();
+    var params = OSM.mapParams(this.search);
+    remoteEditHandler(map.getBounds(), params.object);
+    e.preventDefault();

   });
 
   });
 

-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler(map.getBounds());
-  }
-

   if (OSM.params().edit_help) {
     $('#editanchor')
       .removeAttr('title')
   if (OSM.params().edit_help) {
     $('#editanchor')
       .removeAttr('title')


@@ -211,43 +230,45 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
   OSM.Index = function(map) {
     var page = {};
 

-    page.pushstate = function() {
-      $("#content").addClass("overlay-sidebar");
-      map.invalidateSize({pan: false})
-        .panBy([-350, 0], {animate: false});
+    page.pushstate = page.popstate = function() {
+      map.setSidebarOverlaid(true);
+      document.title = I18n.t('layouts.project_name.title');

     };
 
     page.load = function() {
     };
 
     page.load = function() {

+      if (!("autofocus" in document.createElement("input"))) {
+        $("#sidebar .search_form input[name=query]").focus();
+      }

       return map.getState();
     };
 
       return map.getState();
     };
 

-    page.popstate = function() {
-      $("#content").addClass("overlay-sidebar");
-      map.invalidateSize({pan: false});
-    };
-
-    page.unload = function() {
-      map.panBy([350, 0], {animate: false});
-      $("#content").removeClass("overlay-sidebar");
-      map.invalidateSize({pan: false});
-    };
-

     return page;
   };
 
     return page;
   };
 

-  OSM.Browse = function(map) {
+  OSM.Browse = function(map, type) {

     var page = {};
 
     var page = {};
 

-    page.pushstate = page.popstate = function(path, type, id) {
+    page.pushstate = page.popstate = function(path, id) {

       OSM.loadSidebarContent(path, function() {
       OSM.loadSidebarContent(path, function() {

-        page.load(path, type, id);
+        addObject(type, id);

       });
     };
 
       });
     };
 

-    page.load = function(path, type, id) {
-      map.addObject({type: type, id: parseInt(id)});
+    page.load = function(path, id) {
+      addObject(type, id, true);

     };
 
     };
 

+    function addObject(type, id, center) {
+      var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) {
+        if (!window.location.hash && bounds.isValid() &&
+            (center || !map.getBounds().contains(bounds))) {
+          OSM.router.withoutMoveListener(function () {
+            map.fitBounds(bounds);
+          });
+        }
+      });
+    }
+

     page.unload = function() {
       map.removeObject();
     };
     page.unload = function() {
       map.removeObject();
     };


@@ -260,21 +281,42 @@ $(document).ready(function () {
   OSM.router = OSM.Router(map, {
     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
   OSM.router = OSM.Router(map, {
     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),

+    "/directions":                 OSM.Directions(map),

     "/export":                     OSM.Export(map),
     "/note/new":                   OSM.NewNote(map),
     "/history/friends":            history,
     "/history/nearby":             history,
     "/history":                    history,
     "/user/:display_name/history": history,
     "/export":                     OSM.Export(map),
     "/note/new":                   OSM.NewNote(map),
     "/history/friends":            history,
     "/history/nearby":             history,
     "/history":                    history,
     "/user/:display_name/history": history,

-    "/note/:id":                  OSM.Note(map),
-    "/:type/:id(/history)":       OSM.Browse(map)
+    "/note/:id":                   OSM.Note(map),
+    "/node/:id(/history)":         OSM.Browse(map, 'node'),
+    "/way/:id(/history)":          OSM.Browse(map, 'way'),
+    "/relation/:id(/history)":     OSM.Browse(map, 'relation'),
+    "/changeset/:id":              OSM.Changeset(map),
+    "/query":                      OSM.Query(map)

   });
 
   });
 

+  if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {
+    remoteEditHandler(map.getBounds(), params.object);
+    OSM.router.setCurrentPath("/");
+  }
+

   OSM.router.load();
 
   $(document).on("click", "a", function(e) {
   OSM.router.load();
 
   $(document).on("click", "a", function(e) {

-    if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
-    if (this.host === window.location.host && OSM.router.route(this.pathname + this.search + this.hash)) e.preventDefault();
+    if (e.isDefaultPrevented() || e.isPropagationStopped())
+      return;
+
+    // Open links in a new tab as normal.
+    if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
+      return;
+
+    // Ignore cross-protocol and cross-origin links.
+    if (location.protocol !== this.protocol || location.host !== this.host)
+      return;
+
+    if (OSM.router.route(this.pathname + this.search + this.hash))
+      e.preventDefault();

   });
 
   $(".search_form").on("submit", function(e) {
   });
 
   $(".search_form").on("submit", function(e) {


@@ -284,15 +326,16 @@ $(document).ready(function () {
     if (query) {
       OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
     } else {
     if (query) {
       OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
     } else {

-      OSM.router.route("/" + OSM.formatHash(map));
+      OSM.router.route("/");

     }
   });
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
     }
   });
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();

-    var precision = zoomPrecision(map.getZoom());
+    var center = map.getCenter().wrap(),
+      precision = OSM.zoomPrecision(map.getZoom());

     OSM.router.route("/search?query=" + encodeURIComponent(
     OSM.router.route("/search?query=" + encodeURIComponent(

-      map.getCenter().lat.toFixed(precision) + "," +
-      map.getCenter().lng.toFixed(precision)));
+      center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
+    ));

   });
 });
   });
 });