Tighten up cookie security

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2a704f72464f8d697fe02f8b91bd592855b3ac46..a2169643f37b8e99b3264fb895fab59f2903951f 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,92 +1,135 @@
 //= require_self
 //= require leaflet.sidebar
 //= require_self
 //= require leaflet.sidebar

-//= require leaflet.locate
+//= require leaflet.locatecontrol/src/L.Control.Locate

 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share
 //= require leaflet.layers
 //= 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/notes
 //= require index/search
 //= require index/browse
 //= require index/export
 //= require index/notes

+//= require index/history
+//= require index/note
+//= require index/new_note
+//= require index/directions
+//= require index/changeset
+//= require index/query
+//= require router
+//= require qs/dist/qs

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

-  var params = OSM.mapParams();
+  var loaderTimeout;

 
 

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

     zoomControl: false,
     zoomControl: false,

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

   });
 
   });
 

-  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;
+  OSM.loadSidebarContent = function (path, callback) {
+    var content_path = path;
+
+    map.setSidebarOverlaid(false);
+
+    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 (content_path.indexOf("?") >= 0) {
+      content_path += "&xhr=1";
+    } else {
+      content_path += "?xhr=1";

     }
     }

-  }

 
 

-  map.noteLayer = new L.LayerGroup();
-  map.noteLayer.options = {code: 'N'};
+    $("#sidebar_content")
+      .empty();
+
+    $.ajax({
+      url: content_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(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();
+        }
+      }
+    });
+  };
+
+  var params = OSM.mapParams();
+
+  map.attributionControl.setPrefix("");

 
 

-  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";

 
 

-  L.OSM.zoom({position: position})
+  L.OSM.zoom({ position: position })

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

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

     position: position,
     position: position,

+    icon: "icon geolocate",
+    iconLoading: "icon geolocate",

     strings: {
     strings: {

-      title: I18n.t('javascripts.map.locate.title'),
-      popup: I18n.t('javascripts.map.locate.popup')
+      title: I18n.t("javascripts.map.locate.title"),
+      popup: function (options) {
+        return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
+      }

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

-  var sidebar = L.OSM.sidebar('#map-ui')
+  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);
 
   L.OSM.layers({
     position: position,
     .addTo(map);
 
   L.OSM.layers({
     position: position,

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

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


@@ -96,9 +139,9 @@ $(document).ready(function () {
   }).addTo(map);
 
   L.OSM.share({
   }).addTo(map);
 
   L.OSM.share({

-    position: position,
-    sidebar: sidebar,
-    short: true
+    "position": position,
+    "sidebar": sidebar,
+    "short": true

   }).addTo(map);
 
   L.OSM.note({
   }).addTo(map);
 
   L.OSM.note({


@@ -106,88 +149,256 @@ $(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);
 

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

 
 

-  map.on('moveend layeradd layerremove', updateLocation);
+  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);
+    }

 
 

-  var marker = L.marker([0, 0], {icon: getUserIcon()});
+    OSM.initializeBrowse(map);
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }

 
 

-  if (!params.object_zoom) {
-    if (params.bounds) {
-      map.fitBounds(params.bounds);
-    } else {
-      map.setView([params.lat, params.lon], params.zoom);
+    if (params.layers.indexOf(map.gpsLayer.options.code) >= 0) {
+      map.addLayer(map.gpsLayer);

     }
   }
 
     }
   }
 

-  if (params.box) {
-    L.rectangle(params.box, {
-      weight: 2,
-      color: '#e90',
-      fillOpacity: 0
-    }).addTo(map);
+  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 () {
+    updateLinks(
+      map.getCenter().wrap(),
+      map.getZoom(),
+      map.getLayersCode(),
+      map._object);
+
+    $.removeCookie("_osm_location");
+    $.cookie("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/" });
+  });
+
+  if ($.cookie("_osm_welcome") !== "hide") {
+    $(".welcome").addClass("visible");
+  }
+
+  $(".welcome .close").on("click", function () {
+    $(".welcome").removeClass("visible");
+    $.cookie("_osm_welcome", "hide", { secure: true, 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", { secure: true, expires: bannerExpiry, path: "/" });
+    }
+  });
+
+  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.marker) {
-    marker.setLatLng([params.mlat, params.mlon]).addTo(map);
+  if (params.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);

   }
 
   }
 

-  if (params.object) {
-    map.addObject(params.object, { zoom: params.object_zoom });
+  if (params.marker) {
+    L.marker([params.mlat, params.mlon]).addTo(map);

   }
 
   }
 

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

     e.preventDefault();
 
     var data = $(this).data(),
     e.preventDefault();
 
     var data = $(this).data(),

-      center = L.latLng(data.lat, data.lon);
+        center = L.latLng(data.lat, data.lon);

 
     map.setView(center, data.zoom);
 
     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();
-  });
-
-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler(map.getBounds());
+  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
+        };
+
+    url = "http://127.0.0.1:8111/load_and_zoom?";
+
+    if (object) query.select = object.type + object.id;
+
+    var iframe = $("<iframe>")
+      .hide()
+      .appendTo("body")
+      .attr("src", url + Qs.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);
+    e.preventDefault();
+  });
+

   if (OSM.params().edit_help) {
   if (OSM.params().edit_help) {

-    $('#editanchor')
-      .removeAttr('title')
+    $("#editanchor")
+      .removeAttr("title")

       .tooltip({
       .tooltip({

-        placement: 'bottom',
-        title: I18n.t('javascripts.edit_help')
+        placement: "bottom",
+        title: I18n.t("javascripts.edit_help")

       })
       })

-      .tooltip('show');
+      .tooltip("show");

 
 

-    $('body').one('click', function() {
-      $('#editanchor').tooltip('hide');
+    $("body").one("click", function () {
+      $("#editanchor").tooltip("hide");

     });
   }
 
     });
   }
 

-  initializeSearch(map);
-  initializeExport(map);
-  initializeBrowse(map, params);
-  initializeNotes(map, params);
-});
+  OSM.Index = function (map) {
+    var page = {};
+
+    page.pushstate = page.popstate = function () {
+      map.setSidebarOverlaid(true);
+      document.title = I18n.t("layouts.project_name.title");
+    };
+
+    page.load = function () {
+      var params = Qs.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;
+  };
+
+  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) {
+      map.addObject({ type: type, id: parseInt(id, 10) }, function (bounds) {
+        if (!window.location.hash && bounds.isValid() &&
+            (center || !map.getBounds().contains(bounds))) {
+          OSM.router.withoutMoveListener(function () {
+            map.fitBounds(bounds);
+          });
+        }
+      });
+
+      $(".colour-preview-box").each(function () {
+        $(this).css("background-color", $(this).data("colour"));
+      });
+    }

 
 

-function updateLocation() {
-  updatelinks(this.getCenter().wrap(),
-      this.getZoom(),
-      this.getLayersCode(),
-      this.getBounds().wrap());
+    page.unload = function () {
+      map.removeObject();
+    };
+
+    return page;
+  };
+
+  var history = OSM.History(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,
+    "/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)
+  });

 
 

-  var expiry = new Date();
-  expiry.setYear(expiry.getFullYear() + 10);
-  $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+  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) {
+    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;
+    }

 
 

-  // Trigger hash update on layer changes.
-  this.hash.onMapMove();
-}
+    if (OSM.router.route(this.pathname + this.search + this.hash)) {
+      e.preventDefault();
+    }
+  });
+});