Merge branch 'master' into convert_roundabout_exits

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 6fc870a4ce296a2971d1f965be8ddf249268d736..4ea643b261e68b676ae640c9e01cc9e24ba48449 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,6 +5,10 @@
 //= 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 leaflet.contextmenu
+//= require index/contextmenu

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


@@ -12,12 +16,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() {


@@ -27,9 +36,9 @@
     // IE<10 doesn't respect Vary: X-Requested-With header, so
     // prevent caching the XHR response as a full-page URL.
     if (path.indexOf('?') >= 0) {
     // IE<10 doesn't respect Vary: X-Requested-With header, so
     // prevent caching the XHR response as a full-page URL.
     if (path.indexOf('?') >= 0) {

-      path += '&xhr=1'
+      path += '&xhr=1';

     } else {
     } else {

-      path += '?xhr=1'
+      path += '?xhr=1';

     }
 
     $('#sidebar_content')
     }
 
     $('#sidebar_content')


@@ -40,25 +49,38 @@
       dataType: "html",
       complete: function(xhr) {
         clearTimeout(loaderTimeout);
       dataType: "html",
       complete: function(xhr) {
         clearTimeout(loaderTimeout);

+        $('#flash').empty();

         $('#sidebar_loader').hide();
         $('#sidebar_loader').hide();

-        $('#sidebar_content').html(xhr.responseText);
+
+        var content = $(xhr.responseText);
+

         if (xhr.getResponseHeader('X-Page-Title')) {
         if (xhr.getResponseHeader('X-Page-Title')) {

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

         }
         }

+
+        $('head')
+          .find('link[type="application/atom+xml"]')
+          .remove();
+
+        $('head')
+          .append(content.filter('link[type="application/atom+xml"]'));
+
+        $('#sidebar_content').html(content.not('link[type="application/atom+xml"]'));
+

         if (callback) {
           callback();
         }
       }
     });
   };
         if (callback) {
           callback();
         }
       }
     });
   };

-})();

 
 

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

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

-    layerControl: false
+    layerControl: false,
+    contextmenu: true

   });
 
   map.attributionControl.setPrefix('');
   });
 
   map.attributionControl.setPrefix('');


@@ -76,14 +98,26 @@ $(document).ready(function () {
   L.OSM.zoom({position: position})
     .addTo(map);
 
   L.OSM.zoom({position: position})
     .addTo(map);
 

-  L.control.locate({
+  var locate = L.control.locate({

     position: position,
     position: position,

+    icon: 'icon geolocate',
+    iconLoading: 'icon geolocate',

     strings: {
       title: I18n.t('javascripts.map.locate.title'),
       popup: I18n.t('javascripts.map.locate.popup')
     }
   }).addTo(map);
 
     strings: {
       title: I18n.t('javascripts.map.locate.title'),
       popup: I18n.t('javascripts.map.locate.popup')
     }
   }).addTo(map);
 

+  var locateContainer = locate.getContainer();
+
+  $(locateContainer)
+    .removeClass('leaflet-control-locate leaflet-bar')
+    .addClass('control-locate')
+    .children("a")
+    .attr('href', '#')
+    .removeClass('leaflet-bar-part leaflet-bar-part-single')
+    .addClass('control-button');
+

   var sidebar = L.OSM.sidebar('#map-ui')
     .addTo(map);
 
   var sidebar = L.OSM.sidebar('#map-ui')
     .addTo(map);
 


@@ -109,33 +143,68 @@ $(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);
 

-  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-    initializeNotes(map);
+  OSM.initializeContextMenu(map);
+
+  if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') {
+    OSM.initializeNotes(map);

     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);
     }
 
     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);
     }
 

-    initializeBrowse(map);
+    OSM.initializeBrowse(map);

     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }
     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }

+
+    if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+      map.addLayer(map.gpsLayer);
+    }

   }
 
   }
 

