mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move defaults in and make them proper options like in leaflet. Removes silly .Default file

Browse Source
This commit is contained in:
danzel
2012-07-26 11:18:12 +12:00
parent b2e4fe2a81
commit 3449fabc8c
10 changed files with 223 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/deps.js
View File

@@ -1,10 +1,5 @@
var deps = {
Defaults: {
src: ['MarkerCluster.Default.js'],
deps: ['QuickHull', 'Spiderfier'],
desc: 'Provides sensible defaults for the Cluster.'
},
Core: {
src: ['MarkerClusterGroup.js',
'MarkerCluster.js'],

205
dist/leaflet.markercluster-src.js vendored
View File

@@ -5,69 +5,6 @@
*/
(function (window, undefined) {
(function () {
L.MarkerClusterDefault = {
iconCreateFunction: function (childCount) {
var c = ' marker-cluster-';
if (childCount < 10) {
c += 'small';
} else if (childCount < 100) {
c += 'medium';
} else {
c += 'large';
}
return new L.DivIcon({ html: '<div><span>' + childCount + '</span></div>', className: 'marker-cluster' + c, iconSize: new L.Point(40, 40) });
},
_shownPolygon: null,
bindEvents: function (map, markerClusterGroup) {
var me = this;
var inZoomAnimation = false;
map.on('zoomstart', function () { inZoomAnimation = true; });
map.on('zoomend', function () { inZoomAnimation = false; });
//Zoom on cluster click or spiderfy if we are at the lowest level
markerClusterGroup.on('clusterclick', function (a) {
if (map.getMaxZoom() === map.getZoom()) {
a.layer.spiderfy();
} else {
a.layer.zoomToBounds();
}
});
//Show convex hull (boundary) polygon on mouse over
markerClusterGroup.on('clustermouseover', function (a) {
if (inZoomAnimation) {
return;
}
if (me._shownPolygon) {
map.removeLayer(me._shownPolygon);
}
if (a.layer.getChildCount() > 2) {
me._shownPolygon = new L.Polygon(a.layer.getConvexHull());
map.addLayer(me._shownPolygon);
}
});
markerClusterGroup.on('clustermouseout', function (a) {
if (me._shownPolygon) {
map.removeLayer(me._shownPolygon);
me._shownPolygon = null;
}
});
map.on('zoomend', function () {
if (me._shownPolygon) {
map.removeLayer(me._shownPolygon);
me._shownPolygon = null;
}
});
}
};
}());
/*
* L.MarkerClusterGroup extends L.FeatureGroup by clustering the markers contained within
@@ -77,11 +14,18 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
options: {
maxClusterRadius: 60, //A cluster will cover at most this many pixels from its center
iconCreateFunction: L.MarkerClusterDefault ? L.MarkerClusterDefault.iconCreateFunction : null
iconCreateFunction: null,
spiderfyOnMaxZoom: true,
showCoverageOnHover: true,
zoomToBoundsOnClick: true
},
initialize: function (options) {
L.Util.setOptions(this, options);
if (!this.options.iconCreateFunction) {
this.options.iconCreateFunction = this._defaultIconCreateFunction;
}
L.FeatureGroup.prototype.initialize.call(this, []);
@@ -91,6 +35,42 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
this._currentShownBounds = null;
},
addLayer: function (layer) {
if (!this._map) {
this._needsClustering.push(layer);
return this;
}
//If we have already clustered we'll need to add this one to a cluster
var newCluster = this._topClusterLevel._recursivelyAddLayer(layer, this._topClusterLevel._zoom - 1);
this._animationAddLayer(layer, newCluster);
return this;
},
removeLayer: function (layer) {
this._topClusterLevel._recursivelyRemoveLayer(layer);
return this;
},
//Overrides FeatureGroup.onAdd
onAdd: function (map) {
L.FeatureGroup.prototype.onAdd.call(this, map);
this._generateInitialClusters();
this._map.on('zoomend', this._zoomEnd, this);
this._map.on('moveend', this._moveEnd, this);
if (this._spiderfierOnAdd) { //TODO FIXME: Not sure how to have spiderfier add something on here nicely
this._spiderfierOnAdd();
}
this._bindEvents();
},
//Overrides FeatureGroup._propagateEvent
_propagateEvent: function (e) {
if (e.target instanceof L.MarkerCluster) {
@@ -99,6 +79,70 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
L.FeatureGroup.prototype._propagateEvent.call(this, e);
},
//Default functionality
_defaultIconCreateFunction: function (childCount) {
var c = ' marker-cluster-';
if (childCount < 10) {
c += 'small';
} else if (childCount < 100) {
c += 'medium';
} else {
c += 'large';
}
return new L.DivIcon({ html: '<div><span>' + childCount + '</span></div>', className: 'marker-cluster' + c, iconSize: new L.Point(40, 40) });
},
_bindEvents: function () {
var shownPolygon = null,
map = this._map,
spiderfyOnMaxZoom = this.options.spiderfyOnMaxZoom,
showCoverageOnHover = this.options.showCoverageOnHover,
zoomToBoundsOnClick = this.options.zoomToBoundsOnClick;
//Zoom on cluster click or spiderfy if we are at the lowest level
if (spiderfyOnMaxZoom || zoomToBoundsOnClick) {
this.on('clusterclick', function (a) {
if (map.getMaxZoom() === map.getZoom()) {
if (spiderfyOnMaxZoom) {
a.layer.spiderfy();
}
} else if (zoomToBoundsOnClick) {
a.layer.zoomToBounds();
}
}, this);
}
//Show convex hull (boundary) polygon on mouse over
if (showCoverageOnHover) {
this.on('clustermouseover', function (a) {
if (this._inZoomAnimation) {
return;
}
if (shownPolygon) {
map.removeLayer(shownPolygon);
}
if (a.layer.getChildCount() > 2) {
shownPolygon = new L.Polygon(a.layer.getConvexHull());
map.addLayer(shownPolygon);
}
}, this);
this.on('clustermouseout', function () {
if (shownPolygon) {
map.removeLayer(shownPolygon);
shownPolygon = null;
}
}, this);
map.on('zoomend', function () {
if (shownPolygon) {
map.removeLayer(shownPolygon);
shownPolygon = null;
}
}, this);
}
},
_sqDist: function (p1, p2) {
var dx = p2.x - p1.x,
dy = p2.y - p1.y;
@@ -164,39 +208,6 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
}
},
addLayer: function (layer) {
if (!this._map) {
this._needsClustering.push(layer);
return this;
}
//If we have already clustered we'll need to add this one to a cluster
var newCluster = this._topClusterLevel._recursivelyAddLayer(layer, this._topClusterLevel._zoom - 1);
this._animationAddLayer(layer, newCluster);
return this;
},
removeLayer: function (layer) {
this._topClusterLevel._recursivelyRemoveLayer(layer);
return this;
},
onAdd: function (map) {
L.FeatureGroup.prototype.onAdd.call(this, map); // LayerGroup
this._generateInitialClusters();
this._map.on('zoomend', this._zoomEnd, this);
this._map.on('moveend', this._moveEnd, this);
if (this._spiderfierOnAdd) { //TODO FIXME: Not sure how to have spiderfier add something on here nicely
this._spiderfierOnAdd();
}
},
//Takes a list of markers and clusters the new marker in to them
//Will return null or the new MarkerCluster. The clustered in marker is removed from the given array
_clusterOne: function (unclusteredMarkers, newMarker, zoom) {

2
dist/leaflet.markercluster.js vendored
View File

File diff suppressed because one or more lines are too long

3
example/marker-clustering-convexhull.html
View File

@@ -12,7 +12,6 @@
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
<script src="../src/MarkerCluster.Default.js"></script>
<script src="../src/MarkerClusterGroup.js"></script>
<script src="../src/MarkerCluster.js"></script>
<script src="../src/MarkerCluster.QuickHull.js"></script>
@@ -32,7 +31,7 @@
var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
var markers = new L.MarkerClusterGroup();
var markers = new L.MarkerClusterGroup({ spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false });
function populate() {
for (var i = 0; i < 100; i++) {

4
example/marker-clustering-custom.html
View File

@@ -45,7 +45,9 @@
maxClusterRadius: 120,
iconCreateFunction: function (count) {
return new L.DivIcon({ html: count, className: 'mycluster', iconSize: new L.Point(40, 40) });
}
},
//Disable all of the defaults:
spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false
});

3
example/marker-clustering-spiderfier.html
View File

@@ -12,7 +12,6 @@
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
<script src="../src/MarkerCluster.Default.js"></script>
<script src="../src/MarkerClusterGroup.js"></script>
<script src="../src/MarkerCluster.js"></script>
<script src="../src/MarkerCluster.Spiderfier.js"></script>
@@ -32,7 +31,7 @@
var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
var markers = new L.MarkerClusterGroup();
var markers = new L.MarkerClusterGroup({ spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false });
function populate() {
for (var i = 0; i < 100; i++) {

3
example/marker-clustering-zoomtobounds.html
View File

@@ -12,7 +12,6 @@
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
<script src="../src/MarkerCluster.Default.js"></script>
<script src="../src/MarkerClusterGroup.js"></script>
<script src="../src/MarkerCluster.js"></script>
</head>
@@ -30,7 +29,7 @@
var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
var markers = new L.MarkerClusterGroup();
var markers = new L.MarkerClusterGroup({spiderfyOnMaxZoom: false, showCoverageOnHover: false, zoomToBoundsOnClick: false});
function populate() {
for (var i = 0; i < 100; i++) {

1
example/marker-clustering.html
View File

@@ -12,7 +12,6 @@
<link rel="stylesheet" href="../dist/MarkerCluster.css" />
<link rel="stylesheet" href="../dist/MarkerCluster.Default.css" />
<script src="../src/MarkerCluster.Default.js"></script>
<script src="../src/MarkerClusterGroup.js"></script>
<script src="../src/MarkerCluster.js"></script>
</head>

62
src/MarkerCluster.Default.js
View File

@@ -1,62 +0,0 @@
(function () {
L.MarkerClusterDefault = {
iconCreateFunction: function (childCount) {
var c = ' marker-cluster-';
if (childCount < 10) {
c += 'small';
} else if (childCount < 100) {
c += 'medium';
} else {
c += 'large';
}
return new L.DivIcon({ html: '<div><span>' + childCount + '</span></div>', className: 'marker-cluster' + c, iconSize: new L.Point(40, 40) });
},
_shownPolygon: null,
bindEvents: function (map, markerClusterGroup) {
var me = this;
var inZoomAnimation = false;
map.on('zoomstart', function () { inZoomAnimation = true; });
map.on('zoomend', function () { inZoomAnimation = false; });
//Zoom on cluster click or spiderfy if we are at the lowest level
markerClusterGroup.on('clusterclick', function (a) {
if (map.getMaxZoom() === map.getZoom()) {
a.layer.spiderfy();
} else {
a.layer.zoomToBounds();
}
});
//Show convex hull (boundary) polygon on mouse over
markerClusterGroup.on('clustermouseover', function (a) {
if (inZoomAnimation) {
return;
}
if (me._shownPolygon) {
map.removeLayer(me._shownPolygon);
}
if (a.layer.getChildCount() > 2) {
me._shownPolygon = new L.Polygon(a.layer.getConvexHull());
map.addLayer(me._shownPolygon);
}
});
markerClusterGroup.on('clustermouseout', function (a) {
if (me._shownPolygon) {
map.removeLayer(me._shownPolygon);
me._shownPolygon = null;
}
});
map.on('zoomend', function () {
if (me._shownPolygon) {
map.removeLayer(me._shownPolygon);
me._shownPolygon = null;
}
});
}
};
}());

142
src/MarkerClusterGroup.js
View File

@@ -7,11 +7,18 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
options: {
maxClusterRadius: 60, //A cluster will cover at most this many pixels from its center
iconCreateFunction: L.MarkerClusterDefault ? L.MarkerClusterDefault.iconCreateFunction : null
iconCreateFunction: null,
spiderfyOnMaxZoom: true,
showCoverageOnHover: true,
zoomToBoundsOnClick: true
},
initialize: function (options) {
L.Util.setOptions(this, options);
if (!this.options.iconCreateFunction) {
this.options.iconCreateFunction = this._defaultIconCreateFunction;
}
L.FeatureGroup.prototype.initialize.call(this, []);
@@ -21,6 +28,42 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
this._currentShownBounds = null;
},
addLayer: function (layer) {
if (!this._map) {
this._needsClustering.push(layer);
return this;
}
//If we have already clustered we'll need to add this one to a cluster
var newCluster = this._topClusterLevel._recursivelyAddLayer(layer, this._topClusterLevel._zoom - 1);
this._animationAddLayer(layer, newCluster);
return this;
},
removeLayer: function (layer) {
this._topClusterLevel._recursivelyRemoveLayer(layer);
return this;
},
//Overrides FeatureGroup.onAdd
onAdd: function (map) {
L.FeatureGroup.prototype.onAdd.call(this, map);
this._generateInitialClusters();
this._map.on('zoomend', this._zoomEnd, this);
this._map.on('moveend', this._moveEnd, this);
if (this._spiderfierOnAdd) { //TODO FIXME: Not sure how to have spiderfier add something on here nicely
this._spiderfierOnAdd();
}
this._bindEvents();
},
//Overrides FeatureGroup._propagateEvent
_propagateEvent: function (e) {
if (e.target instanceof L.MarkerCluster) {
@@ -29,6 +72,70 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
L.FeatureGroup.prototype._propagateEvent.call(this, e);
},
//Default functionality
_defaultIconCreateFunction: function (childCount) {
var c = ' marker-cluster-';
if (childCount < 10) {
c += 'small';
} else if (childCount < 100) {
c += 'medium';
} else {
c += 'large';
}
return new L.DivIcon({ html: '<div><span>' + childCount + '</span></div>', className: 'marker-cluster' + c, iconSize: new L.Point(40, 40) });
},
_bindEvents: function () {
var shownPolygon = null,
map = this._map,
spiderfyOnMaxZoom = this.options.spiderfyOnMaxZoom,
showCoverageOnHover = this.options.showCoverageOnHover,
zoomToBoundsOnClick = this.options.zoomToBoundsOnClick;
//Zoom on cluster click or spiderfy if we are at the lowest level
if (spiderfyOnMaxZoom || zoomToBoundsOnClick) {
this.on('clusterclick', function (a) {
if (map.getMaxZoom() === map.getZoom()) {
if (spiderfyOnMaxZoom) {
a.layer.spiderfy();
}
} else if (zoomToBoundsOnClick) {
a.layer.zoomToBounds();
}
}, this);
}
//Show convex hull (boundary) polygon on mouse over
if (showCoverageOnHover) {
this.on('clustermouseover', function (a) {
if (this._inZoomAnimation) {
return;
}
if (shownPolygon) {
map.removeLayer(shownPolygon);
}
if (a.layer.getChildCount() > 2) {
shownPolygon = new L.Polygon(a.layer.getConvexHull());
map.addLayer(shownPolygon);
}
}, this);
this.on('clustermouseout', function () {
if (shownPolygon) {
map.removeLayer(shownPolygon);
shownPolygon = null;
}
}, this);
map.on('zoomend', function () {
if (shownPolygon) {
map.removeLayer(shownPolygon);
shownPolygon = null;
}
}, this);
}
},
_sqDist: function (p1, p2) {
var dx = p2.x - p1.x,
dy = p2.y - p1.y;
@@ -94,39 +201,6 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
}
},
addLayer: function (layer) {
if (!this._map) {
this._needsClustering.push(layer);
return this;
}
//If we have already clustered we'll need to add this one to a cluster
var newCluster = this._topClusterLevel._recursivelyAddLayer(layer, this._topClusterLevel._zoom - 1);
this._animationAddLayer(layer, newCluster);
return this;
},
removeLayer: function (layer) {
this._topClusterLevel._recursivelyRemoveLayer(layer);
return this;
},
onAdd: function (map) {
L.FeatureGroup.prototype.onAdd.call(this, map); // LayerGroup
this._generateInitialClusters();
this._map.on('zoomend', this._zoomEnd, this);
this._map.on('moveend', this._moveEnd, this);
if (this._spiderfierOnAdd) { //TODO FIXME: Not sure how to have spiderfier add something on here nicely
this._spiderfierOnAdd();
}
},
//Takes a list of markers and clusters the new marker in to them
//Will return null or the new MarkerCluster. The clustered in marker is removed from the given array
_clusterOne: function (unclusteredMarkers, newMarker, zoom) {