X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34e251c225c7903b64f1fda2b594dd1c70aeeb93..aaeca5b5346b01d7ef26a301492804d36049eff8:/app/assets/javascripts/index.js?ds=sidebyside
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 4724351ce..d84b8ae24 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,6 +5,7 @@
//= require leaflet.key
//= require leaflet.note
//= require leaflet.share
+//= require index/search
//= require index/browse
//= require index/export
//= require index/notes
@@ -21,40 +22,69 @@ $(document).ready(function () {
map.hash = L.hash(map);
+ var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
+
var layers = [
new L.OSM.Mapnik({
- attribution: '',
+ attribution: copyright,
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'};
@@ -70,8 +100,13 @@ $(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);
@@ -101,9 +136,23 @@ $(document).ready(function () {
L.control.scale()
.addTo(map);
+ $('.leaflet-control .control-button').tooltip({placement: 'left', container: 'body'});
+
map.on('moveend layeradd layerremove', updateLocation);
- map.markerLayer = L.layerGroup().addTo(map);
+ 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);
+ }
+ }
+ });
+ }
+
+ var marker = L.marker([0, 0], {icon: getUserIcon()});
if (!params.object_zoom) {
if (params.bounds) {
@@ -122,14 +171,22 @@ $(document).ready(function () {
}
if (params.marker) {
- L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map.markerLayer);
+ marker.setLatLng([params.mlat, params.mlon]).addTo(map);
}
if (params.object) {
map.addObject(params.object, { zoom: params.object_zoom });
}
- $("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,19 +197,21 @@ $(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');
+ });
}
+ initializeSearch(map);
initializeExport(map);
initializeBrowse(map, params);
initializeNotes(map, params);
@@ -171,43 +230,3 @@ function updateLocation() {
// Trigger hash update on layer changes.
this.hash.onMapMove();
}
-
-function setPositionLink(map) {
- return function(e) {
- var data = $(this).data(),
- center = 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(center, data.zoom);
- }
-
- if (data.type && data.id) {
- map.addObject(data, { zoom: true, style: { opacity: 0.2, fill: false } });
- }
-
- map.markerLayer.clearLayers();
- L.marker(center, {icon: getUserIcon()}).addTo(map.markerLayer);
-
- return e.preventDefault();
- };
-}
-
-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();
- };
-}