0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

shift click to join places

Browse source
This commit is contained in:
rolux 2011-06-14 16:34:09 +02:00
parent 7a38795314
commit 4d449232d5
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/Ox.UI/js/Map/Ox.Map.js
View file

@ -1220,8 +1220,12 @@ Ox.Map = function(options, self) {
return key;
};
that.getSelectedPlace = function() {
return getSelectedPlace();
}
that.editPlace = function() {
getPlaceById(self.options.selected).edit();
getSelectedPlace().edit();
return that;
};
@ -1245,8 +1249,8 @@ Ox.Map = function(options, self) {
});
};
that.newPlace = function() {
addPlaceToMap();
that.newPlace = function(place) {
addPlaceToMap(place);
};
that.panToPlace = function() {

29
source/Ox.UI/js/Map/Ox.MapMarker.js
View file

@ -53,13 +53,30 @@ Ox.MapMarker = function(options) {
function click() {
if (!that.place.selected) {
that.map.options({selected: that.place.id});
} else if (that.map.getKey() == 'meta') {
that.map.options({selected: null});
} else if (that.map.getKey() == 'shift') {
that.map.zoomToPlace();
if (that.map.getKey() == 'shift') {
var bounds = that.map.getSelectedPlace().bounds.union(that.place.bounds),
center = bounds.getCenter(),
southWest = bounds.getSouthWest(),
northEast = bounds.getNorthEast();
that.map.newPlace({
lat: center.lat(),
lng: center.lng(),
south: southWest.lat(),
west: southWest.lng(),
north: northEast.lat(),
east: northEast.lng()
});
} else {
that.map.options({selected: that.place.id});
}
} else {
that.map.panToPlace();
if (that.map.getKey() == 'meta') {
that.map.options({selected: null});
} else if (that.map.getKey() == 'shift') {
that.map.zoomToPlace();
} else {
that.map.panToPlace();
}
}
}