projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e84ed73
)
Wrap permalink coordinates
author
John Firebaugh
<john.firebaugh@gmail.com>
Tue, 6 Aug 2013 16:10:56 +0000
(09:10 -0700)
committer
John Firebaugh
<john.firebaugh@gmail.com>
Tue, 6 Aug 2013 16:12:20 +0000
(09:12 -0700)
app/assets/javascripts/osm.js.erb
patch
|
blob
|
history
diff --git
a/app/assets/javascripts/osm.js.erb
b/app/assets/javascripts/osm.js.erb
index e414d26ffa0a1b783420212781e0516a4c0fdd40..4430943d1e359aa54045efe35762a895076d64da 100644
(file)
--- a/
app/assets/javascripts/osm.js.erb
+++ b/
app/assets/javascripts/osm.js.erb
@@
-139,26
+139,28
@@
OSM = {
},
formatHash: function(args) {
},
formatHash: function(args) {
+ var center, zoom, layers;
+
if (args instanceof L.Map) {
if (args instanceof L.Map) {
- args = {
- lat: args.getCenter().lat,
- lon: args.getCenter().lng,
- zoom: args.getZoom(),
- layers: args.getLayersCode()
- };
+ center = args.getCenter();
+ zoom = args.getZoom();
+ layers = args.getLayersCode();
+ } else {
+ center = L.latLng(args.lat, args.lon);
+ zoom = args.zoom;
+ layers = args.layers || '';
}
}
- var precision = zoomPrecision(args.zoom),
- hash = '#map=' + args.zoom +
- '/' + args.lat.toFixed(precision) +
- '/' + args.lon.toFixed(precision);
+ center = center.wrap();
+ layers = layers.replace('M', '');
- if (args.layers) {
- args.layers = args.layers.replace('M', '');
- }
+ var precision = zoomPrecision(zoom),
+ hash = '#map=' + zoom +
+ '/' + center.lat.toFixed(precision) +
+ '/' + center.lng.toFixed(precision);
- if (
args.
layers) {
- hash += '&layers=' +
args.
layers;
+ if (layers) {
+ hash += '&layers=' + layers;
}
return hash;
}
return hash;