Restore the duplicate search form in the header

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 6ea27623084a384d8c5c0122efe5937e234b06ea..55e612f17668f6e3da055b2fdcf003b3a03c9285 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,216 +5,337 @@
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share

+//= require index/search

 //= 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
+
+(function() {
+  var loaderTimeout;
+
+  OSM.loadSidebarContent = function(path, callback) {
+    clearTimeout(loaderTimeout);
+
+    loaderTimeout = setTimeout(function() {
+      $('#sidebar_loader').show();
+    }, 200);
+
+    // 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'
+    } else {
+      path += '?xhr=1'
+    }
+
+    $('#sidebar_content')
+      .empty();
+
+    $.ajax({
+      url: path,
+      dataType: "html",
+      complete: function(xhr) {
+        clearTimeout(loaderTimeout);
+        $('#flash').empty();
+        $('#sidebar_loader').hide();
+
+        var content = $(xhr.responseText);
+
+        if (xhr.getResponseHeader('X-Page-Title')) {
+          var title = xhr.getResponseHeader('X-Page-Title');
+          document.title = decodeURIComponent(escape(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();
+        }
+      }
+    });
+  };
+})();

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

-  var layers = [
-    new L.OSM.Mapnik({
-      attribution: '',
-      code: "M",
-      keyid: "mapnik",
-      name: I18n.t("javascripts.map.base.standard")
-    }),
-    new L.OSM.CycleMap({
-      attribution: "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: "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: "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")
-    })
-  ];
-
-  layers[0].addTo(map);
-
-  map.noteLayer = new L.LayerGroup({code: 'N'});
-  map.dataLayer = new L.OSM.DataLayer(null);
-
-  $("#map").on("resized", function () {
-    map.invalidateSize();
+  map.updateLayers(params.layers);
+
+  map.on("baselayerchange", function (e) {
+    if (map.getZoom() > e.layer.options.maxZoom) {
+      map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+    }

   });
 
   });
 

-  L.OSM.zoom({position: 'topright'})
-    .addTo(map);
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';

 
 

-  L.control.locate({position: 'topright'})
+  L.OSM.zoom({position: position})

     .addTo(map);
 
     .addTo(map);
 

-  var sidebar = L.OSM.sidebar('#map-ui');
+  L.control.locate({
+    position: position,
+    strings: {
+      title: I18n.t('javascripts.map.locate.title'),
+      popup: I18n.t('javascripts.map.locate.popup')
+    }
+  }).addTo(map);
+
+  var sidebar = L.OSM.sidebar('#map-ui')
+    .addTo(map);

 
   L.OSM.layers({
 
   L.OSM.layers({

-    position: 'topright',
-    layers: layers,
+    position: position,
+    layers: map.baseLayers,

     sidebar: sidebar
   }).addTo(map);
 
   L.OSM.key({
     sidebar: sidebar
   }).addTo(map);
 
   L.OSM.key({

-    position: 'topright',
+    position: position,

     sidebar: sidebar
   }).addTo(map);
 
   L.OSM.share({
     sidebar: sidebar
   }).addTo(map);
 
   L.OSM.share({

-    getShortUrl: getShortUrl,
-    getUrl: getUrl,
+    position: position,

     sidebar: sidebar,
     short: true
   }).addTo(map);
 
   L.OSM.note({
     sidebar: sidebar,
     short: true
   }).addTo(map);
 
   L.OSM.note({

-    position: 'topright',
+    position: position,

     sidebar: sidebar
   }).addTo(map);
 
   L.control.scale()
     .addTo(map);
 
     sidebar: sidebar
   }).addTo(map);
 
   L.control.scale()
     .addTo(map);
 

-  map.on('moveend layeradd layerremove', updateLocation);
+  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    initializeNotes(map);
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);
+    }

 
 

-  map.markerLayer = L.layerGroup().addTo(map);
+    initializeBrowse(map);
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }
+  }

 
 

-  if (!params.object_zoom) {
-    if (params.bbox) {
-      var bbox = L.latLngBounds([params.minlat, params.minlon],
-                                [params.maxlat, params.maxlon]);
+  $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});

 
 

-      map.fitBounds(bbox);
+  var expiry = new Date();
+  expiry.setYear(expiry.getFullYear() + 10);

 
 

-      if (params.box) {
-        L.rectangle(bbox, {
-          weight: 2,
-          color: '#e90',
-          fillOpacity: 0
-        }).addTo(map);
-      }
-    } else {
-      map.setView([params.lat, params.lon], params.zoom);
-    }
+  map.on('moveend layeradd layerremove', function() {
+    updateLinks(
+      map.getCenter().wrap(),
+      map.getZoom(),
+      map.getLayersCode(),
+      map._object);
+
+    $.removeCookie("_osm_location");
+    $.cookie("_osm_location", cookieContent(map), { expires: expiry, path: "/" });
+  });
+
+  if ($.cookie('_osm_welcome') == 'hide') {
+    $('.welcome').hide();

   }
 
   }
 