-  $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
+  var placement = $('html').attr('dir') === 'rtl' ? 'right' : 'left';
+  $('.leaflet-control .control-button').tooltip({placement: placement, 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-wrap').on('click', function() {
+    $('.welcome').hide();
+    $.cookie('_osm_welcome', 'hide', { expires: expiry, path: '/' });
+  });
+
+  var bannerExpiry = new Date();
+  bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
+
+  $('#banner .close-wrap').on('click', function(e) {
+    var cookieId = e.target.id;
+    $('#banner').hide();
+    e.preventDefault();
+    if (cookieId) {
+      $.cookie(cookieId, 'hide', { expires: bannerExpiry, path: '/' });
+    }

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


@@ -156,10 +225,8 @@ $(document).ready(function () {
     map.setView([params.lat, params.lon], params.zoom);
   }
 
     map.setView([params.lat, params.lon], params.zoom);
   }
 

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

   if (params.marker) {
   if (params.marker) {

-    marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+    L.marker([params.mlat, params.mlon]).addTo(map);

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


@@ -169,18 +236,46 @@ $(document).ready(function () {
       center = L.latLng(data.lat, data.lon);
 
     map.setView(center, data.zoom);
       center = L.latLng(data.lat, data.lon);
 
     map.setView(center, data.zoom);

-    marker.setLatLng(center).addTo(map);
+    L.marker(center, {icon: OSM.getUserIcon()}).addTo(map);

   });
 
   });
 

-  $("a[data-editor=remote]").click(function(e) {
-      remoteEditHandler(map.getBounds());
-      e.preventDefault();
-  });
+  function remoteEditHandler(bbox, object) {
+    var loaded = false,
+        url = "http://127.0.0.1:8111/load_and_zoom?",
+        query = {
+          left: bbox.getWest() - 0.0001,
+          top: bbox.getNorth() + 0.0001,
+          right: bbox.getEast() + 0.0001,
+          bottom: bbox.getSouth() - 0.0001
+        };
+
+    if (object) query.select = object.type + object.id;
+
+    var iframe = $('<iframe>')
+        .hide()
+        .appendTo('body')
+        .attr("src", url + querystring.stringify(query))
+        .on('load', function() {
+          $(this).remove();
+          loaded = true;
+        });
+
+    setTimeout(function () {
+      if (!loaded) {
+        alert(I18n.t('site.index.remote_failed'));
+        iframe.remove();
+      }
+    }, 1000);

 
 

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

   }
 
   }
 

+  $("a[data-editor=remote]").click(function(e) {
+    var params = OSM.mapParams(this.search);
+    remoteEditHandler(map.getBounds(), params.object);
+    e.preventDefault();
+  });
+

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


@@ -198,41 +293,49 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
   OSM.Index = function(map) {
     var page = {};
 

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

     };
 
     };
 

-    page.unload = function() {
-      map.panBy([300, 0], {animate: false});
-      $("#content").removeClass("overlay-sidebar");
-      map.invalidateSize({pan: false});
+    page.load = function() {
+      var params = querystring.parse(location.search.substring(1));
+      if (params.query) {
+        $("#sidebar .search_form input[name=query]").value(params.query);
+      }
+      if (!("autofocus" in document.createElement("input"))) {
+        $("#sidebar .search_form input[name=query]").focus();
+      }
+      return map.getState();

     };
 
     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) {
+      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();
     };


@@ -240,43 +343,46 @@ $(document).ready(function () {
     return page;
   };
 
     return page;
   };
 

-  var history = OSM.History(map),
-    note = OSM.Note(map);
+  var history = OSM.History(map);

 
 

-  OSM.route = OSM.Router(map, {
+  OSM.router = OSM.Router(map, {

     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),

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

     "/export":                     OSM.Export(map),
     "/export":                     OSM.Export(map),

+    "/note/new":                   OSM.NewNote(map),
+    "/history/friends":            history,
+    "/history/nearby":             history,

     "/history":                    history,
     "/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)
+    "/user/:display_name/history": history,
+    "/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) {
   $(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();
-  });
+    if (e.isDefaultPrevented() || e.isPropagationStopped())
+      return;

 
 

-  $(".search_form").on("submit", function(e) {
-    e.preventDefault();
-    $("header").addClass("closed");
-    var query = $(this).find("input[name=query]").val();
-    if (query) {
-      OSM.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
-    } else {
-      OSM.route("/" + OSM.formatHash(map));
-    }
-  });
+    // Open links in a new tab as normal.
+    if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
+      return;

 
 

-  $(".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)));
+    // 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();

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