+//= 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
+
+var map, layers; // TODO: remove globals
$(document).ready(function () {
- var permalinks = $("#permalink").html();
var marker;
var params = OSM.mapParams();
- var map = createMap("map");
- L.control.scale().addTo(map);
+ map = L.map("map", {
+ zoomControl: false,
+ layerControl: false
+ });
+
+ map.attributionControl.setPrefix('');
+
+ layers = [{
+ layer: new L.OSM.Mapnik({
+ attribution: '',
+ code: "M"
+ }),
+ keyid: "mapnik",
+ name: I18n.t("javascripts.map.base.standard")
+ }, {
+ layer: 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")
+ }, {
+ layer: 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")
+ }, {
+ layer: 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].layer.addTo(map);
+
+ $("#map").on("resized", function () {
+ map.invalidateSize();
+ });
+
+ L.control.customZoom({position: 'topright'})
+ .addTo(map);
+
+ var uiPane = $('#map-ui')[0];
- map.attributionControl.setPrefix(permalinks);
+ L.OSM.layers({
+ position: 'topright',
+ layers: layers,
+ uiPane: uiPane
+ }).addTo(map);
- map.on("moveend baselayerchange", updateLocation);
+ 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);
if (!params.object_zoom) {
if (params.bbox) {
map.fitBounds(bbox);
if (params.box) {
- addBoxToMap(bbox);
+ L.rectangle(bbox, {
+ weight: 2,
+ color: '#e90',
+ fillOpacity: 0
+ }).addTo(map);
}
} else {
map.setView([params.lat, params.lon], params.zoom);
}
if (params.layers) {
- setMapLayers(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);
+ foundLayer = true;
+ } else {
+ map.removeLayer(layers[i].layer);
+ }
+ }
+ if (!foundLayer) {
+ map.addLayer(layers[0].layer);
+ }
}
if (params.marker) {
- marker = L.marker([params.mlat, params.mlon]).addTo(map);
+ marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
}
if (params.object) {
- addObjectToMap(params.object, params.object_zoom);
+ addObjectToMap(params.object, map, { zoom: params.object_zoom });
}
handleResize();
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);
}
- marker = L.marker(centre, {icon: getArrowIcon()}).addTo(map);
+ marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
});
function updateLocation() {
- var center = map.getCenter();
+ var center = map.getCenter().wrap();
var zoom = map.getZoom();
var layers = getMapLayers();
- var extents = map.getBounds();
-
- updatelinks(center.lng,
- center.lat,
- zoom,
- layers,
- extents.getWestLng(),
- extents.getSouthLat(),
- extents.getEastLng(),
- extents.getNorthLat(),
- params.object);
+ var extents = map.getBounds().wrap();
+
+ updatelinks(center, zoom, layers, extents, params.object);
var expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);
var loaded = false;
$("#linkloader").load(function () { loaded = true; });
- $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.getWestLng()
- + "&bottom=" + extent.getSouthLat()
- + "&right=" + extent.getEastLng()
- + "&top=" + extent.getNorthLat());
+ $("#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'));
$("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
$("#sidebar_content").load($(this).attr("action"), {
query: $("#query").val(),
- minlon: bounds.getSouthWest().lng,
- minlat: bounds.getSouthWest().lat,
- maxlon: bounds.getNorthEast().lng,
- maxlat: bounds.getNorthEast().lat
+ minlon: bounds.getWest(),
+ minlat: bounds.getSouth(),
+ maxlon: bounds.getEast(),
+ maxlat: bounds.getNorth()
}, openSidebar);
return false;
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();
+ }
});
+
+function getMapBaseLayer() {
+ for (var i = 0; i < layers.length; i++) {
+ if (map.hasLayer(layers[i].layer)) {
+ return layers[i];
+ }
+ }
+}
+
+function getMapLayers() {
+ 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;
+}