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

Refactor mapParams to compose better with apiUrl

Browse source
This commit is contained in:
John Firebaugh 2012-10-04 19:35:06 -07:00 • committed by Tom Hughes
parent e4ef507c5c
commit 3cf3d888b2
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ $(document).ready(function () {
} }
if (params.object) { if (params.object) {
addObjectToMap({type: params.object_type, id: params.object_id}, params.object_zoom); addObjectToMap(params.object, params.object_zoom);
} }
handleResize(); handleResize();
@ -73,7 +73,7 @@ $(document).ready(function () {
var extents = unproj(map.getExtent()); var extents = unproj(map.getExtent());
var expiry = new Date(); var expiry = new Date();
updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id); updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object.type, params.object.id);
expiry.setYear(expiry.getFullYear() + 10); expiry.setYear(expiry.getFullYear() + 10);
$.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry}); $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});

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

@ -44,18 +44,14 @@ OSM = {
} }
if (params.node || params.way || params.relation) { if (params.node || params.way || params.relation) {
mapParams.object = true;
mapParams.object_zoom = true; mapParams.object_zoom = true;
if (params.node) { if (params.node) {
mapParams.object_type = 'node'; mapParams.object = {type: 'node', id: parseInt(params.node)};
mapParams.object_id = parseInt(params.node);
} else if (params.way) { } else if (params.way) {
mapParams.object_type = 'way'; mapParams.object = {type: 'way', id: parseInt(params.way)};
mapParams.object_id = parseInt(params.way);
} else if (params.relation) { } else if (params.relation) {
mapParams.object_type = 'relation'; mapParams.object = {type: 'relation', id: parseInt(params.relation)};
mapParams.object_id = parseInt(params.relation);
} }
} }