Add units for, remove unnecessary html
This commit is contained in:
@@ -1,15 +0,0 @@
|
|||||||
.info {
|
|
||||||
min-width: 3em;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
form {
|
|
||||||
display: table;
|
|
||||||
}
|
|
||||||
form > div {
|
|
||||||
display: table-row;
|
|
||||||
}
|
|
||||||
form > div > * {
|
|
||||||
display: table-cell;
|
|
||||||
white-space: nowrap;
|
|
||||||
padding-right: 5px;
|
|
||||||
}
|
|
||||||
@@ -8,22 +8,18 @@ tags: "cluster, vector"
|
|||||||
---
|
---
|
||||||
<div id="map" class="map"></div>
|
<div id="map" class="map"></div>
|
||||||
<form>
|
<form>
|
||||||
<div>
|
<div class="form-group">
|
||||||
<label for="distance" cellspan>Cluster distance: </label>
|
<label for="distance" class="col-form-label">Cluster distance</label>
|
||||||
<span id="distance-info" class="info"></span>
|
<input id="distance" class="form-control-range" type="range" min="0" max="200" step="1" value="40"/>
|
||||||
<span>px</span>
|
<small class="form-text text-muted">
|
||||||
<input id="distance" type="range" min="0" max="200" step="1" value="40"/>
|
The distance within which features will be clustered together.
|
||||||
|
</small>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div class="form-group">
|
||||||
<label for="min-distance">Min distance:</label>
|
<label for="min-distance" class="col-form-label">Minimum distance</label>
|
||||||
<span id="min-distance-info" class="info"></span>
|
<input id="min-distance" class="form-control-range" type="range" min="0" max="200" step="1" value="20"/>
|
||||||
<span>px</span>
|
<small class="form-text text-muted">
|
||||||
<input id="min-distance" type="range" min="0" max="200" step="1" value="20"/>
|
The minimum distance between clusters. Can't be larger than the configured distance.
|
||||||
</div>
|
</small>
|
||||||
<div>
|
|
||||||
<span>Clusters:</span>
|
|
||||||
<span id ="num-clusters" class="info"></span>
|
|
||||||
<span></span>
|
|
||||||
<span></span>
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -14,10 +14,7 @@ import {Tile as TileLayer, Vector as VectorLayer} from '../src/ol/layer.js';
|
|||||||
import {boundingExtent} from '../src/ol/extent.js';
|
import {boundingExtent} from '../src/ol/extent.js';
|
||||||
|
|
||||||
const distanceInput = document.getElementById('distance');
|
const distanceInput = document.getElementById('distance');
|
||||||
const distanceNode = document.getElementById('distance-info');
|
|
||||||
const minDistanceInput = document.getElementById('min-distance');
|
const minDistanceInput = document.getElementById('min-distance');
|
||||||
const minDistanceNode = document.getElementById('min-distance-info');
|
|
||||||
const numClustersNode = document.getElementById('num-clusters');
|
|
||||||
|
|
||||||
const count = 20000;
|
const count = 20000;
|
||||||
const features = new Array(count);
|
const features = new Array(count);
|
||||||
@@ -36,11 +33,6 @@ const clusterSource = new Cluster({
|
|||||||
minDistance: parseInt(minDistanceInput.value, 10),
|
minDistance: parseInt(minDistanceInput.value, 10),
|
||||||
source: source,
|
source: source,
|
||||||
});
|
});
|
||||||
clusterSource.on('change', function (evt) {
|
|
||||||
numClustersNode.innerText = evt.target.features.length;
|
|
||||||
});
|
|
||||||
distanceNode.innerText = clusterSource.getDistance();
|
|
||||||
minDistanceNode.innerText = clusterSource.getMinDistance();
|
|
||||||
|
|
||||||
const styleCache = {};
|
const styleCache = {};
|
||||||
const clusters = new VectorLayer({
|
const clusters = new VectorLayer({
|
||||||
@@ -86,12 +78,10 @@ const map = new Map({
|
|||||||
});
|
});
|
||||||
|
|
||||||
distanceInput.addEventListener('input', function () {
|
distanceInput.addEventListener('input', function () {
|
||||||
distanceNode.innerText = distanceInput.value;
|
|
||||||
clusterSource.setDistance(parseInt(distanceInput.value, 10));
|
clusterSource.setDistance(parseInt(distanceInput.value, 10));
|
||||||
});
|
});
|
||||||
|
|
||||||
minDistanceInput.addEventListener('input', function () {
|
minDistanceInput.addEventListener('input', function () {
|
||||||
minDistanceNode.innerText = minDistanceInput.value;
|
|
||||||
clusterSource.setMinDistance(parseInt(minDistanceInput.value, 10));
|
clusterSource.setMinDistance(parseInt(minDistanceInput.value, 10));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -20,8 +20,13 @@ import {getUid} from '../util.js';
|
|||||||
/**
|
/**
|
||||||
* @typedef {Object} Options
|
* @typedef {Object} Options
|
||||||
* @property {import("./Source.js").AttributionLike} [attributions] Attributions.
|
* @property {import("./Source.js").AttributionLike} [attributions] Attributions.
|
||||||
* @property {number} [distance=20] Distance within which features will be clustered
|
* @property {number} [distance=20] Distance in pixels within which features will
|
||||||
* together.
|
* be clustered together.
|
||||||
|
* @property {number} [minDistance=0] Minimum distance in pixels between clusters.
|
||||||
|
* Will be capped at the configured distance.
|
||||||
|
* By default no minimum distance is guaranteed. This config can be used to avoid
|
||||||
|
* overlapping icons. As a tradoff, the cluster feature's position will no longer be
|
||||||
|
* the center of all its features.
|
||||||
* @property {function(Feature):Point} [geometryFunction]
|
* @property {function(Feature):Point} [geometryFunction]
|
||||||
* Function that takes an {@link module:ol/Feature} as argument and returns an
|
* Function that takes an {@link module:ol/Feature} as argument and returns an
|
||||||
* {@link module:ol/geom/Point} as cluster calculation point for the feature. When a
|
* {@link module:ol/geom/Point} as cluster calculation point for the feature. When a
|
||||||
@@ -35,11 +40,6 @@ import {getUid} from '../util.js';
|
|||||||
* ```
|
* ```
|
||||||
* See {@link module:ol/geom/Polygon~Polygon#getInteriorPoint} for a way to get a cluster
|
* See {@link module:ol/geom/Polygon~Polygon#getInteriorPoint} for a way to get a cluster
|
||||||
* calculation point for polygons.
|
* calculation point for polygons.
|
||||||
* @property {number} [minDistance=0] Minimum distance between clusters. Will be capped
|
|
||||||
* at the configured distance.
|
|
||||||
* By default no minimum distance is guaranteed. This config can be used to avoid
|
|
||||||
* overlapping icons. As a tradoff, the cluster feature's position will no longer be
|
|
||||||
* the center of all its features.
|
|
||||||
* @property {VectorSource} [source] Source.
|
* @property {VectorSource} [source] Source.
|
||||||
* @property {boolean} [wrapX=true] Whether to wrap the world horizontally.
|
* @property {boolean} [wrapX=true] Whether to wrap the world horizontally.
|
||||||
*/
|
*/
|
||||||
@@ -156,10 +156,8 @@ class Cluster extends VectorSource {
|
|||||||
loadFeatures(extent, resolution, projection) {
|
loadFeatures(extent, resolution, projection) {
|
||||||
this.source.loadFeatures(extent, resolution, projection);
|
this.source.loadFeatures(extent, resolution, projection);
|
||||||
if (resolution !== this.resolution) {
|
if (resolution !== this.resolution) {
|
||||||
this.clear();
|
|
||||||
this.resolution = resolution;
|
this.resolution = resolution;
|
||||||
this.cluster();
|
this.refresh();
|
||||||
this.addFeatures(this.features);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -184,7 +182,7 @@ class Cluster extends VectorSource {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* The configured minimum distance between clusters.
|
* The configured minimum distance between clusters.
|
||||||
* @return {number} The minimum distance.
|
* @return {number} The minimum distance in pixels.
|
||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
getMinDistance() {
|
getMinDistance() {
|
||||||
|
|||||||
Reference in New Issue
Block a user