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

Restore maxFeatures check

Browse source
This commit is contained in:
John Firebaugh 2012-10-19 10:57:45 -07:00
parent fe6e837cfe
commit f8b0b861d4
2 changed files with 62 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

42
app/assets/javascripts/index/browse.js
View file

@ -159,28 +159,36 @@ $(document).ready(function () {
dataLayer.clearLayers(); dataLayer.clearLayers();
selectedLayer = null; selectedLayer = null;
dataLayer.addData(xml); var features = dataLayer.buildFeatures(xml);
layersById = {}; function addFeatures() {
var features = []; dataLayer.addData(features);
dataLayer.eachLayer(function (layer) { layersById = {};
var feature = layer.feature;
layersById[feature.id] = layer; dataLayer.eachLayer(function (layer) {
features.push({ var feature = layer.feature;
typeName: featureTypeName(feature), layersById[feature.id] = layer;
url: "/browse/" + feature.type + "/" + feature.id, $.extend(feature, {
name: featureName(feature), typeName: featureTypeName(feature),
id: feature.id url: "/browse/" + feature.type + "/" + feature.id,
name: featureName(feature)
});
}); });
});
browseObjectList = $(JST["templates/browse/feature_list"]({ browseObjectList = $(JST["templates/browse/feature_list"]({
features: features, features: features,
url: url url: url
}))[0]; }))[0];
loadObjectList(); loadObjectList();
}
if (features.length < maxFeatures) {
addFeatures();
} else {
displayFeatureWarning(features.length, maxFeatures, addFeatures);
}
} }
}); });
} }

60
vendor/assets/leaflet/leaflet.osm.js vendored
View file

@ -55,40 +55,54 @@ L.OSM.DataLayer = L.FeatureGroup.extend({
} }
}, },
addData: function (xml) { addData: function (features) {
var nodes = L.OSM.getNodes(xml), if (!(features instanceof Array)) {
ways = L.OSM.getWays(xml); features = this.buildFeatures(features);
}
for (var i = 0; i < ways.length; i++) { for (var i = 0; i < features.length; i++) {
var way = ways[i], var feature = features[i], layer;
latLngs = new Array(way.nodes.length);
for (var j = 0; j < way.nodes.length; j++) { if (feature.type === "node") {
latLngs[j] = nodes[way.nodes[j]].latLng; layer = L.circleMarker(feature.latLng, this.options.styles.node);
}
var layer;
if (this.isWayArea(way)) {
latLngs.pop(); // Remove last == first.
layer = L.polygon(latLngs, this.options.styles.area);
} else { } else {
layer = L.polyline(latLngs, this.options.styles.way); var latLngs = new Array(feature.nodes.length);
for (var j = 0; j < feature.nodes.length; j++) {
latLngs[j] = feature.nodes[j].latLng;
}
if (this.isWayArea(feature)) {
latLngs.pop(); // Remove last == first.
layer = L.polygon(latLngs, this.options.styles.area);
} else {
layer = L.polyline(latLngs, this.options.styles.way);
}
} }
layer.addTo(this); layer.addTo(this);
layer.feature = way; layer.feature = feature;
} }
},
buildFeatures: function (xml) {
var features = [],
nodes = L.OSM.getNodes(xml),
ways = L.OSM.getWays(xml, nodes);
for (var node_id in nodes) { for (var node_id in nodes) {
var node = nodes[node_id]; var node = nodes[node_id];
if (this.interestingNode(node)) { if (this.interestingNode(node)) {
var layer = L.circleMarker(node.latLng, this.options.styles.node); features.push(node);
layer.addTo(this);
layer.feature = node;
} }
} }
for (var i = 0; i < ways.length; i++) {
var way = ways[i];
features.push(way);
}
return features;
}, },
isWayArea: function (way) { isWayArea: function (way) {
@ -136,7 +150,7 @@ L.Util.extend(L.OSM, {
return result; return result;
}, },
getWays: function (xml) { getWays: function (xml, nodes) {
var result = []; var result = [];
var ways = xml.getElementsByTagName("way"); var ways = xml.getElementsByTagName("way");
@ -151,7 +165,7 @@ L.Util.extend(L.OSM, {
}; };
for (var j = 0; j < nds.length; j++) { for (var j = 0; j < nds.length; j++) {
way_object.nodes[j] = nds[j].getAttribute("ref"); way_object.nodes[j] = nodes[nds[j].getAttribute("ref")];
} }
result.push(way_object); result.push(way_object);