X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/10c9ca81c788c5aa3cd7a66d9cdbaedc14def1bc..fd8f35309d6149f3c4924dcf95beca8ec3bbf520:/app/assets/javascripts/index.js?ds=sidebyside
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 40fe11761..d612b2778 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,241 +1,294 @@
//= require_self
+//= require leaflet.sidebar
+//= require leaflet.locate
//= require leaflet.layers
-//= require leaflet.share
+//= require leaflet.key
//= require leaflet.note
-//= require leaflet.locate
-//= require leaflet.customzoom
+//= require leaflet.share
+//= require index/search
//= require index/browse
//= require index/export
-//= require index/key
//= 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'
+ }
-var map, layers; // TODO: remove globals
+ $('#sidebar_content')
+ .empty();
+
+ $.ajax({
+ url: path,
+ dataType: "html",
+ complete: function(xhr) {
+ clearTimeout(loaderTimeout);
+ $('#sidebar_loader').hide();
+ $('#sidebar_content').html(xhr.responseText);
+ if (xhr.getResponseHeader('X-Page-Title')) {
+ document.title = xhr.getResponseHeader('X-Page-Title');
+ }
+ if (callback) {
+ callback();
+ }
+ }
+ });
+ };
+})();
$(document).ready(function () {
- var marker;
var params = OSM.mapParams();
- map = L.map("map", {
+ var map = new L.OSM.Map("map", {
zoomControl: false,
layerControl: false
});
map.attributionControl.setPrefix('');
- layers = [{
- layer: new L.OSM.Mapnik({
- attribution: '',
- code: "M"
- }),
- keyid: "mapnik",
- name: I18n.t("javascripts.map.base.standard")
- }, {
- layer: new L.OSM.CycleMap({
- attribution: "Tiles courtesy of Andy Allan",
- code: "C"
- }),
- keyid: "cyclemap",
- name: I18n.t("javascripts.map.base.cycle_map")
- }, {
- layer: new L.OSM.TransportMap({
- attribution: "Tiles courtesy of Andy Allan",
- code: "T"
- }),
- keyid: "transportmap",
- name: I18n.t("javascripts.map.base.transport_map")
- }, {
- layer: new L.OSM.MapQuestOpen({
- attribution: "Tiles courtesy of MapQuest ",
- code: "Q"
- }),
- keyid: "mapquest",
- name: I18n.t("javascripts.map.base.mapquest")
- }];
-
- layers[0].layer.addTo(map);
-
- $("#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.control.customZoom({position: 'topright'})
+ var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+ L.OSM.zoom({position: position})
.addTo(map);
- var uiPane = $('#map-ui')[0];
+ 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: 'topright',
- layers: layers,
- uiPane: uiPane
+ position: position,
+ layers: map.baseLayers,
+ sidebar: sidebar
}).addTo(map);
- L.control.share({
- getUrl: getShortUrl,
- uiPane: uiPane
+ L.OSM.key({
+ position: position,
+ sidebar: sidebar
}).addTo(map);
- L.control.note({
- position: 'topright'
+ L.OSM.share({
+ position: position,
+ sidebar: sidebar,
+ short: true
}).addTo(map);
- L.control.locate({
- position: 'topright'
+ L.OSM.note({
+ position: position,
+ sidebar: sidebar
}).addTo(map);
- L.control.scale().addTo(map);
-
- map.on("moveend layeradd layerremove", updateLocation);
-
- if (!params.object_zoom) {
- if (params.bbox) {
- var bbox = L.latLngBounds([params.minlat, params.minlon],
- [params.maxlat, params.maxlon]);
-
- map.fitBounds(bbox);
+ L.control.scale()
+ .addTo(map);
- if (params.box) {
- L.rectangle(bbox, {
- weight: 2,
- color: '#e90',
- fillOpacity: 0
- }).addTo(map);
- }
- } else {
- map.setView([params.lat, params.lon], params.zoom);
+ if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+ initializeNotes(map);
+ if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+ map.addLayer(map.noteLayer);
}
- }
- if (params.layers) {
- var foundLayer = false;
- for (var i = 0; i < layers.length; i++) {
- if (params.layers.indexOf(layers[i].layer.options.code) >= 0) {
- map.addLayer(layers[i].layer);
- foundLayer = true;
- } else {
- map.removeLayer(layers[i].layer);
- }
- }
- if (!foundLayer) {
- map.addLayer(layers[0].layer);
+ initializeBrowse(map);
+ if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+ map.addLayer(map.dataLayer);
}
}
- if (params.marker) {
- marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
- }
-
- if (params.object) {
- addObjectToMap(params.object, map, { zoom: params.object_zoom });
- }
-
- handleResize();
-
- $("body").on("click", "a.set_position", function (e) {
- e.preventDefault();
-
- var data = $(this).data();
- var centre = 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(centre, data.zoom);
- }
-
- if (data.type && data.id) {
- addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
- }
-
- if (marker) {
- map.removeLayer(marker);
- }
-
- marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
- });
-
- function updateLocation() {
- var center = map.getCenter().wrap();
- var zoom = map.getZoom();
- var layers = getMapLayers();
- var extents = map.getBounds().wrap();
+ $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
- updatelinks(center, zoom, layers, extents, params.object);
+ map.on('moveend layeradd layerremove', function() {
+ updatelinks(
+ map.getCenter().wrap(),
+ map.getZoom(),
+ map.getLayersCode(),
+ map._object);
var expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);
- $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry});
- }
-
- function remoteEditHandler() {
- var extent = map.getBounds();
- var loaded = false;
+ $.cookie("_osm_location", cookieContent(map), { expires: expiry });
+ });
- $("#linkloader").load(function () { loaded = true; });
- $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?" +
- querystring.stringify({
- left: extent.getWest(),
- bottom: extent.getSouth(),
- right: extent.getEast(),
- top: extent.getNorth()
- }));
+ 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(handleResize);
+ $("#homeanchor").on("click", function(e) {
+ e.preventDefault();
- $("#search_form").submit(function () {
- var bounds = map.getBounds();
+ var data = $(this).data(),
+ center = L.latLng(data.lat, data.lon);
- $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
- $("#sidebar_content").load($(this).attr("action"), {
- query: $("#query").val(),
- minlon: bounds.getWest(),
- minlat: bounds.getSouth(),
- maxlon: bounds.getEast(),
- maxlat: bounds.getNorth()
- }, openSidebar);
+ map.setView(center, data.zoom);
+ marker.setLatLng(center).addTo(map);
+ });
- return false;
+ $("a[data-editor=remote]").click(function(e) {
+ remoteEditHandler(map.getBounds());
+ e.preventDefault();
});
- if ($("#query").val()) {
- $("#search_form").submit();
+ if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
+ remoteEditHandler(map.getBounds());
}
- // Focus the search field for browsers that don't support
- // the HTML5 'autofocus' attribute
- if (!("autofocus" in document.createElement("input"))) {
- $("#query").focus();
+ 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');
+ });
}
-});
-function getMapBaseLayer() {
- for (var i = 0; i < layers.length; i++) {
- if (map.hasLayer(layers[i].layer)) {
- return layers[i];
- }
- }
-}
-
-function getMapLayers() {
- var layerConfig = "";
- for (var i in map._layers) { // TODO: map.eachLayer
- var layer = map._layers[i];
- if (layer.options && layer.options.code) {
- layerConfig += layer.options.code;
+ 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.unload = function() {
+ map.panBy([300, 0], {animate: false});
+ $("#content").removeClass("overlay-sidebar");
+ map.invalidateSize({pan: false});
+ };
+
+ return page;
+ };
+
+ OSM.Browse = function(map) {
+ var page = {};
+
+ page.pushstate = page.popstate = function(path, type, id) {
+ OSM.loadSidebarContent(path, function() {
+ page.load(path, type, id);
+ });
+ };
+
+ page.load = function(path, type, id) {
+ if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
+
+ map.addObject({type: type, id: parseInt(id)},
+ {
+ zoom: window.location.hash == "",
+ style: {
+ color: "#FF6200",
+ weight: 4,
+ opacity: 1,
+ fillOpacity: 0.5
+ }
+ }
+ );
+ };
+
+ page.unload = function() {
+ map.removeObject();
+ };
+
+ return page;
+ };
+
+ var history = OSM.History(map),
+ note = OSM.Note(map);
+
+ OSM.route = OSM.Router(map, {
+ "/": OSM.Index(map),
+ "/search": OSM.Search(map),
+ "/export": OSM.Export(map),
+ "/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)
+ });
+
+ $(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();
+ });
+
+ $(".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));
}
- }
- return layerConfig;
-}
+ });
+
+ $(".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)));
+ });
+});