X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/54ded37bf2e9967f6462795eebf0b5117399391a..3f26761a26f1ebd8746db166be2d30fd9b7ff7d6:/app/assets/javascripts/index.js?ds=inline
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index bd366b609..1ea1d7c7f 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -9,6 +9,8 @@
//= require index/browse
//= require index/export
//= require index/notes
+//= require index/history
+//= require router
$(document).ready(function () {
var params = OSM.mapParams();
@@ -22,49 +24,93 @@ $(document).ready(function () {
map.hash = L.hash(map);
+ $(window).on('popstate', function(e) {
+ // popstate is triggered when the hash changes as well as on actual navigation
+ // events. We want to update the hash on the latter and not the former.
+ if (e.originalEvent.state) {
+ map.hash.update();
+ }
+ });
+
+ var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
+ var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'});
+
var layers = [
new L.OSM.Mapnik({
- attribution: '',
+ attribution: copyright + " ♥ " + donate,
code: "M",
keyid: "mapnik",
name: I18n.t("javascripts.map.base.standard")
}),
new L.OSM.CycleMap({
- attribution: "Tiles courtesy of Andy Allan",
+ attribution: copyright + ". 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",
+ attribution: copyright + ". 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 ",
+ attribution: copyright + ". Tiles courtesy of MapQuest ",
code: "Q",
keyid: "mapquest",
name: I18n.t("javascripts.map.base.mapquest")
+ }),
+ new L.OSM.HOT({
+ attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team",
+ code: "H",
+ keyid: "hot",
+ name: I18n.t("javascripts.map.base.hot")
})
];
- 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;
+ function updateLayers(params) {
+ var layerParam = params.layers || "M";
+ var layersAdded = "";
+
+ for (var i = layers.length - 1; i >= 0; i--) {
+ if (layerParam.indexOf(layers[i].options.code) >= 0) {
+ map.addLayer(layers[i]);
+ layersAdded = layersAdded + layers[i].options.code;
+ } else if (i == 0 && layersAdded == "") {
+ map.addLayer(layers[i]);
+ } else {
+ map.removeLayer(layers[i]);
+ }
}
}
+ updateLayers(params);
+
+ $(window).on("hashchange", function () {
+ updateLayers(OSM.mapParams());
+ });
+
+ map.on("baselayerchange", function (e) {
+ if (map.getZoom() > e.layer.options.maxZoom) {
+ map.setView(map.getCenter(), e.layer.options.maxZoom, { reset: true });
+ }
+ });
+
map.noteLayer = new L.LayerGroup();
map.noteLayer.options = {code: 'N'};
map.dataLayer = new L.OSM.DataLayer(null);
map.dataLayer.options.code = 'D';
- $("#sidebar").on("opened closed", function () {
- map.invalidateSize();
- });
+ if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+ if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+ map.addLayer(map.noteLayer);
+ }
+
+ if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+ map.addLayer(map.dataLayer);
+ }
+ }
var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
@@ -73,7 +119,10 @@ $(document).ready(function () {
L.control.locate({
position: position,
- title: I18n.t('javascripts.map.locate.title')
+ strings: {
+ title: I18n.t('javascripts.map.locate.title'),
+ popup: I18n.t('javascripts.map.locate.popup')
+ }
}).addTo(map);
var sidebar = L.OSM.sidebar('#map-ui')
@@ -106,34 +155,45 @@ $(document).ready(function () {
$('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
- map.on('moveend layeradd layerremove', updateLocation);
+ map.on('moveend layeradd layerremove', function() {
+ updatelinks(
+ map.getCenter().wrap(),
+ map.getZoom(),
+ map.getLayersCode(),
+ map._object);
- var marker = L.marker([0, 0], {icon: getUserIcon()});
+ var expiry = new Date();
+ expiry.setYear(expiry.getFullYear() + 10);
+ $.cookie("_osm_location", cookieContent(map), { expires: expiry });
- if (!params.object_zoom) {
- if (params.bounds) {
- map.fitBounds(params.bounds);
- } else {
- map.setView([params.lat, params.lon], params.zoom);
- }
+ // Trigger hash update on layer changes.
+ map.hash.onMapMove();
+ });
+
+ 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.box) {
- L.rectangle(params.box, {
- weight: 2,
- color: '#e90',
- fillOpacity: 0
- }).addTo(map);
+ if (params.bounds) {
+ map.fitBounds(params.bounds);
+ } else {
+ map.setView([params.lat, params.lon], params.zoom);
}
+ var marker = L.marker([0, 0], {icon: getUserIcon()});
+
if (params.marker) {
marker.setLatLng([params.mlat, params.mlon]).addTo(map);
}
- if (params.object) {
- map.addObject(params.object, { zoom: params.object_zoom });
- }
-
$("#homeanchor").on("click", function(e) {
e.preventDefault();
@@ -153,22 +213,106 @@ $(document).ready(function () {
remoteEditHandler(map.getBounds());
}
- initializeSearch(map);
- initializeExport(map);
- initializeBrowse(map, params);
- initializeNotes(map, params);
-});
+ 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 updateLocation() {
- updatelinks(this.getCenter().wrap(),
- this.getZoom(),
- this.getLayersCode(),
- this.getBounds().wrap());
+ initializeBrowse(map);
+ initializeNotes(map);
+
+ OSM.Index = function(map) {
+ var page = {}, minimized = $('#sidebar').hasClass('minimized');
+
+ page.pushstate = page.popstate = function(path) {
+ if (minimized) $("#sidebar").addClass("minimized");
+ map.invalidateSize();
+ $('#sidebar_content').load(path);
+ };
+
+ return page;
+ };
+
+ OSM.Browse = function(map) {
+ var page = {};
+
+ page.pushstate = page.popstate = function(path, type, id) {
+ $("#sidebar").removeClass("minimized");
+ map.invalidateSize();
+ $('#sidebar_content').load(path, function() {
+ page.load(path, type, id);
+ });
+ };
+
+ page.load = function(path, type, id) {
+ $("#sidebar").removeClass("minimized");
+
+ if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
+
+ if (type === 'note') {
+ map.noteLayer.showNote(parseInt(id));
+ } else {
+ map.addObject({type: type, id: parseInt(id)}, {zoom: true});
+ }
+ };
+
+ page.unload = function() {
+ map.removeObject();
+ };
+
+ return page;
+ };
+
+ var history = OSM.History(map);
+
+ OSM.route = OSM.Router({
+ "/": 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/: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();
+ });
- var expiry = new Date();
- expiry.setYear(expiry.getFullYear() + 10);
- $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+ $("#search_form").on("submit", function(e) {
+ e.preventDefault();
+ OSM.route("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map));
+ });
- // Trigger hash update on layer changes.
- this.hash.onMapMove();
-}
+ $("#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)));
+ });
+
+ function removeSidebar() {
+ if ($(window).width() < 721) {
+ $('#sidebar').addClass("minimized");
+ }
+ }
+
+ $(window).resize(function() {
+ removeSidebar();
+ });
+
+ removeSidebar();
+
+});