//= require_self
+//= require leaflet.layers
+//= require leaflet.share
+//= require leaflet.note
+//= require leaflet.locate
+//= require leaflet.customzoom
//= require index/browse
//= require index/export
//= require index/key
//= require index/notes
-//= require index/map_ui
-
-var map, layers; // TODO: remove globals
$(document).ready(function () {
- var marker;
var params = OSM.mapParams();
- map = L.map("map", {
- attributionControl: false,
+ var map = L.map("map", {
zoomControl: false,
layerControl: false
});
- layers = mapLayers();
-
- layers[0].layer.addTo(map);
+ map.attributionControl.setPrefix('');
+
+ 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 <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+ code: "C",
+ keyid: "cyclemap",
+ name: I18n.t("javascripts.map.base.cycle_map")
+ }),
+ new L.OSM.TransportMap({
+ attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+ code: "T",
+ keyid: "transportmap",
+ name: I18n.t("javascripts.map.base.transport_map")
+ }),
+ new L.OSM.MapQuestOpen({
+ attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+ code: "Q",
+ keyid: "mapquest",
+ name: I18n.t("javascripts.map.base.mapquest")
+ })
+ ];
+
+ layers[0].addTo(map);
$("#map").on("resized", function () {
map.invalidateSize();
});
- L.control.zoom({position: 'topright'})
+ L.control.customZoom({position: 'topright'})
.addTo(map);
- OSM.mapUI().addTo(map);
-
- L.control.share({
- getUrl: function(map) {
- return setArgs('http://osm.org/', {
- lon: map.getCenter().lng,
- lat: map.getCenter().lat
- });
- }
- }).addTo(map);
+ var uiPane = $('#map-ui')[0];
- L.control.note({
- position: 'topright'
+ L.OSM.layers({
+ position: 'topright',
+ layers: layers,
+ uiPane: uiPane
}).addTo(map);
- L.control.locate({
- position: 'topright'
+ L.control.share({
+ getUrl: getShortUrl,
+ uiPane: uiPane
}).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.on('moveend layeradd layerremove', updateLocation);
+
+ map.markerLayer = L.layerGroup().addTo(map);
if (!params.object_zoom) {
if (params.bbox) {
}
if (params.layers) {
- setMapLayers(params.layers);
+ var foundLayer = false;
+ for (var i = 0; i < layers.length; i++) {
+ if (params.layers.indexOf(layers[i].options.code) >= 0) {
+ map.addLayer(layers[i]);
+ foundLayer = true;
+ } else {
+ map.removeLayer(layers[i]);
+ }
+ }
+ if (!foundLayer) {
+ 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) {
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();
});
- function updateLocation() {
- var center = map.getCenter().wrap();
- var zoom = map.getZoom();
- var layers = getMapLayers();
- var extents = map.getBounds().wrap();
-
- updatelinks(center.lng,
- center.lat,
- zoom,
- layers,
- extents.getWest(),
- extents.getSouth(),
- extents.getEast(),
- extents.getNorth(),
- params.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;
-
- $("#linkloader").load(function () { loaded = true; });
- $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?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();
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;
}
}
}
-function getMapLayers() {
- var layerConfig = "";
- for (var i = 0; i < layers.length; i++) {
- if (map.hasLayer(layers[i].layer)) {
- layerConfig += layers[i].layerCode;
+function getMapLayers(map) {
+ 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;
}
}
return layerConfig;
}
-function setMapLayers(layerConfig) {
- var foundLayer = false;
- for (var i = 0; i < layers.length; i++) {
- if (layerConfig.indexOf(layers[i].layerCode) >= 0) {
- map.addLayer(layers[i].layer);
- foundLayer = true;
- } else {
- map.removeLayer(layers[i].layer);
- }
- }
- if (!foundLayer) {
- map.addLayer(layers[0].layer);
- }
+// 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();
+ };
}
projects / rails.git / blobdiff