Merge remote-tracking branch 'upstream/pull/2191'

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 54ccb88ed08a277b8079cd74b7b3ed6476171c72..e8e566f53a2ca698ae09000cb73d54118282fd8d 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,7 +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.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


@@ -13,13 +16,18 @@
 //= 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 index/query
 //= require router

+//= require bowser

 
 

-(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() {


@@ -29,9 +37,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')


@@ -49,7 +57,7 @@
 
         if (xhr.getResponseHeader('X-Page-Title')) {
           var title = xhr.getResponseHeader('X-Page-Title');
 
         if (xhr.getResponseHeader('X-Page-Title')) {
           var title = xhr.getResponseHeader('X-Page-Title');

-          document.title = decodeURIComponent(escape(title));
+          document.title = decodeURIComponent(title);

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


@@ -67,14 +75,13 @@
       }
     });
   };
       }
     });
   };

-})();

 
 

-$(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('');


@@ -92,14 +99,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);
 


@@ -133,19 +152,26 @@ $(document).ready(function () {
   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);
 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);


@@ -157,17 +183,29 @@ $(document).ready(function () {
       map.getLayersCode(),
       map._object);
 
       map.getLayersCode(),
       map._object);
 

-    $.removeCookie("_osm_location");
-    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+    $.removeCookie('_osm_location');
+    $.cookie('_osm_location', OSM.locationCookie(map), { expires: expiry, path: '/' });

   });
 
   });
 

-  if ($.cookie('_osm_welcome') == 'hide') {
-    $('.welcome').hide();
+  if ($.cookie('_osm_welcome') !== 'hide') {
+    $('.welcome').addClass('visible');

   }
 
   }
 

-  $('.welcome .close').on('click', function() {
-    $('.welcome').hide();
-    $.cookie("_osm_welcome", 'hide', { expires: expiry });
+  $('.welcome .close-wrap').on('click', function() {
+    $('.welcome').removeClass('visible');
+    $.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) {


@@ -188,10 +226,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) {


@@ -201,9 +237,47 @@ $(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);

   });
 
   });
 

+  function remoteEditHandler(bbox, object) {
+    var loaded = false,
+        url,
+        query = {
+          left: bbox.getWest() - 0.0001,
+          top: bbox.getNorth() + 0.0001,
+          right: bbox.getEast() + 0.0001,
+          bottom: bbox.getSouth() - 0.0001
+        };
+
+    if (location.protocol === 'http' ||
+        bowser.check({chrome: "53", firefox: "55"})) {
+      url = "http://127.0.0.1:8111/load_and_zoom?";
+    } else {
+      url = "https://127.0.0.1:8112/load_and_zoom?";
+    }
+
+    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);
+
+    return false;
+  }
+

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


@@ -227,32 +301,22 @@ $(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() {
       document.title = I18n.t('layouts.project_name.title');
     };
 
     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();
     };
 
       if (!("autofocus" in document.createElement("input"))) {
         $("#sidebar .search_form input[name=query]").focus();
       }
       return map.getState();
     };
 

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

     return page;
   };
 
     return page;
   };
 


@@ -270,7 +334,7 @@ $(document).ready(function () {
     };
 
     function addObject(type, id, center) {
     };
 
     function addObject(type, id, center) {

-      var bounds = map.addObject({type: type, id: parseInt(id)}, function(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 () {
         if (!window.location.hash && bounds.isValid() &&
             (center || !map.getBounds().contains(bounds))) {
           OSM.router.withoutMoveListener(function () {


@@ -292,6 +356,7 @@ $(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,
     "/export":                     OSM.Export(map),
     "/note/new":                   OSM.NewNote(map),
     "/history/friends":            history,


@@ -302,11 +367,11 @@ $(document).ready(function () {
     "/node/:id(/history)":         OSM.Browse(map, 'node'),
     "/way/:id(/history)":          OSM.Browse(map, 'way'),
     "/relation/:id(/history)":     OSM.Browse(map, 'relation'),
     "/node/:id(/history)":         OSM.Browse(map, 'node'),
     "/way/:id(/history)":          OSM.Browse(map, 'way'),
     "/relation/:id(/history)":     OSM.Browse(map, 'relation'),

-    "/changeset/:id":              OSM.Browse(map, 'changeset'),
+    "/changeset/:id":              OSM.Changeset(map),

     "/query":                      OSM.Query(map)
   });
 
     "/query":                      OSM.Query(map)
   });
 

-  if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {
+  if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {

     remoteEditHandler(map.getBounds(), params.object);
     OSM.router.setCurrentPath("/");
   }
     remoteEditHandler(map.getBounds(), params.object);
     OSM.router.setCurrentPath("/");
   }


@@ -328,23 +393,4 @@ $(document).ready(function () {
     if (OSM.router.route(this.pathname + this.search + this.hash))
       e.preventDefault();
   });
     if (OSM.router.route(this.pathname + this.search + this.hash))
       e.preventDefault();
   });

-
-  $(".search_form").on("submit", function(e) {
-    e.preventDefault();
-    $("header").addClass("closed");
-    var query = $(this).find("input[name=query]").val();
-    if (query) {
-      OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
-    } else {
-      OSM.router.route("/" + OSM.formatHash(map));
-    }
-  });
-
-  $(".describe_location").on("click", function(e) {
-    e.preventDefault();
-    var precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/search?query=" + encodeURIComponent(
-      map.getCenter().lat.toFixed(precision) + "," +
-      map.getCenter().lng.toFixed(precision)));
-  });

 });
 });