jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Basic Choropleth tests

Browse source
This commit is contained in:
Yohan Boniface 2023-07-03 18:26:22 +02:00
parent 125aa72785
commit 82bb017b23
3 changed files with 247 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
umap/static/umap/js/umap.layer.js
View file

@ -146,16 +146,16 @@ L.U.Layer.Choropleth = L.FeatureGroup.extend({
const fillColor = this.datalayer.getOption('fillColor') || this.defaults.fillColor
this.options.colors = chroma
.scale(this.datalayer.options.choropleth.brewer || ['white', fillColor])
.colors(this.options.limits.length)
.colors(this.options.limits.length - 1)
},
getColor: function (feature) {
if (!feature) return // FIXME shold not happen
const featureValue = this._getValue(feature)
// Find the bucket/step/limit that this value is less than and give it that color
for (let i = 0; i < this.options.limits.length; i++) {
for (let i = 1; i < this.options.limits.length; i++) {
if (featureValue <= this.options.limits[i]) {
return this.options.colors[i]
return this.options.colors[i - 1]
}
}
},

242
umap/static/umap/test/Choropleth.js Normal file
View file

@ -0,0 +1,242 @@
const POLYGONS = {
_umap_options: defaultDatalayerData(),
type: 'FeatureCollection',
features: [
{
type: 'Feature',
properties: {
name: 'number 1',
value: 45,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[0, 49],
[-2, 47],
[1, 46],
[3, 47],
[0, 49],
],
],
},
},
{
type: 'Feature',
properties: {
name: 'number 2',
value: 87,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[0, 49],
[2, 50],
[6, 49],
[4, 47],
[0, 49],
],
],
},
},
{
type: 'Feature',
properties: {
name: 'number 3',
value: 673,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[4, 47],
[6, 49],
[11, 47],
[9, 45],
[4, 47],
],
],
},
},
{
type: 'Feature',
properties: {
name: 'number 4',
value: 674,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[2, 46],
[4, 47],
[8, 45],
[6, 43],
[2, 46],
],
],
},
},
{
type: 'Feature',
properties: {
name: 'number 5',
value: 839,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[-2, 47],
[1, 46],
[0, 44],
[-4, 45],
[-2, 47],
],
],
},
},
{
type: 'Feature',
properties: {
name: 'number 6',
value: 3829,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[1, 45],
[5, 43],
[4, 42],
[0, 44],
[1, 45],
],
],
},
},
{
type: 'Feature',
properties: {
name: 'number 7',
value: 4900,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[9, 45],
[12, 47],
[15, 45],
[13, 43],
[9, 45],
],
],
},
},
{
type: 'Feature',
properties: {
name: 'number 8',
value: 4988,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[7, 43],
[9, 45],
[12, 43],
[10, 42],
[7, 43],
],
],
},
},
{
type: 'Feature',
properties: {
name: 'number 9',
value: 9898,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[4, 42],
[6, 43],
[9, 41],
[7, 40],
[4, 42],
],
],
},
},
],
}
describe('L.U.Choropleth', function () {
let path = '/map/99/datalayer/edit/62/',
poly1,
poly4,
poly9
before(function () {
this.server = sinon.fakeServer.create()
this.server.respondWith(/\/datalayer\/62\/\?.*/, JSON.stringify(POLYGONS))
this.map = initMap({ umap_id: 99 })
this.datalayer = this.map.getDataLayerByUmapId(62)
this.server.respond()
enableEdit()
this.datalayer.eachLayer(function (layer) {
if (layer.properties.name === 'number 1') {
poly1 = layer
} else if (layer.properties.name === 'number 4') {
poly4 = layer
} else if (layer.properties.name === 'number 9') {
poly9 = layer
}
})
})
after(function () {
this.server.restore()
//resetMap()
})
describe('#init()', function () {
it('datalayer should have 9 features', function () {
assert.equal(this.datalayer._index.length, 9)
})
})
describe('#compute()', function () {
it('choropleth should compute default colors', function () {
this.datalayer.options.type = 'Choropleth'
this.datalayer.options.choropleth = {
property: 'value',
}
this.datalayer.resetLayer()
DATALAYER = this.datalayer
// Does not pass because chroma-js seems to have rounding issues
//assert.deepEqual(this.datalayer.layer.options.limits, [45, 438.6, 707.0, 3231.0, 4935.2, 9898])
assert.equal(poly1._path.attributes.fill.value, '#ffffff')
assert.equal(poly4._path.attributes.fill.value, '#ffbfbf')
assert.equal(poly9._path.attributes.fill.value, '#ff0000')
})
it('choropleth should compute brewer colors', function () {
this.datalayer.options.choropleth.brewer = 'Blues'
this.datalayer.resetLayer(true)
DATALAYER = this.datalayer
assert.equal(poly1._path.attributes.fill.value, '#f7fbff')
assert.equal(poly4._path.attributes.fill.value, '#c6dbef')
assert.equal(poly9._path.attributes.fill.value, '#08306b')
})
it('choropleth should allow to change steps', function () {
this.datalayer.options.choropleth.steps = 6
this.datalayer.resetLayer(true)
assert.equal(poly1._path.attributes.fill.value, '#f7fbff')
assert.equal(poly4._path.attributes.fill.value, '#94c4df')
assert.equal(poly9._path.attributes.fill.value, '#08306b')
})
})
})

2
umap/static/umap/test/index.html
View file

@ -25,6 +25,7 @@
<script src="../vendors/dompurify/purify.js"></script>
<script src="../vendors/togpx/togpx.js"></script>
<script src="../vendors/tokml/tokml.js"></script>
<script src="../vendors/chroma/chroma.min.js"></script>
<script src="../js/umap.core.js"></script>
<script src="../js/umap.autocomplete.js"></script>
<script src="../js/umap.popup.js"></script>
@ -82,6 +83,7 @@
<script src="./Util.js"></script>
<script src="./Controls.js"></script>
<script src="./Permissions.js"></script>
<script src="./Choropleth.js"></script>
<style type="text/css">
#mocha {
position: absolute;