Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Key update

Russ Garrett93759e4ea8fd
diff --git a/web/src/key/key.css b/web/src/key/key.css
index cb80036..58da8d5 100644
--- a/web/src/key/key.css
+++ b/web/src/key/key.css
@@ -53,7 +53,6 @@
}
.oim-key-header {
- width: 100%;
height: 20px;
padding-bottom: 5px;
padding-top: 2px;
diff --git a/web/src/key/key.js b/web/src/key/key.js
index b5d9184..0426001 100644
--- a/web/src/key/key.js
+++ b/web/src/key/key.js
@@ -1,4 +1,4 @@
-import {el, text, mount, list, setStyle} from 'redom';
+import { el, text, mount, list, setStyle } from 'redom';
import {
default as power_layers,
voltage_scale,
@@ -12,9 +12,17 @@ import {
colour_oil,
colour_gas,
} from '../style/style_oim_petroleum.js';
-import {svgLine, svgLineFromLayer, svgRectFromLayer} from './svg.js';
+import {
+ colour_freshwater,
+ colour_wastewater,
+ colour_hotwater,
+ colour_steam
+} from '../style/style_oim_water.js';
+import { svgLine, svgLineFromLayer, svgRectFromLayer } from './svg.js';
import './key.css';
+const line_thickness = 6;
+
class Td {
constructor() {
this.el = el('td');
@@ -40,7 +48,7 @@ class KeyControl {
class: 'maplibregl-ctrl-icon oim-key-control',
});
- this._container = el('div', {class: 'maplibregl-ctrl oim-key-panel'});
+ this._container = el('div', { class: 'maplibregl-ctrl oim-key-panel' });
this.populate();
@@ -65,8 +73,8 @@ class KeyControl {
} else {
cont_style = this._container.getBoundingClientRect();
}
- let height = parseInt(map_style.height) - cont_style.top - 80 + 'px';
- setStyle(this._pane, {'max-height': height});
+ let height = parseInt(map_style.height) - cont_style.top - 100 + 'px';
+ setStyle(this._pane, { 'max-height': height });
}
header() {
@@ -119,9 +127,9 @@ class KeyControl {
rows.push([key, value]);
}
- rows = rows.map(row => [row[0], svgLine(row[1], 4)]);
+ rows = rows.map(row => [row[0], svgLine(row[1], line_thickness)]);
- rows.push(['Underground', svgLine('#7A7A85', 2, '3 2')]);
+ rows.push(['Underground', svgLine('#7A7A85', line_thickness, '3 2')]);
rows.push(['Line Reference', this.sprite('power_line_ref')]);
let table = list('table', Tr);
@@ -155,7 +163,7 @@ class KeyControl {
generatorTable() {
let rows = [
- ['Wind Turbine', this.sprite('power_wind')],
+ ['Wind Turbine', this.sprite('power_wind', 14)],
['Solar Panel', svgRectFromLayer(power_layers, 'power_solar_panel')],
];
let table = list('table', Tr);
@@ -165,10 +173,10 @@ class KeyControl {
towerTable() {
let rows = [
- ['Tower/Pylon', this.sprite('power_tower')],
- ['Transition Tower', this.sprite('power_tower_transition')],
+ ['Tower/Pylon', this.sprite('power_tower', 10)],
+ ['Transition Tower', this.sprite('power_tower_transition', 10)],
['Pole', this.sprite('power_pole', 8)],
- ['Transition Pole', this.sprite('power_pole_transition')],
+ ['Transition Pole', this.sprite('power_pole_transition', 8)],
['Transformer', this.sprite('power_transformer')],
['Switch', this.sprite('power_switch')],
['Compensator', this.sprite('power_compensator')],
@@ -192,8 +200,8 @@ class KeyControl {
petroleumTable() {
let rows = [
- ['Oil Pipeline', svgLine(colour_oil, 2)],
- ['Gas Pipeline', svgLine(colour_gas, 2)],
+ ['Oil Pipeline', svgLine(colour_oil, line_thickness)],
+ ['Gas Pipeline', svgLine(colour_gas, line_thickness)],
[
'Petroleum Facility',
svgRectFromLayer(petroleum_layers, 'petroleum_site'),
@@ -206,7 +214,10 @@ class KeyControl {
waterTable() {
let rows = [
- ['Water Pipeline', svgLineFromLayer(water_layers, 'water_pipeline')],
+ ['Fresh Water', svgLine(colour_freshwater, line_thickness)],
+ ['Hot Water', svgLine(colour_hotwater, line_thickness)],
+ ['Steam', svgLine(colour_steam, line_thickness)],
+ ['Wastewater', svgLine(colour_wastewater, line_thickness)],
];
let table = list('table', Tr);
table.update(rows);
@@ -214,4 +225,4 @@ class KeyControl {
}
}
-export {KeyControl as default};
+export { KeyControl as default };
diff --git a/web/src/key/svg.js b/web/src/key/svg.js
index af64a7e..e59ed08 100644
--- a/web/src/key/svg.js
+++ b/web/src/key/svg.js
@@ -1,4 +1,4 @@
-import {svg, setStyle} from 'redom';
+import { svg, setStyle } from 'redom';
function getLayer(layers, id) {
for (let l of layers) {
@@ -26,7 +26,7 @@ export function svgLine(colour, thickness, dash = '') {
'stroke-dasharray': dash,
});
- return svg('svg', line, {height: height, width: width});
+ return svg('svg', line, { height: height, width: width });
}
export function svgLineFromLayer(layers, name, thickness = 2) {
@@ -54,7 +54,7 @@ export function svgRect(colour, stroke = 'black', opacity = 1) {
opacity: opacity,
});
- return svg('svg', rect, {height: height, width: width});
+ return svg('svg', rect, { height: height, width: width });
}
export function svgRectFromLayer(layers, name) {
diff --git a/web/src/style/style_oim_water.js b/web/src/style/style_oim_water.js
index 4808654..b2713ee 100644
--- a/web/src/style/style_oim_water.js
+++ b/web/src/style/style_oim_water.js
@@ -1,5 +1,10 @@
import { text_paint, operator_text, underground_p, font } from './style_oim_common.js';
+const colour_freshwater = '#7B7CBA';
+const colour_wastewater = '#BAA87B';
+const colour_hotwater = '#AD4C4C';
+const colour_steam = '#7BBAAC';
+
const substance_label = ['match', ['get', 'substance'],
"water", 'Water',
"rainwater", "Rainwater",
@@ -12,13 +17,13 @@ const substance_label = ['match', ['get', 'substance'],
];
const substance_colour = ["match", ["get", "substance"],
- "water", '#7B7CBA',
- "rainwater", "#7B7CBA",
- "hot_water", "#AD4C4C",
- "wastewater", "#BAA87B",
- "sewage", "#BAA87B",
- "waterwaste", "#BAA87B",
- "steam", "#7BBAAC",
+ "water", colour_freshwater,
+ "rainwater", colour_freshwater,
+ "hot_water", colour_hotwater,
+ "wastewater", colour_wastewater,
+ "sewage", colour_wastewater,
+ "waterwaste", colour_wastewater,
+ "steam", colour_steam,
'#7B7CBA'
];
@@ -80,4 +85,4 @@ const layers = [
},
];
-export default layers;
+export { layers as default, colour_freshwater, colour_wastewater, colour_hotwater, colour_steam };