Make directions endpoints own the value and not care which input box they get it...

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 7d47057b89c2ea26cb080ae8f6903782c4dbe67b..afb6b3d6546b3de788bf0a834c0c6db72ac3b494 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,129 +1,345 @@
+//= require_self
+//= require leaflet.sidebar
+//= require leaflet.locate
+//= require leaflet.layers
+//= 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/notes
+//= require index/history
+//= require index/note
+//= require index/new_note
+//= require index/directions
+//= require index/changeset
+//= require index/query
+//= require router
+

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

-  var marker;
-  var params = OSM.mapParams();
-  var map = createMap("map");
+  var loaderTimeout;

 
 

-  if (!params.object_zoom) {
-    if (params.bbox) {
-      var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
+  OSM.loadSidebarContent = function(path, callback) {
+    map.setSidebarOverlaid(false);

 
 

-      map.zoomToExtent(proj(bbox));
+    clearTimeout(loaderTimeout);

 
 

-      if (params.box) {
-        $(window).load(function() { addBoxToMap(bbox) });
-      }
+    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 {
     } else {

-      setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+      path += '?xhr=1'

     }
     }

-  }

 
 

-  if (params.layers) {
-    setMapLayers(params.layers);
-  }
+    $('#sidebar_content')
+      .empty();

 
 

-  if (params.marker) {
-    marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
-  }
+    $.ajax({
+      url: path,
+      dataType: "html",
+      complete: function(xhr) {
+        clearTimeout(loaderTimeout);
+        $('#flash').empty();
+        $('#sidebar_loader').hide();

 
 

-  if (params.object) {
-    var url = "/api/" + OSM.API_VERSION + "/" + params.object_type + "/" + params.object_id;
+        var content = $(xhr.responseText);

 
 

-    if (params.object_type != "node") {
-      url += "/full";
-    }
+        if (xhr.getResponseHeader('X-Page-Title')) {
+          var title = xhr.getResponseHeader('X-Page-Title');
+          document.title = decodeURIComponent(escape(title));
+        }

 
 

-    $(window).load(function() { addObjectToMap(url, params.object_zoom) });
-  }
+        $('head')
+          .find('link[type="application/atom+xml"]')
+          .remove();

 
 

-  map.events.register("moveend", map, updateLocation);
-  map.events.register("changelayer", map, updateLocation);
+        $('head')
+          .append(content.filter('link[type="application/atom+xml"]'));

 
 

-  updateLocation();
-  handleResize();
+        $('#sidebar_content').html(content.not('link[type="application/atom+xml"]'));

 
 

-  $("#show_data").click(function (e) {
-    $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
-      startBrowse(sidebarHtml);
-    }});
-    e.preventDefault();
+        if (callback) {
+          callback();
+        }
+      }
+    });
+  };
+
+  var params = OSM.mapParams();
+
+  var map = new L.OSM.Map("map", {
+    zoomControl: false,
+    layerControl: false

   });
 
   });
 

-  $("body").on("click", "a.set_position", function () {
-    var data = $(this).data();
-    var centre = new OpenLayers.LonLat(data.lon, data.lat);
+  map.attributionControl.setPrefix('');

 
 

-    if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-      var bbox = new OpenLayers.Bounds(data.minLon, data.minLat, data.maxLon, data.maxLat);
+  map.updateLayers(params.layers);

 
 

-      map.zoomToExtent(proj(bbox));
-    } else {
-      setMapCenter(centre, data.zoom);
+  map.on("baselayerchange", function (e) {
+    if (map.getZoom() > e.layer.options.maxZoom) {
+      map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });

     }
     }

+  });

 
 

