+//= require_self
//= 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();
- var map = createMap("map");
+
+ map = L.map("map", {
+ attributionControl: false,
+ zoomControl: false,
+ layerControl: false
+ });
+
+ layers = mapLayers();
+
+ layers[0].layer.addTo(map);
+
+ $("#map").on("resized", function () {
+ map.invalidateSize();
+ });
+
+ L.control.zoom({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);
+
+ 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) {
- var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
+ var bbox = L.latLngBounds([params.minlat, params.minlon],
+ [params.maxlat, params.maxlon]);
- map.zoomToExtent(proj(bbox));
+ map.fitBounds(bbox);
if (params.box) {
- $(window).load(function() { addBoxToMap(bbox) });
+ L.rectangle(bbox, {
+ weight: 2,
+ color: '#e90',
+ fillOpacity: 0
+ }).addTo(map);
}
} else {
- setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+ map.setView([params.lat, params.lon], params.zoom);
}
}
}
if (params.marker) {
- marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
+ marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
}
if (params.object) {
- var url = "/api/" + OSM.API_VERSION + "/" + params.object_type + "/" + params.object_id;
-
- if (params.object_type != "node") {
- url += "/full";
- }
-
- $(window).load(function() { addObjectToMap(url, params.object_zoom) });
+ addObjectToMap(params.object, map, { zoom: params.object_zoom });
}
- map.events.register("moveend", map, updateLocation);
- map.events.register("changelayer", map, updateLocation);
-
- updateLocation();
handleResize();
- $("#show_data").click(function (e) {
- $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
- startBrowse(sidebarHtml);
- }});
+ $("body").on("click", "a.set_position", function (e) {
e.preventDefault();
- });
- $("body").on("click", "a.set_position", function () {
var data = $(this).data();
- var centre = new OpenLayers.LonLat(data.lon, data.lat);
+ var centre = L.latLng(data.lat, data.lon);
if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
- var bbox = new OpenLayers.Bounds(data.minLon, data.minLat, data.maxLon, data.maxLat);
-
- map.zoomToExtent(proj(bbox));
+ map.fitBounds([[data.minLat, data.minLon],
+ [data.maxLat, data.maxLon]]);
} else {
- setMapCenter(centre, data.zoom);
+ map.setView(centre, data.zoom);
}
- if (marker) {
- removeMarkerFromMap(marker);
+ if (data.type && data.id) {
+ addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
}
- marker = addMarkerToMap(centre, getArrowIcon());
+ if (marker) {
+ map.removeLayer(marker);
+ }
- return false;
+ marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
});
function updateLocation() {
- var lonlat = unproj(map.getCenter());
+ var center = map.getCenter().wrap();
var zoom = map.getZoom();
var layers = getMapLayers();
- var extents = unproj(map.getExtent());
- var expiry = new Date();
+ var extents = map.getBounds().wrap();
- updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id);
+ updatelinks(center,
+ zoom,
+ layers,
+ extents.getWest(),
+ extents.getSouth(),
+ extents.getEast(),
+ extents.getNorth(),
+ params.object);
+ var expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);
- $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
+ $.cookie("_osm_location", [center.lng, center.lat, zoom, layers].join("|"), {expires: expiry});
}
- function remoteEditHandler(event) {
- var extent = unproj(map.getExtent());
+ 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.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom);
+ $("#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'));
remoteEditHandler();
}
- $(window).resize(function() {
- var centre = map.getCenter();
- var zoom = map.getZoom();
+ $(window).resize(handleResize);
- handleResize();
+ $("#search_form").submit(function () {
+ var bounds = map.getBounds();
- map.setCenter(centre, zoom);
- });
+ $("#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);
- $("#exportanchor").click(function (e) {
- $.ajax({ url: $(this).data('url'), success: function (sidebarHtml) {
- startExport(sidebarHtml);
- }});
- e.preventDefault();
+ return false;
});
- if (window.location.pathname == "/export") {
- $("#exportanchor").click();
+ if ($("#query").val()) {
+ $("#search_form").submit();
}
- var query;
- if (query = getArgs(window.location.toString()).query) {
- doSearch(query);
+ // 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 = 0; i < layers.length; i++) {
+ if (map.hasLayer(layers[i].layer)) {
+ layerConfig += layers[i].layerCode;
+ }
+ }
+ 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);
+ }
+}
projects / rails.git / blobdiff