X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/33897d30b32b1323d8d4a3053b2a8a13cea5e5d5..9d33721630e02ab9bed1d7853be4fcb5960d7b4f:/app/assets/javascripts/index.js
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 10f9f86f0..c9316ebae 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -9,10 +9,7 @@
//= require index/key
//= require index/notes
-var map, layers; // TODO: remove globals
-
$(document).ready(function () {
- var marker;
var params = OSM.mapParams();
var map = L.map("map", {
@@ -22,37 +19,34 @@ $(document).ready(function () {
map.attributionControl.setPrefix('');
- layers = [{
- layer: new L.OSM.Mapnik({
+ var layers = [
+ new L.OSM.Mapnik({
attribution: '',
- code: "M"
+ code: "M",
+ keyid: "mapnik",
+ name: I18n.t("javascripts.map.base.standard")
}),
- keyid: "mapnik",
- name: I18n.t("javascripts.map.base.standard")
- }, {
- layer: new L.OSM.CycleMap({
+ new L.OSM.CycleMap({
attribution: "Tiles courtesy of Andy Allan",
- code: "C"
+ code: "C",
+ keyid: "cyclemap",
+ name: I18n.t("javascripts.map.base.cycle_map")
}),
- keyid: "cyclemap",
- name: I18n.t("javascripts.map.base.cycle_map")
- }, {
- layer: new L.OSM.TransportMap({
+ new L.OSM.TransportMap({
attribution: "Tiles courtesy of Andy Allan",
- code: "T"
+ code: "T",
+ keyid: "transportmap",
+ name: I18n.t("javascripts.map.base.transport_map")
}),
- keyid: "transportmap",
- name: I18n.t("javascripts.map.base.transport_map")
- }, {
- layer: new L.OSM.MapQuestOpen({
+ new L.OSM.MapQuestOpen({
attribution: "Tiles courtesy of MapQuest 
",
- code: "Q"
- }),
- keyid: "mapquest",
- name: I18n.t("javascripts.map.base.mapquest")
- }];
+ code: "Q",
+ keyid: "mapquest",
+ name: I18n.t("javascripts.map.base.mapquest")
+ })
+ ];
- layers[0].layer.addTo(map);
+ layers[0].addTo(map);
$("#map").on("resized", function () {
map.invalidateSize();
@@ -74,18 +68,14 @@ $(document).ready(function () {
uiPane: uiPane
}).addTo(map);
- L.control.note({
- position: 'topright'
- }).addTo(map);
-
- L.control.locate({
- position: 'topright'
- }).addTo(map);
-
+ L.control.note({ position: 'topright' }).addTo(map);
+ L.control.locate({ position: 'topright' }).addTo(map);
L.control.scale().addTo(map);
map.on('moveend layeradd layerremove', updateLocation);
+ map.markerLayer = L.layerGroup().addTo(map);
+
if (!params.object_zoom) {
if (params.bbox) {
var bbox = L.latLngBounds([params.minlat, params.minlon],
@@ -108,20 +98,20 @@ $(document).ready(function () {
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);
+ if (params.layers.indexOf(layers[i].options.code) >= 0) {
+ map.addLayer(layers[i]);
foundLayer = true;
} else {
- map.removeLayer(layers[i].layer);
+ map.removeLayer(layers[i]);
}
}
if (!foundLayer) {
- map.addLayer(layers[0].layer);
+ map.addLayer(layers[0]);
}
}
if (params.marker) {
- marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
+ L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map.markerLayer);
}
if (params.object) {
@@ -130,90 +120,21 @@ $(document).ready(function () {
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);
- }
+ $("body").on("click", "a.set_position", setPositionLink(map));
- marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
+ $("a[data-editor=remote]").click(function(e) {
+ remoteEditHandler(map.getBounds());
+ e.preventDefault();
});
- // generate a cookie-safe string of map state
- function cookieContent(map) {
- var center = map.getCenter().wrap();
- return [center.lng, center.lat, map.getZoom(), getMapLayers(map)].join('|');
- }
-
- function updateLocation() {
- updatelinks(map.getCenter().wrap(),
- map.getZoom(),
- getMapLayers(this),
- map.getBounds().wrap(),
- params.object);
-
- var expiry = new Date();
- expiry.setYear(expiry.getFullYear() + 10);
- $.cookie("_osm_location", cookieContent(map), { expires: expiry });
- }
-
- function remoteEditHandler() {
- var extent = map.getBounds();
- var loaded = false;
-
- $("#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()
- }));
-
- setTimeout(function () {
- if (!loaded) alert(I18n.t('site.index.remote_failed'));
- }, 1000);
-
- return false;
- }
-
- $("a[data-editor=remote]").click(remoteEditHandler);
-
if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
- remoteEditHandler();
+ remoteEditHandler(map.getBounds());
}
$(window).resize(handleResize);
- $("#search_form").submit(function () {
- var bounds = map.getBounds();
+ $("#search_form").submit(submitSearch(map));
- $("#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 false;
- });
if ($("#query").val()) {
$("#search_form").submit();
@@ -224,12 +145,16 @@ $(document).ready(function () {
if (!("autofocus" in document.createElement("input"))) {
$("#query").focus();
}
+
+ initializeBrowse(map);
+ initializeNotes(map);
});
-function getMapBaseLayer() {
- for (var i = 0; i < layers.length; i++) {
- if (map.hasLayer(layers[i].layer)) {
- return layers[i];
+function getMapBaseLayerId(map) {
+ for (var i in map._layers) { // TODO: map.eachLayer
+ var layer = map._layers[i];
+ if (layer.options && layer.options.keyid) {
+ return layer.options.keyid;
}
}
}
@@ -244,3 +169,60 @@ function getMapLayers(map) {
}
return layerConfig;
}
+
+// generate a cookie-safe string of map state
+function cookieContent(map) {
+ var center = map.getCenter().wrap();
+ return [center.lng, center.lat, map.getZoom(), getMapLayers(map)].join('|');
+}
+
+function updateLocation() {
+ updatelinks(this.getCenter().wrap(),
+ this.getZoom(),
+ getMapLayers(this),
+ this.getBounds().wrap(), {});
+
+ var expiry = new Date();
+ expiry.setYear(expiry.getFullYear() + 10);
+ $.cookie("_osm_location", cookieContent(this), { expires: expiry });
+}
+
+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) {
+ addObjectToMap(data, map, { 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.getWestLng(),
+ minlat: bounds.getSouthLat(),
+ maxlon: bounds.getEastLng(),
+ maxlat: bounds.getNorthLat()
+ }, openSidebar);
+
+ return e.preventDefault();
+ };
+}