-    if (marker) {
-      removeMarkerFromMap(marker);
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+  L.OSM.zoom({position: position})
+    .addTo(map);
+
+  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({
+    position: position,
+    layers: map.baseLayers,
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.OSM.key({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.OSM.share({
+    position: position,
+    sidebar: sidebar,
+    short: true
+  }).addTo(map);
+
+  L.OSM.note({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.OSM.query({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+
+  L.control.scale()
+    .addTo(map);
+
+  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    initializeNotes(map);
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);

     }
 
     }
 

-    marker = addMarkerToMap(centre, getArrowIcon());
+    initializeBrowse(map);
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }
+  }

 
 

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

 
 

-  function updateLocation() {
-    var lonlat = unproj(map.getCenter());
-    var zoom = map.getZoom();
-    var layers = getMapLayers();
-    var extents = unproj(map.getExtent());
-    var expiry = new Date();
+  var expiry = new Date();
+  expiry.setYear(expiry.getFullYear() + 10);

 
 

-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id);
+  map.on('moveend layeradd layerremove', function() {
+    updateLinks(
+      map.getCenter().wrap(),
+      map.getZoom(),
+      map.getLayersCode(),
+      map._object);

 
 

-    expiry.setYear(expiry.getFullYear() + 10);
-    $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
+    $.removeCookie("_osm_location");
+    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+  });
+
+  if ($.cookie('_osm_welcome') == 'hide') {
+    $('.welcome').hide();

   }
 
   }
 

-  function remoteEditHandler(event) {
-    var extent = unproj(map.getExtent());
-    var loaded = false;
+  $('.welcome .close').on('click', function() {
+    $('.welcome').hide();
+    $.cookie("_osm_welcome", 'hide', { expires: expiry });
+  });

 
 

-    $("#linkloader").load(function () { loaded = true; });
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom);
+  if (OSM.PIWIK) {
+    map.on('layeradd', function (e) {
+      if (e.layer.options) {
+        var goal = OSM.PIWIK.goals[e.layer.options.keyid];

 
 

-    setTimeout(function () {
-      if (!loaded) alert(I18n.t('site.index.remote_failed'));
-    }, 1000);
+        if (goal) {
+          $('body').trigger('piwikgoal', goal);
+        }
+      }
+    });
+  }

 
 

-    return false;
+  if (params.bounds) {
+    map.fitBounds(params.bounds);
+  } else {
+    map.setView([params.lat, params.lon], params.zoom);

   }
 
   }
 

-  $("a[data-editor=remote]").click(remoteEditHandler);
+  var marker = L.marker([0, 0], {icon: getUserIcon()});

 
 

-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler();
+  if (params.marker) {
+    marker.setLatLng([params.mlat, params.mlon]).addTo(map);

   }
 
   }
 

-  $(window).resize(function() {
-    var centre = map.getCenter();
-    var zoom = map.getZoom();
+  $("#homeanchor").on("click", function(e) {
+    e.preventDefault();

 
 

-    handleResize();
+    var data = $(this).data(),
+      center = L.latLng(data.lat, data.lon);

 
 

-    map.setCenter(centre, zoom);
+    map.setView(center, data.zoom);
+    marker.setLatLng(center).addTo(map);

   });
 
   });
 

-  $("#exportanchor").click(function (e) {
-    $.ajax({ url: $(this).data('url'), success: function (sidebarHtml) {
-      startExport(sidebarHtml);
-    }});
+  $("a[data-editor=remote]").click(function(e) {
+    var params = OSM.mapParams(this.search);
+    remoteEditHandler(map.getBounds(), params.object);

     e.preventDefault();
   });
 
     e.preventDefault();
   });
 

-  if (window.location.pathname == "/export") {
-    $("#exportanchor").click();
+  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');
+    });

   }
 
   }
 

-  var query;
-  if (query = getArgs(window.location.toString()).query) {
-    doSearch(query);
+  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 = 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;
+  };
+
+  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() &&
+            (center || !map.getBounds().contains(bounds))) {
+          OSM.router.withoutMoveListener(function () {
+            map.fitBounds(bounds);
+          });
+        }
+      });
+    }
+
+    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)
+  });
+
+  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;
+
+    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("/");
+    }
+  });
+
+  $(".describe_location").on("click", function(e) {
+    e.preventDefault();
+    var center = map.getCenter().wrap(),
+      precision = OSM.zoomPrecision(map.getZoom());
+    OSM.router.route("/search?query=" + encodeURIComponent(
+      center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
+    ));
+  });

 });
 });