X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/feeb135760abdbfef0eea193318566d9d96f2523..a805e0b545a37b19a4162e71850bef9aba9d6628:/app/assets/javascripts/index.js
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index bae80cac5..2d9300247 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,64 +5,30 @@
//= require leaflet.key
//= require leaflet.note
//= require leaflet.share
+//= require index/search
//= require index/browse
//= require index/export
//= require index/notes
+//= require index/history
+//= require index/note
+//= require router
$(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('');
- map.hash = L.hash(map);
-
- 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 Andy Allan",
- code: "C",
- keyid: "cyclemap",
- name: I18n.t("javascripts.map.base.cycle_map")
- }),
- new L.OSM.TransportMap({
- attribution: "Tiles courtesy of Andy Allan",
- code: "T",
- keyid: "transportmap",
- name: I18n.t("javascripts.map.base.transport_map")
- }),
- new L.OSM.MapQuestOpen({
- attribution: "Tiles courtesy of MapQuest 
",
- 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;
- }
- }
-
- map.noteLayer = new L.LayerGroup();
- map.noteLayer.options = {code: 'N'};
+ map.updateLayers(params.layers);
- map.dataLayer = new L.OSM.DataLayer(null);
- map.dataLayer.options.code = 'D';
-
- $("#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';
@@ -70,15 +36,20 @@ $(document).ready(function () {
L.OSM.zoom({position: position})
.addTo(map);
- L.control.locate({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: layers,
+ layers: map.baseLayers,
sidebar: sidebar
}).addTo(map);
@@ -101,35 +72,65 @@ $(document).ready(function () {
L.control.scale()
.addTo(map);
- map.on('moveend layeradd layerremove', updateLocation);
-
- map.markerLayer = L.layerGroup().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);
+ }
- if (!params.object_zoom) {
- if (params.bounds) {
- map.fitBounds(params.bounds);
- } else {
- map.setView([params.lat, params.lon], params.zoom);
+ initializeBrowse(map);
+ if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+ map.addLayer(map.dataLayer);
}
}
- if (params.box) {
- L.rectangle(params.box, {
- weight: 2,
- color: '#e90',
- fillOpacity: 0
- }).addTo(map);
+ $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
+
+ 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", cookieContent(map), { 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 (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) {
- map.addObject(params.object, { zoom: params.object_zoom });
+ var marker = L.marker([0, 0], {icon: getUserIcon()});
+
+ if (params.marker) {
+ marker.setLatLng([params.mlat, params.mlon]).addTo(map);
}
- $("body").on("click", "a.set_position", setPositionLink(map));
+ $("#homeanchor").on("click", function(e) {
+ e.preventDefault();
+
+ 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) {
remoteEditHandler(map.getBounds());
@@ -140,74 +141,101 @@ $(document).ready(function () {
remoteEditHandler(map.getBounds());
}
- $("#search_form").submit(submitSearch(map));
-
-
- if ($("#query").val()) {
- $("#search_form").submit();
- }
-
- // 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');
+ });
}
- initializeExport(map);
- initializeBrowse(map, params);
- initializeNotes(map, params);
-});
-
-function updateLocation() {
- updatelinks(this.getCenter().wrap(),
- this.getZoom(),
- this.getLayersCode(),
- this.getBounds().wrap());
+ OSM.Index = function(map) {
+ var page = {};
+
+ page.pushstate = page.popstate = function(path) {
+ $("#content").addClass("overlay-sidebar");
+ map.invalidateSize();
+ $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
+ if (xhr.getResponseHeader('X-Page-Title')) {
+ document.title = xhr.getResponseHeader('X-Page-Title');
+ }
+ });
+ };
+
+ page.unload = function() {
+ $("#content").removeClass("overlay-sidebar");
+ map.invalidateSize();
+ };
+
+ return page;
+ };
- var expiry = new Date();
- expiry.setYear(expiry.getFullYear() + 10);
- $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+ OSM.Browse = function(map) {
+ var page = {};
- // Trigger hash update on layer changes.
- this.hash.onMapMove();
-}
+ page.pushstate = page.popstate = function(path, type, id) {
+ $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
+ if (xhr.getResponseHeader('X-Page-Title')) {
+ document.title = xhr.getResponseHeader('X-Page-Title');
+ }
+ page.load(path, type, id);
+ });
+ };
-function setPositionLink(map) {
- return function(e) {
- var data = $(this).data(),
- center = L.latLng(data.lat, data.lon);
+ page.load = function(path, type, id) {
+ if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
- if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
- map.fitBounds([[data.minLat, data.minLon],
- [data.maxLat, data.maxLon]]);
+ if (type === 'note') {
+ map.noteLayer.showNote(parseInt(id));
} else {
- map.setView(center, data.zoom);
- }
-
- if (data.type && data.id) {
- map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } });
+ map.addObject({type: type, id: parseInt(id)}, {zoom: true});
}
+ };
- map.markerLayer.clearLayers();
- L.marker(center, {icon: getUserIcon()}).addTo(map.markerLayer);
+ page.unload = function() {
+ map.removeObject();
+ };
- return e.preventDefault();
+ return page;
};
-}
-
-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.getWest(),
- minlat: bounds.getSouth(),
- maxlon: bounds.getEast(),
- maxlat: bounds.getNorth()
- }, openSidebar);
-
- return e.preventDefault();
- };
-}
+
+ 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,
+ "/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");
+ OSM.route("/search?query=" + encodeURIComponent($(this).find("input[name=query]").val()) + OSM.formatHash(map));
+ });
+
+ $(".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)));
+ });
+});