Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
Heatmap and layer switcher
Russ Garrett15b907ed5d61
diff --git a/src/index.js b/src/index.jsindex da568a2..d028b3e 100644--- a/src/index.js+++ b/src/index.js@@ -7,10 +7,12 @@ import EditButton from './editbutton.js';import InfoBox from './infobox.js';import InfoPopup from './infopopup.js';import KeyControl from './key/key.js';+import LayerSwitcher from './layerswitcher.js';import map_style from './style/style.json';import style_base from './style/style_base.js';import style_oim_power from './style/style_oim_power.js';+import style_oim_power_heatmap from './style/style_oim_power_heatmap.js';import style_oim_telecoms from './style/style_oim_telecoms.js';import style_oim_petroleum from './style/style_oim_petroleum.js';import style_oim_water from './style/style_oim_water.js';@@ -27,6 +29,7 @@ function init() {}var oim_layers = style_oim_power.concat(+ style_oim_power_heatmap,style_oim_petroleum,style_oim_telecoms,style_oim_water,@@ -38,6 +41,16 @@ function init() {return 0;});+ const layers = {+ 'Power': 'power_',+ 'Solar Generation': 'heatmap_',+ 'Telecoms': 'telecoms_',+ 'Petroleum': 'petroleum_',+ 'Water': 'water_',+ };+ const layers_enabled = ['Power', 'Telecoms', 'Petroleum', 'Water'];+ const layer_switcher = new LayerSwitcher(layers, layers_enabled);+map_style.layers = style_base.concat(oim_layers);if (DEV) {@@ -64,8 +77,8 @@ function init() {}),);map.addControl(new KeyControl(), 'top-right');+ map.addControl(layer_switcher, 'top-right');map.addControl(new EditButton(), 'bottom-right');-new InfoPopup(oim_layers.map(layer => layer['id']), 9).add(map);}diff --git a/src/key/key.js b/src/key/key.jsindex 58af62a..fc8b6c7 100644--- a/src/key/key.js+++ b/src/key/key.js@@ -180,9 +180,9 @@ class KeyControl {telecomTable() {let rows = [- ['Cable', svgLineFromLayer(comms_layers, 'communication_line')],+ ['Cable', svgLineFromLayer(comms_layers, 'telecoms_line')],['Tower/Mast', this.sprite('comms_tower')],- ['Datacenter/Exchange', svgRectFromLayer(comms_layers, 'data_center')],+ ['Datacenter/Exchange', svgRectFromLayer(comms_layers, 'telecoms_data_center')],];let table = list('table', Tr);table.update(rows);diff --git a/src/layerswitcher.css b/src/layerswitcher.cssnew file mode 100644index 0000000..9276337--- /dev/null+++ b/src/layerswitcher.css@@ -0,0 +1,34 @@+.layer-switcher {+ min-height: 30px;+ min-width: 30px;+ background: url('data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%228%22%20height%3D%228%22%20viewBox%3D%220%200%208%208%22%3E%0A%20%20%3Cpath%20d%3D%22M0%200v4h4v-4h-4zm5%202v3h-3v1h4v-4h-1zm2%202v3h-3v1h4v-4h-1z%22%20/%3E%0A%3C/svg%3E')+ white;+ background-repeat: no-repeat;+ background-size: 15px 15px;+ background-position: center;+}++.layer-switcher-list {+ background: white;+ padding-left: 8px;+ padding-right: 8px;+ position: relative;+ display: none;+ margin: 0 !important;+}++.layer-switcher-list h3 {+ margin: 0px;+ margin-top: 3px;+}++.layer-switcher-list ul {+ list-style: none;+ padding: 0;+ user-select: none;+}++.layer-switcher-list input {+ margin: 0;+ margin-right: 5px;+}diff --git a/src/layerswitcher.js b/src/layerswitcher.jsnew file mode 100644index 0000000..ec40c30--- /dev/null+++ b/src/layerswitcher.js@@ -0,0 +1,101 @@+import {el, text} from 'redom';+import './layerswitcher.css';++class LayerSwitcher {+ constructor(layers, visible = []) {+ this._layers = layers;+ this._visible = visible;+ this._container = el('div', {class: 'mapboxgl-ctrl layer-switcher-list'});+ this._container.appendChild(el('h3', 'Layers'));+ }++ _updateVisibility() {+ var layers = this._map.getStyle().layers;+ for (let layer of layers) {+ let name = layer['id'];+ for (let layer_name in this._layers) {+ let pref = this._layers[layer_name];+ if (name.startsWith(pref)) {+ if (this._visible.includes(layer_name)) {+ this._map.setLayoutProperty(name, 'visibility', 'visible');+ } else {+ this._map.setLayoutProperty(name, 'visibility', 'none');+ }+ }+ }+ }+ }++ setInitialVisibility(style) {+ /**+ * Modify a map style before adding to the map to set initial visibility states.+ * This prevents flash-of-invisible-layers.+ */+ for (let layer of style['layers']) {+ for (let layer_name in this._layers) {+ let pref = this._layers[layer_name];+ if (+ layer['id'].startsWith(pref) &&+ !this._visible.includes(layer['id'])+ ) {+ if (!('layout' in layer)) {+ layer['layout'] = {};+ }+ layer['layout']['visibility'] = 'none';+ }+ }+ }+ }++ onAdd(map) {+ this._map = map;+ if (map.isStyleLoaded()) {+ this._updateVisibility();+ } else {+ map.on('load', () => {+ this._updateVisibility();+ });+ }+ this._createList();++ const wrapper = el('div', {+ class: 'mapboxgl-ctrl mapboxgl-ctrl-group layer-switcher',+ });+ wrapper.appendChild(this._container);+ wrapper.onmouseover = e => {+ this._container.style.display = 'block';+ };+ wrapper.onmouseout = e => {+ this._container.style.display = 'none';+ };+ return wrapper;+ }++ _createList() {+ var list = el('ul');+ var i = 0;+ for (let name in this._layers) {+ let checkbox = el('input', {+ type: 'checkbox',+ id: 'layer' + i,+ checked: this._visible.includes(name),+ });+ let label = el('label', name, {for: 'layer' + i});++ checkbox.onchange = e => {+ if (e.target.checked) {+ this._visible.push(name);+ } else {+ this._visible = this._visible.filter(item => item !== name);+ }+ this._updateVisibility();+ };++ list.appendChild(el('li', [checkbox, label]));+ i++;+ }+ this._container.appendChild(list);+ }+}++export {LayerSwitcher as default};diff --git a/src/style/style_oim_power_heatmap.js b/src/style/style_oim_power_heatmap.jsnew file mode 100644index 0000000..862ce20--- /dev/null+++ b/src/style/style_oim_power_heatmap.js@@ -0,0 +1,56 @@++const generator_weight = ['interpolate',+ ['linear'],+ ['get', 'output'],+ 0, 0,+ 30, 0.25,+ 250, 0.5,+ 1000, 0.7,+ 2000, 1+];++const layers = [+ {+ zorder: 162,+ id: 'heatmap_solar',+ type: 'heatmap',+ source: 'openinframap',+ 'source-layer': 'power_heatmap_solar',+ minzoom: 1,+ maxzoom: 13,+ paint: {+ 'heatmap-weight': generator_weight,+ 'heatmap-intensity': 1,//['interpolate', ['linear'], ['zoom'], 2, 2, 10, 1],+ 'heatmap-color': [+ 'interpolate',+ ['linear'],+ ['heatmap-density'],+ 0,+ 'rgba(255,255,204,0)',+ 0.1,+ 'rgb(255,237,160)',+ 0.2,+ 'rgb(254,217,118)',+ 0.3,+ 'rgb(254,178,76)',+ 0.45,+ 'rgb(253,141,60)',+ 0.55,+ 'rgb(252,78,42)',+ 0.7,+ 'rgb(227,26,28)',+ 0.9,+ 'rgb(189,0,38)',+ 1,+ 'rgb(128,0,38)',+ ],+ // Adjust the heatmap radius by zoom level+ 'heatmap-radius': ['interpolate', ['linear'], ['zoom'], 2, 2, 12, 10],+ },+ layout: {+ 'visibility': 'none'+ },+ },+];++export {layers as default};diff --git a/src/style/style_oim_telecoms.js b/src/style/style_oim_telecoms.jsindex f957952..7b96116 100644--- a/src/style/style_oim_telecoms.js+++ b/src/style/style_oim_telecoms.js@@ -3,7 +3,7 @@ import {text_paint, operator_text} from './style_oim_common.js';const layers = [{zorder: 40,- id: 'communication_line',+ id: 'telecoms_line',type: 'line',source: 'openinframap',minzoom: 3,@@ -19,7 +19,7 @@ const layers = [},{zorder: 140,- id: 'data_center',+ id: 'telecoms_data_center',type: 'fill',source: 'openinframap',minzoom: 10,@@ -32,7 +32,7 @@ const layers = [},{zorder: 141,- id: 'mast',+ id: 'telecoms_mast',type: 'symbol',source: 'openinframap',minzoom: 10,@@ -64,7 +64,7 @@ const layers = [},},{- id: 'data_center_symbol',+ id: 'telecoms_data_center_symbol',type: 'symbol',source: 'openinframap',minzoom: 11,@@ -84,7 +84,7 @@ const layers = [},},{- id: 'communication_line_label',+ id: 'telecoms_line_label',type: 'symbol',source: 'openinframap',minzoom: 9,