-  if (params.layers) {
-    var foundLayer = false;
-    for (var i = 0; i < layers.length; i++) {
-      if (params.layers.indexOf(layers[i].options.code) >= 0) {
-        map.addLayer(layers[i]);
-        foundLayer = true;
-      } else {
-        map.removeLayer(layers[i]);
+  $('.welcome .close').on('click', function() {
+    $('.welcome').hide();
+    $.cookie("_osm_welcome", 'hide', { expires: expiry });
+  });
+
+  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 (!foundLayer) {
-      map.addLayer(layers[0]);
-    }
+    });

   }
 
   }
 

-  if (params.marker) {
-    L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map.markerLayer);
+  if (params.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);

   }
 
   }
 

-  if (params.object) {
-    addObjectToMap(params.object, map, { zoom: params.object_zoom });
+  var marker = L.marker([0, 0], {icon: getUserIcon()});
+
+  if (params.marker) {
+    marker.setLatLng([params.mlat, params.mlon]).addTo(map);

   }
 
   }
 

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

 
 

-  $("body").on("click", "a.set_position", setPositionLink(map));
+    var data = $(this).data(),
+      center = L.latLng(data.lat, data.lon);
+
+    map.setView(center, data.zoom);
+    marker.setLatLng(center).addTo(map);
+  });

 
   $("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')
+      .tooltip({
+        placement: 'bottom',
+        title: I18n.t('javascripts.edit_help')
+      })
+      .tooltip('show');
+
+    $('body').one('click', function() {
+      $('#editanchor').tooltip('hide');
+    });

   }
 
   }
 

-  $(window).resize(handleResize);
+  OSM.Index = function(map) {
+    var page = {};

 
 

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

 
 

+    page.load = function() {
+      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;
+  };

 
 

-  if ($("#query").val()) {
-    $("#search_form").submit();
-  }
+  OSM.Browse = function(map, type) {
+    var page = {};
+
+    page.pushstate = page.popstate = function(path, id) {
+      OSM.loadSidebarContent(path, function() {
+        addObject(type, 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()) {
+          OSM.router.moveListenerOff();
+          map.once('moveend', OSM.router.moveListenerOn);
+          if (center || !map.getBounds().contains(bounds)) map.fitBounds(bounds);
+        }
+      });
+    }
+
+    page.unload = function() {
+      map.removeObject();
+    };
+
+    return page;
+  };

 
 

-  // Focus the search field for browsers that don't support
-  // the HTML5 'autofocus' attribute
-  if (!("autofocus" in document.createElement("input"))) {
-    $("#query").focus();
+  var history = OSM.History(map);
+
+  OSM.router = OSM.Router(map, {
+    "/":                           OSM.Index(map),
+    "/search":                     OSM.Search(map),
+    "/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),
+    "/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')
+  });
+
+  if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {
+    remoteEditHandler(map.getBounds(), params.object);
+    OSM.router.setCurrentPath("/");

   }
 
   }
 

-  initializeExport(map);
-  initializeBrowse(map);
-  initializeNotes(map);
-});
+  OSM.router.load();

 
 

-function updateLocation() {
-  updatelinks(this.getCenter().wrap(),
-      this.getZoom(),
-      this.getLayersCode(),
-      this.getBounds().wrap(), {});
+  $(document).on("click", "a", function(e) {
+    if (e.isDefaultPrevented() || e.isPropagationStopped())
+      return;

 
 

-  var expiry = new Date();
-  expiry.setYear(expiry.getFullYear() + 10);
-  $.cookie("_osm_location", cookieContent(this), { expires: expiry });
-}
-
-function setPositionLink(map) {
-  return function(e) {
-      var data = $(this).data(),
-          center = L.latLng(data.lat, data.lon);
-
-      if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-        map.fitBounds([[data.minLat, data.minLon],
-                       [data.maxLat, data.maxLon]]);
-      } else {
-        map.setView(center, data.zoom);
-      }
+    // Open links in a new tab as normal.
+    if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
+      return;

 
 

-      if (data.type && data.id) {
-        addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
-      }
+    // Ignore cross-protocol and cross-origin links.
+    if (location.protocol !== this.protocol || location.host !== this.host)
+      return;

 
 

-      map.markerLayer.clearLayers();
-      L.marker(center, {icon: getUserIcon()}).addTo(map.markerLayer);
+    if (OSM.router.route(this.pathname + this.search + this.hash))
+      e.preventDefault();
+  });

 
 

-      return e.preventDefault();
-  };
-}
-
-function submitSearch(map) {
-  return function(e) {
-    var bounds = map.getBounds();
-
-    $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
-    $("#sidebar_content").load($(this).attr("action"), {
-      query: $("#query").val(),
-      minlon: bounds.getWestLng(),
-      minlat: bounds.getSouthLat(),
-      maxlon: bounds.getEastLng(),
-      maxlat: bounds.getNorthLat()
-    }, openSidebar);
-
-    return 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 = zoomPrecision(map.getZoom());
+    OSM.router.route("/search?query=" + encodeURIComponent(
+      map.getCenter().lat.toFixed(precision) + "," +
+      map.getCenter().lng.toFixed(precision)));
+  });
+});