//= require_self
+//= require leaflet.sidebar
+//= require leaflet.locate
//= require leaflet.layers
-//= require leaflet.share
+//= require leaflet.key
//= require leaflet.note
-//= require leaflet.locate
-//= require leaflet.customzoom
+//= require leaflet.share
//= require index/browse
//= require index/export
-//= require index/key
//= require index/notes
-function allLayers() {
- return [{
- 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")
- }];
-}
-
$(document).ready(function () {
var params = OSM.mapParams();
map.attributionControl.setPrefix('');
- var layers = allLayers();
+ map.hash = L.hash(map);
+
+ 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.noteLayer = new L.LayerGroup();
+ map.noteLayer.options = {code: 'N'};
- layers[0].layer.addTo(map);
+ map.dataLayer = new L.OSM.DataLayer(null);
+ map.dataLayer.options.code = 'D';
- $("#map").on("resized", function () {
+ $("#sidebar").on("opened closed", function () {
map.invalidateSize();
});
- L.control.customZoom({position: 'topright'})
+ var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+ L.OSM.zoom({position: position})
.addTo(map);
- var uiPane = $('#map-ui')[0];
+ L.control.locate({position: position})
+ .addTo(map);
+
+ var sidebar = L.OSM.sidebar('#map-ui')
+ .addTo(map);
L.OSM.layers({
- position: 'topright',
+ position: position,
layers: layers,
- uiPane: uiPane
+ sidebar: sidebar
}).addTo(map);
- L.control.share({
- getUrl: getShortUrl,
- uiPane: uiPane
+ L.OSM.key({
+ position: position,
+ sidebar: sidebar
}).addTo(map);
- L.control.note({ position: 'topright' }).addTo(map);
- L.control.locate({ position: 'topright' }).addTo(map);
- L.control.scale().addTo(map);
+ L.OSM.share({
+ position: position,
+ sidebar: sidebar,
+ short: true
+ }).addTo(map);
+
+ L.OSM.note({
+ position: position,
+ sidebar: sidebar
+ }).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],
- [params.maxlat, params.maxlon]);
-
- map.fitBounds(bbox);
-
- if (params.box) {
- L.rectangle(bbox, {
- weight: 2,
- color: '#e90',
- fillOpacity: 0
- }).addTo(map);
- }
+ if (params.bounds) {
+ map.fitBounds(params.bounds);
} else {
map.setView([params.lat, params.lon], params.zoom);
}
}
+ if (params.box) {
+ L.rectangle(params.box, {
+ weight: 2,
+ color: '#e90',
+ fillOpacity: 0
+ }).addTo(map);
+ }
+
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]);
}
}
addObjectToMap(params.object, map, { zoom: params.object_zoom });
}
- handleResize();
-
$("body").on("click", "a.set_position", setPositionLink(map));
$("a[data-editor=remote]").click(function(e) {
remoteEditHandler(map.getBounds());
}
- $(window).resize(handleResize);
-
$("#search_form").submit(submitSearch(map));
if (!("autofocus" in document.createElement("input"))) {
$("#query").focus();
}
-});
-
-// non-scoped utilities
-function getMapBaseLayer() {
- for (var i = 0; i < layers.length; i++) {
- if (map.hasLayer(layers[i].layer)) {
- return layers[i];
- }
- }
-}
-
-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;
-}
-// 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('|');
-}
+ initializeExport(map);
+ initializeBrowse(map, params);
+ initializeNotes(map, params);
+});
function updateLocation() {
updatelinks(this.getCenter().wrap(),
this.getZoom(),
- getMapLayers(this),
- this.getBounds().wrap(), {});
+ this.getLayersCode(),
+ this.getBounds().wrap());
var expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);
$.cookie("_osm_location", cookieContent(this), { expires: expiry });
+
+ // Trigger hash update on layer changes.
+ this.hash.onMapMove();
}
function setPositionLink(map) {
$("#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()
+ minlon: bounds.getWest(),
+ minlat: bounds.getSouth(),
+ maxlon: bounds.getEast(),
+ maxlat: bounds.getNorth()
}, openSidebar);
return e.preventDefault();
projects / rails.git / blobdiff