Commit 035fcc4a authored by alain's avatar alain 🐙
Browse files

small adjustment for null value column layer & update dependencies

parent cb4db1f2
......@@ -1024,17 +1024,17 @@
"integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg=="
},
"@deck.gl/aggregation-layers": {
"version": "7.3.6",
"resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-7.3.6.tgz",
"integrity": "sha512-KXfGkm+QwR8Ch2bTFNLt7xFSWAkMzwP6DQJlrDZOIqQSEICbd/n+92LyO1hg0j5CZqjzLfAJkp2pn3Q0mE2yTA==",
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-7.3.7.tgz",
"integrity": "sha512-wZ5PkGI3lWTVWwsImLFOBqWE2GuzBn9rsrR5GmRAaVGuafXQKzaruhlmaAc9T99fvao8Fmb7QRAJeJ6LK6q1YQ==",
"requires": {
"d3-hexbin": "^0.2.1"
}
},
"@deck.gl/core": {
"version": "7.3.6",
"resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-7.3.6.tgz",
"integrity": "sha512-nMXMf547tvuJVxWQUxU5l8NstzdzbrhxL/isw/0qZI91p1EhFx5azAiHcY1xbcAzuAeNUKOtYI//jfa2y5a0kA==",
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/@deck.gl/core/-/core-7.3.7.tgz",
"integrity": "sha512-3uNQ9ic9fcRQu9StbgS4jkd7FckTmMgDGy41C8shuTvsg6rJ34gZtKNGhvJmtQxRIyLPHHJUWUrnS/t5L/IMrQ==",
"requires": {
"@loaders.gl/core": "^1.3.4",
"@loaders.gl/images": "^1.3.4",
......@@ -1049,9 +1049,9 @@
}
},
"@deck.gl/layers": {
"version": "7.3.6",
"resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-7.3.6.tgz",
"integrity": "sha512-w9NItxITOMAlwLVruGmoNXI33UCcei5EyASohoz17ML2z+nNp1c8B6vjmute7WHnZ+CJUeUo2Ay+ABUINc7JXw==",
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/@deck.gl/layers/-/layers-7.3.7.tgz",
"integrity": "sha512-suZMseNHdpNWN5DdQUz/r29/vP/KVYu/iNa4mjid2w/L12tsKCYmEElcnP6fbQTA5xc3E4ej92hjQJ1f3W+avg==",
"requires": {
"@loaders.gl/images": "^1.3.4",
"@mapbox/tiny-sdf": "^1.1.0",
......@@ -1059,14 +1059,14 @@
}
},
"@deck.gl/mapbox": {
"version": "7.3.6",
"resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-7.3.6.tgz",
"integrity": "sha512-22hK1F+Pzpa6ZzhhSAdxcAmmcMyNwzxrPs/K0jhcthCKMWK/Winttt4Hs0CcvENPMUffdnwqsp+fKFjmT5s6HA=="
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-7.3.7.tgz",
"integrity": "sha512-gP6c89uOgKW60u6GCHTJ5EqrXRnXNNP2P1rmLUT4vy2KKZUxz8PKDSXqdftOA/dhBZJaLREFfn8yNPsxxnW0vg=="
},
"@deck.gl/react": {
"version": "7.3.6",
"resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-7.3.6.tgz",
"integrity": "sha512-FfQWkh3QfP+pqTkkxpav/TfXcV6le2FMsHFaWIPKfEWPI5bJYxT/qcifx29BxNb5g97B306kesNZJ8T5YLyDHg==",
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/@deck.gl/react/-/react-7.3.7.tgz",
"integrity": "sha512-V+C0nsf+oXLyH/+ZdL/djMYHlK8efiKlIYIhmbL3KL7X2fP5zaBaweoAJKbYT/A6A9sMXe/yQdxyjE6F0Wjm5A==",
"requires": {
"prop-types": "^15.6.0"
}
......@@ -4418,9 +4418,9 @@
"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
},
"copy-webpack-plugin": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.0.tgz",
"integrity": "sha512-0sNrj/Sx7/cWA0k7CVQa0sdA/dzCybqSb0+GbhKuQdOlAvnAwgC2osmbAFOAfha7ZXnreoQmCq5oDjG3gP4VHw==",
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz",
"integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==",
"dev": true,
"requires": {
"cacache": "^12.0.3",
......
......@@ -53,7 +53,15 @@ class StationLayer extends CompositeLayer {
const radius = radiusScale(zoom) * factor * (count.total > 1 ? 0.5 : 1)
const getHeight = (value, zoom) => {
const renderValue = value > range[1] * 2 ? range[1] / 12 : Math.min(value, range[1])
let renderValue
if(value === null) {
const factor = range[1] / 96
renderValue = factor + factor * Math.random()
} else {
renderValue = value > range[1] * 2 ? range[1] / 12 : Math.min(value, range[1])
}
const elevationScale = (scale === 'log' ? scaleLog(range, [0, heightMaxScale(zoom)]) : scaleLinear(range, [0, heightMaxScale(zoom)]))
return elevationScale(renderValue)
}
......
......@@ -8,7 +8,7 @@ class MapAttributions extends React.Component {
<div className="mapboxgl-ctrl-bottom-right">
<div className="mapboxgl-ctrl mapboxgl-ctrl-attrib">
<div className="mapboxgl-ctrl-attrib-inner">
<span>v. 9/12/2019</span>
<span>v. 12/12/2019</span>
<span><a href="https://waag.org" target="_blank" rel="noopener noreferrer">waag</a></span>
<span>© <a href="http://www.openstreetmap.org/about/" target="_blank" rel="noopener noreferrer">OpenStreetMap</a></span>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment