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

Simplify

Browse source
This commit is contained in:
John Firebaugh 2013-11-14 12:22:20 -08:00
parent 2ce7060757
commit 22408c3e5b
2 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -230,19 +230,7 @@ $(document).ready(function () {
};
page.load = function(path, type, id) {
if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
map.addObject({type: type, id: parseInt(id)},
{
zoom: window.location.hash == "",
style: {
color: "#FF6200",
weight: 4,
opacity: 1,
fillOpacity: 0.5
}
}
);
map.addObject({type: type, id: parseInt(id)});
};
page.unload = function() {

38
app/assets/javascripts/leaflet.map.js.erb
View file

@ -169,7 +169,21 @@ L.OSM.Map = L.Map.extend({
return str;
},
addObject: function(object, options) {
addObject: function(object) {
var objectStyle = {
color: "#FF6200",
weight: 4,
opacity: 1,
fillOpacity: 0.5
};
var changesetStyle = {
weight: 1,
color: '#FF9500',
opacity: 1,
fillOpacity: 0
};
this._object = object;
if (this._objectLoader) this._objectLoader.abort();
@ -182,15 +196,10 @@ L.OSM.Map = L.Map.extend({
success: function (xml) {
map._objectLayer = new L.OSM.DataLayer(null, {
styles: {
node: options.style,
way: options.style,
area: options.style,
changeset: {
weight: 1,
color: '#FF9500',
opacity: 1,
fillOpacity: 0
}
node: objectStyle,
way: objectStyle,
area: objectStyle,
changeset: changesetStyle
}
});
@ -207,13 +216,12 @@ L.OSM.Map = L.Map.extend({
};
map._objectLayer.addData(xml);
map._objectLayer.addTo(map);
var bounds = map._objectLayer.getBounds();
if (options.zoom && bounds.isValid()) map.fitBounds(bounds);
if (options.callback) options.callback(bounds);
map._objectLayer.addTo(map);
if (bounds.isValid()) {
map.fitBounds(bounds);
}
}
});
},