cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer hash to other methods of determining location

Browse source
This commit is contained in:
John Firebaugh 2013-07-23 15:52:37 -07:00
parent c8d4e4eee3
commit ce53e510ad
3 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/changeset.js
View file

@ -69,11 +69,5 @@ $(document).ready(function () {
}
});
var params = OSM.mapParams();
if (params.bbox) {
map.fitBounds([[params.minlat, params.minlon],
[params.maxlat, params.maxlon]]);
} else {
map.fitBounds(group.getBounds());
}
map.fitBounds(OSM.mapParams().bounds || group.getBounds());
});

23
app/assets/javascripts/index.js
View file

@ -100,24 +100,21 @@ $(document).ready(function () {
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++) {

57
app/assets/javascripts/osm.js.erb
View file

@ -23,7 +23,7 @@ OSM = {
},
mapParams: function (search) {
var params = {}, mapParams = {}, loc;
var params = {}, mapParams = {}, bounds, loc;
search = (search || window.location.search).replace('?', '').split(/&|;/);
@ -57,21 +57,34 @@ OSM = {
}
}
// Decide on a lat lon to initialise the map with. Various ways of doing this
if (params.bbox) {
var bbox = params.bbox.split(",");
mapParams.bbox = true;
mapParams.minlon = parseFloat(bbox[0]);
mapParams.minlat = parseFloat(bbox[1]);
mapParams.maxlon = parseFloat(bbox[2]);
mapParams.maxlat = parseFloat(bbox[3]);
mapParams.object_zoom = false;
params.bbox = params.bbox.split(',');
bounds = L.latLngBounds(
[parseFloat(params.bbox[1]),
parseFloat(params.bbox[0])],
[parseFloat(params.bbox[3]),
parseFloat(params.bbox[2])]);
} else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {
mapParams.bbox = true;
mapParams.minlon = parseFloat(params.minlon);
mapParams.minlat = parseFloat(params.minlat);
mapParams.maxlon = parseFloat(params.maxlon);
mapParams.maxlat = parseFloat(params.maxlat);
bounds = L.latLngBounds(
[parseFloat(params.minlat),
parseFloat(params.minlon)],
[parseFloat(params.maxlat),
parseFloat(params.maxlon)]);
}
if (params.box === 'yes') {
mapParams.box = bounds;
}
// Decide on a map starting position. Various ways of doing this.
var hash = L.Hash.parseHash(location.hash);
if (hash) {
mapParams.lon = hash.center.lng;
mapParams.lat = hash.center.lat;
mapParams.zoom = hash.zoom;
mapParams.object_zoom = false;
} else if (bounds) {
mapParams.bounds = bounds;
mapParams.object_zoom = false;
} else if (params.lon && params.lat) {
mapParams.lon = parseFloat(params.lon);
@ -94,23 +107,17 @@ OSM = {
mapParams.lat = OSM.home.lat;
mapParams.zoom = 10;
} else if (OSM.location) {
mapParams.bbox = true;
mapParams.minlon = OSM.location.minlon;
mapParams.minlat = OSM.location.minlat;
mapParams.maxlon = OSM.location.maxlon;
mapParams.maxlat = OSM.location.maxlat;
mapParams.bounds = L.latLngBounds(
[OSM.location.minlat,
OSM.location.minlon],
[OSM.location.maxlat,
OSM.location.maxlon]);
} else {
mapParams.lon = -0.1;
mapParams.lat = 51.5;
mapParams.zoom = parseInt(params.zoom || 5);
}
if (mapParams.bbox) {
mapParams.box = params.box == "yes";
mapParams.lon = (mapParams.minlon + mapParams.maxlon) / 2;
mapParams.lat = (mapParams.minlat + mapParams.maxlat) / 2;
}
mapParams.notes = params.notes == "yes";
if (params.note) {