Improved map locate method, added watching and more options
This commit is contained in:
parent
b078e0236e
commit
a154f08415
@ -22,6 +22,7 @@ Leaflet Changelog
|
||||
#### API improvements
|
||||
|
||||
* Improved `LatLng` constructor to be more tolerant (and throw descriptive error if latitude or longitude can't be interpreted as a number). [#136](https://github.com/CloudMade/Leaflet/issues/136)
|
||||
* Improved `map` `locate` method, added ability to watch location continuously and more options. [#212](https://github.com/CloudMade/Leaflet/issues/212)
|
||||
* Added ability to add a tile layer below all others (`map.addLayer(layer, true)`) (useful for switching base tile layers).
|
||||
* Added `hasLayer` method to `Map`.
|
||||
* Added `TileLayer` `continuousWorld` option to disable tile coordinates checking/wrapping.
|
||||
|
@ -4,27 +4,45 @@
|
||||
|
||||
L.Map.include({
|
||||
locate: function(/*Object*/ options) {
|
||||
// W3C Geolocation API Spec position options, http://dev.w3.org/geo/api/spec-source.html#position-options
|
||||
var opts = {timeout: 10000};
|
||||
L.Util.extend(opts, options);
|
||||
|
||||
if (navigator.geolocation) {
|
||||
navigator.geolocation.getCurrentPosition(
|
||||
L.Util.bind(this._handleGeolocationResponse, this),
|
||||
L.Util.bind(this._handleGeolocationError, this),
|
||||
opts);
|
||||
} else {
|
||||
this.fire('locationerror', {
|
||||
this._locationOptions = options = L.Util.extend({
|
||||
watch: false,
|
||||
setView: false,
|
||||
maxZoom: Infinity,
|
||||
timeout: 10000,
|
||||
maximumAge: 0,
|
||||
enableHighAccuracy: false
|
||||
}, options);
|
||||
|
||||
if (!navigator.geolocation) {
|
||||
return this.fire('locationerror', {
|
||||
code: 0,
|
||||
message: "Geolocation not supported."
|
||||
});
|
||||
}
|
||||
|
||||
var onResponse = L.Util.bind(this._handleGeolocationResponse, this),
|
||||
onError = L.Util.bind(this._handleGeolocationError, this);
|
||||
|
||||
if (options.watch) {
|
||||
this._locationWatchId = navigator.geolocation.watchPosition(onResponse, onError, options);
|
||||
} else {
|
||||
navigator.geolocation.getCurrentPosition(onResponse, onError, options);
|
||||
}
|
||||
return this;
|
||||
},
|
||||
|
||||
stopLocate: function() {
|
||||
if (navigator.geolocation) {
|
||||
navigator.geolocation.clearWatch(this._locationWatchId);
|
||||
}
|
||||
},
|
||||
|
||||
locateAndSetView: function(maxZoom, options) {
|
||||
this._setViewOnLocate = true;
|
||||
this._maxLocateZoom = maxZoom || Infinity;
|
||||
options = L.Util.extend({
|
||||
maxZoom: maxZoom || Infinity,
|
||||
setView: true
|
||||
});
|
||||
return this.locate(options);
|
||||
},
|
||||
|
||||
@ -33,9 +51,8 @@ L.Map.include({
|
||||
message = (c == 1 ? "permission denied" :
|
||||
(c == 2 ? "position unavailable" : "timeout"));
|
||||
|
||||
if (this._setViewOnLocate) {
|
||||
if (this._locationOptions.setView && !this._loaded) {
|
||||
this.fitWorld();
|
||||
this._setViewOnLocate = false;
|
||||
}
|
||||
|
||||
this.fire('locationerror', {
|
||||
@ -48,20 +65,20 @@ L.Map.include({
|
||||
var latAccuracy = 180 * pos.coords.accuracy / 4e7,
|
||||
lngAccuracy = latAccuracy * 2,
|
||||
lat = pos.coords.latitude,
|
||||
lng = pos.coords.longitude;
|
||||
lng = pos.coords.longitude,
|
||||
latlng = new L.LatLng(lat, lng);
|
||||
|
||||
var sw = new L.LatLng(lat - latAccuracy, lng - lngAccuracy),
|
||||
ne = new L.LatLng(lat + latAccuracy, lng + lngAccuracy),
|
||||
bounds = new L.LatLngBounds(sw, ne);
|
||||
|
||||
if (this._setViewOnLocate) {
|
||||
var zoom = Math.min(this.getBoundsZoom(bounds), this._maxLocateZoom);
|
||||
this.setView(bounds.getCenter(), zoom);
|
||||
this._setViewOnLocate = false;
|
||||
if (this._locationOptions.setView) {
|
||||
var zoom = Math.min(this.getBoundsZoom(bounds), this._locationOptions.maxZoom);
|
||||
this.setView(latlng, zoom);
|
||||
}
|
||||
|
||||
this.fire('locationfound', {
|
||||
latlng: new L.LatLng(lat, lng),
|
||||
latlng: latlng,
|
||||
bounds: bounds,
|
||||
accuracy: pos.coords.accuracy
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user