Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Key component

Russ Garretta674280a6e07
diff --git a/package-lock.json b/package-lock.json
index 16bc7d4..1fcbc95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2622,6 +2622,47 @@
"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
"dev": true
},
+ "copy-webpack-plugin": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.1.tgz",
+ "integrity": "sha512-yMTURAkYZO/6h6pGMbHQl2jpKtRNC+0Cy/4kRRP6qUHmpbGGAzNnyMecE6aHgGFCb4ksrL3YcDqYGb8ds3J9cw==",
+ "dev": true,
+ "requires": {
+ "cacache": "^11.3.1",
+ "find-cache-dir": "^2.0.0",
+ "glob-parent": "^3.1.0",
+ "globby": "^7.1.1",
+ "is-glob": "^4.0.0",
+ "loader-utils": "^1.1.0",
+ "minimatch": "^3.0.4",
+ "normalize-path": "^3.0.0",
+ "p-limit": "^2.1.0",
+ "serialize-javascript": "^1.4.0",
+ "webpack-log": "^2.0.0"
+ },
+ "dependencies": {
+ "globby": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+ "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+ "dev": true,
+ "requires": {
+ "array-union": "^1.0.1",
+ "dir-glob": "^2.0.0",
+ "glob": "^7.1.2",
+ "ignore": "^3.3.5",
+ "pify": "^3.0.0",
+ "slash": "^1.0.0"
+ }
+ },
+ "normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true
+ }
+ }
+ },
"core-js": {
"version": "2.5.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
@@ -2973,6 +3014,15 @@
"randombytes": "^2.0.0"
}
},
+ "dir-glob": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+ "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+ "dev": true,
+ "requires": {
+ "path-type": "^3.0.0"
+ }
+ },
"dns-equal": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
@@ -3710,7 +3760,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -3731,12 +3782,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3751,17 +3804,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -3878,7 +3934,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
@@ -3890,6 +3947,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -3904,6 +3962,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -3911,12 +3970,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -3935,6 +3996,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -4015,7 +4077,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -4027,6 +4090,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
@@ -4112,7 +4176,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -4148,6 +4213,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -4167,6 +4233,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -4210,12 +4277,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
@@ -4276,7 +4345,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
}
}
@@ -4730,6 +4799,12 @@
"integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
"dev": true
},
+ "ignore": {
+ "version": "3.3.10",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+ "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+ "dev": true
+ },
"ignore-walk": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
@@ -6124,6 +6199,15 @@
"integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
"dev": true
},
+ "path-type": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+ "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+ "dev": true,
+ "requires": {
+ "pify": "^3.0.0"
+ }
+ },
"pbf": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/pbf/-/pbf-3.1.0.tgz",
@@ -6951,7 +7035,7 @@
"dependencies": {
"minimist": {
"version": "0.0.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
+ "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.5.tgz",
"integrity": "sha1-16oye87PUY+RBqxrjwA/o7zqhWY="
}
}
@@ -6976,6 +7060,12 @@
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
},
+ "slash": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+ "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+ "dev": true
+ },
"snapdragon": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -7254,7 +7344,7 @@
},
"split": {
"version": "0.2.10",
- "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
+ "resolved": "http://registry.npmjs.org/split/-/split-0.2.10.tgz",
"integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc=",
"requires": {
"through": "2"
@@ -7368,7 +7458,7 @@
},
"readable-stream": {
"version": "1.1.14",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+ "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"requires": {
"core-util-is": "~1.0.0",
diff --git a/package.json b/package.json
index dae2876..87648a0 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"babel-loader": "^8.0.5",
"babel-preset-env": "^1.7.0",
"clean-webpack-plugin": "^0.1.19",
+ "copy-webpack-plugin": "^5.0.1",
"css-loader": "^1.0.1",
"html-webpack-plugin": "^3.2.0",
"spritezero-webpack-plugin": "^0.1.1",
diff --git a/src/index.js b/src/index.js
index c93efc8..0fcb0e2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,6 +6,7 @@ import { mount } from 'redom';
import EditButton from './editbutton.js';
import InfoBox from './infobox.js';
import InfoPopup from './infopopup.js';
+import KeyControl from './key/key.js';
import map_style from './style/style.json';
import style_base from './style/style_base.js';
@@ -61,6 +62,7 @@ function init() {
center: [12, 26]
});
map.addControl(new mapboxgl.NavigationControl(), 'top-right');
+ map.addControl(new KeyControl(), '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.css b/src/key/key.css
new file mode 100644
index 0000000..6ead205
--- /dev/null
+++ b/src/key/key.css
@@ -0,0 +1,75 @@
+.oim-key-control {
+ min-height: 30px;
+ min-width: 30px;
+ background-repeat: no-repeat;
+ background-size: 20px 20px;
+ background-position: center;
+ background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' x='0px' y='0px' viewBox='0 0 64 80' style='enable-background:new 0 0 64 64;' xml:space='preserve'%3E%3Cstyle type='text/css'%3E .st0{fill:none;stroke:%23000000;stroke-width:2;stroke-miterlimit:10;} .st1{fill:none;stroke:%23000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;} .st2{fill:%23231F20;} %3C/style%3E%3Cg%3E%3Cline class='st1' x1='1' y1='60' x2='25' y2='35.563'/%3E%3Cline class='st2' x1='1' y1='60' x2='25' y2='35.563'/%3E%3C/g%3E%3Cg%3E%3Cg%3E%3Cpath class='st0' d='M36.63,37.518c6.907,2.903,15.181,1.542,20.805-4.083c7.42-7.42,7.42-19.45,0-26.87s-19.45-7.42-26.87,0 c-5.569,5.569-6.958,13.734-4.168,20.598L1,53v10c0,0,11,0,11,0l3-3c0,0,0-6.5,0-6.5l6,0c0,0,0-4,0-4c0,0,4,0,4,0c0,0,0-6,0-6l6,0 C31,43.5,36.63,37.518,36.63,37.518z'/%3E%3Cellipse transform='matrix(0.7071 -0.7071 0.7071 0.7071 3.2807 38.8492)' class='st0' cx='48.536' cy='15.464' rx='4' ry='4'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+}
+
+.oim-key-panel {
+ display: none;
+ min-width: 220px;
+ min-height: 300px;
+ margin: 0px 0px 8px 0px !important;
+}
+
+.oim-key-pane {
+ padding-left: 8px;
+ padding-right: 2px;
+ overflow-y: scroll;
+}
+
+.oim-key-pane h3 {
+ margin-top: 0;
+ margin-bottom: 3px;
+ border-bottom: 1px #eee solid;
+ clear: both;
+}
+
+.oim-key-pane table {
+ width: 100%;
+ padding: 0px;
+}
+.oim-key-pane table tr {
+ padding: 0px;
+}
+
+
+.oim-key-pane table td {
+ vertical-align: center;
+}
+
+.oim-key-pane table tr td:nth-child(2) {
+ width: 30px;
+ text-align: center;
+}
+
+
+.oim-plant-sprite {
+ margin-left: auto;
+ margin-right: auto;
+ vertical-align: middle;
+}
+
+.oim-key-header {
+ width: 100%;
+ height: 20px;
+ padding-bottom: 5px;
+ padding-top: 2px;
+ padding-left: 8px;
+ background-color: #eee;
+}
+
+.oim-key-header h2 {
+ margin: 0px;
+ display: inline;
+}
+
+.oim-key-close {
+ padding-right: 14px;
+ float: right;
+ font-weight: bold;
+ font-size: 1.6em;
+ cursor: pointer;
+}
diff --git a/src/key/key.js b/src/key/key.js
new file mode 100644
index 0000000..58af62a
--- /dev/null
+++ b/src/key/key.js
@@ -0,0 +1,216 @@
+import {el, text, mount, list, setStyle} from 'redom';
+import {
+ default as power_layers,
+ voltage_scale,
+ special_voltages,
+ plant_types,
+} from '../style/style_oim_power.js';
+import comms_layers from '../style/style_oim_telecoms.js';
+import water_layers from '../style/style_oim_water.js';
+import {
+ default as petroleum_layers,
+ colour_oil,
+ colour_gas,
+} from '../style/style_oim_petroleum.js';
+import {svgLine, svgLineFromLayer, svgRectFromLayer} from './svg.js';
+import './key.css';
+
+class Td {
+ constructor() {
+ this.el = el('td');
+ }
+ update(data) {
+ if (typeof data != 'object') {
+ this.el.textContent = data;
+ } else if (data === null) {
+ return;
+ } else {
+ mount(this.el, data);
+ }
+ }
+}
+
+const Tr = list.extend('tr', Td);
+
+class KeyControl {
+ onAdd(map) {
+ this._map = map;
+
+ this._control = el('button', {
+ class: 'mapboxgl-ctrl-icon oim-key-control',
+ });
+
+ this._container = el('div', {class: 'mapboxgl-ctrl oim-key-panel'});
+
+ this.populate();
+
+ this._control.onclick = e => {
+ this._container.style.display = 'block';
+ this._control.style.display = 'none';
+ };
+
+ setTimeout(e => this.resize(), 100);
+ this._map.on('resize', e => this.resize());
+ return el('div', this._control, this._container, {
+ class: 'mapboxgl-ctrl mapboxgl-ctrl-group',
+ });
+ }
+
+ resize() {
+ // Set max-height of key depending on window style
+ let map_style = window.getComputedStyle(this._map.getContainer());
+ let cont_style;
+ if (this._control.style.display != 'none') {
+ cont_style = this._control.getBoundingClientRect();
+ } else {
+ cont_style = this._container.getBoundingClientRect();
+ }
+ let height = parseInt(map_style.height) - cont_style.top - 80 + 'px';
+ setStyle(this._pane, {'max-height': height});
+ }
+
+ header() {
+ const close_button = el('.oim-key-close', '×');
+
+ close_button.onclick = e => {
+ this._container.style.display = 'none';
+ this._control.style.display = 'block';
+ };
+ return el('.oim-key-header', el('h2', 'Key'), close_button);
+ }
+
+ populate() {
+ mount(this._container, this.header());
+
+ let pane = el('.oim-key-pane');
+ pane.appendChild(el('h3', 'Power Lines'));
+ mount(pane, this.voltageTable());
+ pane.appendChild(el('h3', 'Power Plants'));
+ mount(pane, this.plantTable());
+ pane.appendChild(el('h3', 'Power Generators'));
+ mount(pane, this.generatorTable());
+ pane.appendChild(el('h3', 'Other Power'));
+ mount(pane, this.towerTable());
+ pane.appendChild(el('h3', 'Telecoms'));
+ mount(pane, this.telecomTable());
+ pane.appendChild(el('h3', 'Petroleum'));
+ mount(pane, this.petroleumTable());
+ pane.appendChild(el('h3', 'Water'));
+ mount(pane, this.waterTable());
+ this._pane = pane;
+
+ mount(this._container, pane);
+ }
+
+ voltageTable() {
+ let rows = [];
+ for (let row of voltage_scale) {
+ let label = row[0];
+ if (label === null) {
+ label = '< 10 kV';
+ } else {
+ label = `≥ ${label} kV`;
+ }
+
+ rows.push([label, row[1]]);
+ }
+
+ for (const [key, value] of Object.entries(special_voltages)) {
+ rows.push([key, value]);
+ }
+
+ rows = rows.map(row => [row[0], svgLine(row[1], 4)]);
+
+ rows.push(['Underground', svgLine('#7A7A85', 2, '3 2')]);
+ rows.push(['Line Reference', this.sprite('power_line_ref')]);
+
+ let table = list('table', Tr);
+ table.update(rows);
+ return table;
+ }
+
+ sprite(name, size = 25) {
+ let spriteDiv = el('img.oim-plant-sprite', {
+ src: `/style/sprites/${name}.svg`,
+ height: size,
+ });
+ setStyle(spriteDiv, {
+ 'max-width': size + 'px',
+ });
+ return spriteDiv;
+ }
+
+ plantTable() {
+ let rows = [];
+ for (const [key, value] of Object.entries(plant_types)) {
+ rows.push([
+ key.charAt(0).toUpperCase() + key.slice(1),
+ this.sprite(value),
+ ]);
+ }
+ let table = list('table', Tr);
+ table.update(rows);
+ return table;
+ }
+
+ generatorTable() {
+ let rows = [
+ ['Wind Turbine', this.sprite('power_wind')],
+ ['Solar Panel', svgRectFromLayer(power_layers, 'power_solar_panel')],
+ ];
+ let table = list('table', Tr);
+ table.update(rows);
+ return table;
+ }
+
+ towerTable() {
+ let rows = [
+ ['Tower/Pylon', this.sprite('power_tower')],
+ ['Transition Tower', this.sprite('power_tower_transition')],
+ ['Pole', this.sprite('power_pole', 8)],
+ ['Transition Pole', this.sprite('power_pole_transition')],
+ ['Transformer', this.sprite('power_transformer')],
+ ['Switch', this.sprite('power_switch')],
+ ['Compensator', this.sprite('power_compensator')],
+ ];
+ let table = list('table', Tr);
+ table.update(rows);
+ return table;
+ }
+
+ telecomTable() {
+ let rows = [
+ ['Cable', svgLineFromLayer(comms_layers, 'communication_line')],
+ ['Tower/Mast', this.sprite('comms_tower')],
+ ['Datacenter/Exchange', svgRectFromLayer(comms_layers, 'data_center')],
+ ];
+ let table = list('table', Tr);
+ table.update(rows);
+ return table;
+ }
+
+ petroleumTable() {
+ let rows = [
+ ['Oil Pipeline', svgLine(colour_oil, 2)],
+ ['Gas Pipeline', svgLine(colour_gas, 2)],
+ [
+ 'Petroleum Facility',
+ svgRectFromLayer(petroleum_layers, 'petroleum_site'),
+ ],
+ ];
+ let table = list('table', Tr);
+ table.update(rows);
+ return table;
+ }
+
+ waterTable() {
+ let rows = [
+ ['Water Pipeline', svgLineFromLayer(water_layers, 'water_pipeline')],
+ ];
+ let table = list('table', Tr);
+ table.update(rows);
+ return table;
+ }
+}
+
+export {KeyControl as default};
diff --git a/src/key/svg.js b/src/key/svg.js
new file mode 100644
index 0000000..af64a7e
--- /dev/null
+++ b/src/key/svg.js
@@ -0,0 +1,72 @@
+import {svg, setStyle} from 'redom';
+
+function getLayer(layers, id) {
+ for (let l of layers) {
+ if (l['id'] == id) {
+ return l;
+ }
+ }
+ return null;
+}
+
+export function svgLine(colour, thickness, dash = '') {
+ const height = 15;
+ const width = 30;
+
+ let line = svg('line', {
+ x1: 0,
+ y1: height / 2,
+ x2: width,
+ y2: height / 2,
+ });
+
+ setStyle(line, {
+ stroke: colour,
+ 'stroke-width': thickness,
+ 'stroke-dasharray': dash,
+ });
+
+ return svg('svg', line, {height: height, width: width});
+}
+
+export function svgLineFromLayer(layers, name, thickness = 2) {
+ let layer = getLayer(layers, name);
+ let dasharray = '';
+ if (layer['paint']['line-dasharray']) {
+ dasharray = layer['paint']['line-dasharray'].join(' ');
+ }
+ return svgLine(layer['paint']['line-color'], thickness, dasharray);
+}
+
+export function svgRect(colour, stroke = 'black', opacity = 1) {
+ const height = 15;
+ const width = 30;
+
+ let rect = svg('rect', {
+ width: width,
+ height: height,
+ });
+
+ setStyle(rect, {
+ fill: colour,
+ stroke: stroke,
+ 'stroke-width': 1,
+ opacity: opacity,
+ });
+
+ return svg('svg', rect, {height: height, width: width});
+}
+
+export function svgRectFromLayer(layers, name) {
+ let layer = getLayer(layers, name);
+ let dasharray = '';
+ let opacity = 1;
+ let outline_color = '';
+ if (layer['paint']['fill-opacity']) {
+ opacity = layer['paint']['fill-opacity'];
+ }
+ if (layer['paint']['fill-outline-color']) {
+ outline_color = layer['paint']['fill-outline-color'];
+ }
+ return svgRect(layer['paint']['fill-color'], outline_color, opacity);
+}
diff --git a/src/style/style_oim_petroleum.js b/src/style/style_oim_petroleum.js
index c7e2000..d218b77 100644
--- a/src/style/style_oim_petroleum.js
+++ b/src/style/style_oim_petroleum.js
@@ -138,4 +138,4 @@ const layers = [
},
];
-export default layers;
+export {layers as default, colour_gas, colour_oil};
diff --git a/src/style/style_oim_power.js b/src/style/style_oim_power.js
index d9fdeb5..c242966 100644
--- a/src/style/style_oim_power.js
+++ b/src/style/style_oim_power.js
@@ -1,6 +1,36 @@
import {text_paint, underground_p} from './style_oim_common.js';
// OpenInfraMap layers
+const voltage_scale = [
+ [null, '#7A7A85'],
+ [10, '#6E97B8'],
+ [25, '#55B555'],
+ [52, '#B59F10'],
+ [132, '#B55D00'],
+ [220, '#C73030'],
+ [330, '#B54EB2'],
+ [550, '#00C1CF']
+]
+
+const special_voltages = {
+ 'HVDC': '#4E01B5',
+ 'Traction (<50 Hz)': '#A8B596'
+}
+
+const plant_types = {
+ coal: 'power_plant_coal',
+ geothermal: 'power_plant_geothermal',
+ hydro: 'power_plant_hydro',
+ nuclear: 'power_plant_nuclear',
+ oil: 'power_plant_oilgas',
+ gas: 'power_plant_oilgas',
+ solar: 'power_plant_solar',
+ wind: 'power_plant_wind',
+ biomass: 'power_plant_biomass',
+ waste: 'power_plant_waste',
+ battery: 'power_plant_battery',
+}
+
// === Frequency predicates
const traction_freq_p = ["all",
['has', 'frequency'],
@@ -18,20 +48,20 @@ const hvdc_p = ["all",
// Stepwise function to assign colour by voltage:
function voltage_color(field) {
+ let voltage_func = ['step', ["coalesce", ['get', field], 0]]
+ for (let row of voltage_scale) {
+ if (row[0] == null) {
+ voltage_func.push(row[1])
+ continue;
+ }
+ voltage_func.push(row[0] - 0.01);
+ voltage_func.push(row[1]);
+ }
+
return ["case",
- hvdc_p, '#4E01B5', // HVDC (frequency == 0)
- traction_freq_p, '#A8B596', // Traction power
- ['step',
- ["coalesce", ['get', field], 0],
- '#7A7A85',
- 9.9, '#6E97B8',
- 24.1, '#55B555',
- 52.1, '#B59F10',
- 123.1, '#B55D00',
- 219.9, '#C73030',
- 300.1, '#B54EB2',
- 500.1, '#00C1CF'
- ]
+ hvdc_p, special_voltages['HVDC'], // HVDC (frequency == 0)
+ traction_freq_p, special_voltages['Traction (<50 Hz)'], // Traction power
+ voltage_func
]
}
@@ -194,21 +224,14 @@ const plant_label_visible_p = ["any",
[">", ['zoom'], 10]
];
-const plant_image = ["match",
- ['get', 'source'],
- 'coal', 'power_plant_coal',
- 'geothermal', 'power_plant_geothermal',
- 'hydro', 'power_plant_hydro',
- 'nuclear', 'power_plant_nuclear',
- 'oil', 'power_plant_oilgas',
- 'gas', 'power_plant_oilgas',
- 'solar', 'power_plant_solar',
- 'wind', 'power_plant_wind',
- 'biomass', 'power_plant_biomass',
- 'waste', 'power_plant_waste',
- 'battery', 'power_plant_battery',
- 'power_plant'
-];
+function plant_image() {
+ let expr = ["match", ['get', 'source']]
+ for (const [key, value] of Object.entries(plant_types)) {
+ expr.push(key, value);
+ }
+ expr.push('power_plant'); // default
+ return expr;
+}
const freq = ["case",
hvdc_p, " DC",
@@ -677,7 +700,7 @@ const layers = [
maxzoom: 24,
layout: {
'symbol-z-order': 'source',
- 'icon-image': plant_image,
+ 'icon-image': plant_image(),
'icon-size': ["interpolate", ["linear"], ["zoom"],
6, 0.6,
10, 0.8,
@@ -712,4 +735,4 @@ const layers = [
},
];
-export default layers;
+export {layers as default, voltage_scale, special_voltages, plant_types};
diff --git a/webpack.common.js b/webpack.common.js
index cc48cad..2a60ced 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -2,6 +2,7 @@ const path = require('path');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const SpritezeroWebpackPlugin = require('spritezero-webpack-plugin');
+const CopyPlugin = require('copy-webpack-plugin');
module.exports = {
entry: './src/index.js',
@@ -24,6 +25,9 @@ module.exports = {
}),
new SpritezeroWebpackPlugin({
source: 'sprites/*.svg'
- })
+ }),
+ new CopyPlugin([
+ {from: 'sprites', to: 'style/sprites'}
+ ]),
],
};