Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

More items for water layer

Russ Garrett47bb498d1a81
diff --git a/web/src/friendlynames.ts b/web/src/friendlynames.ts
index e3b662e..bf05358 100644
--- a/web/src/friendlynames.ts
+++ b/web/src/friendlynames.ts
@@ -22,7 +22,10 @@ const friendlyNames: { [key: string]: string } = {
telecoms_data_center: 'Telecoms building',
petroleum_pipeline: 'Pipeline',
petroleum_well: 'Well',
- water_pipeline: 'Water pipeline'
+ water_pipeline: 'Water pipeline',
+ water_sewage_treatment_plant: 'Sewage treatment plant',
+ water_treatment_plant: 'Water treatment plant',
+ water_pumping_station: 'Pumping station'
}
export default friendlyNames
diff --git a/web/src/icons/sewage_treatment_plant.svg b/web/src/icons/sewage_treatment_plant.svg
new file mode 100644
index 0000000..591481a
--- /dev/null
+++ b/web/src/icons/sewage_treatment_plant.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
+ <g transform="matrix(0.719383,0.629349,-0.629349,0.719383,44.739,-19.8423)">
+ <circle cx="52.255" cy="51.371" r="48.629" style="fill:rgb(193,150,83);stroke:black;stroke-width:6.54px;"/>
+ </g>
+ <g transform="matrix(0.752634,0.658439,-0.658439,0.752634,47.4466,-23.0186)">
+ <path d="M50,96.48L50,52.275" style="fill:none;stroke:black;stroke-width:10.42px;"/>
+ </g>
+</svg>
diff --git a/web/src/icons/water_pumping_station.svg b/web/src/icons/water_pumping_station.svg
new file mode 100644
index 0000000..248a3a6
--- /dev/null
+++ b/web/src/icons/water_pumping_station.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
+ <g transform="matrix(6.12323e-17,1,-1,6.12323e-17,100.687,-0.928587)">
+ <circle cx="50.929" cy="50.687" r="46.602" style="fill:rgb(235,235,235);stroke:black;stroke-width:4.17px;"/>
+ </g>
+ <g transform="matrix(5.85927e-17,0.956892,-1.2889,7.89221e-17,101.867,1.26687)">
+ <path d="M4.327,50L50.929,4.085L97.53,50" style="fill:rgb(235,235,235);fill-opacity:0;stroke:black;stroke-width:3.67px;"/>
+ </g>
+</svg>
diff --git a/web/src/icons/water_treatment_plant.svg b/web/src/icons/water_treatment_plant.svg
new file mode 100644
index 0000000..dc04f2d
--- /dev/null
+++ b/web/src/icons/water_treatment_plant.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
+ <g transform="matrix(1.42098,0,0,0.992483,-45.9548,1.87542)">
+ <path d="M67.527,2.382C67.527,2.382 46.271,45.658 46.271,64.205C46.271,80.978 55.796,94.596 67.527,94.596C79.259,94.596 88.783,80.978 88.783,64.205C88.783,45.658 67.527,2.382 67.527,2.382Z" style="fill:rgb(123,186,172);stroke:black;stroke-width:5.1px;"/>
+ </g>
+</svg>
diff --git a/web/src/index.ts b/web/src/index.ts
index 25a4500..0219818 100644
--- a/web/src/index.ts
+++ b/web/src/index.ts
@@ -61,7 +61,9 @@ function init() {
]
oim_layers.sort((a, b) => {
- if (!a.zorder || !b.zorder) return 0
+ if (!a.zorder || !b.zorder) {
+ throw new Error('zorder is required for all layers')
+ }
if (a.zorder < b.zorder) return -1
if (a.zorder > b.zorder) return 1
return 0
diff --git a/web/src/key/key.ts b/web/src/key/key.ts
index e28360d..1b1de7e 100644
--- a/web/src/key/key.ts
+++ b/web/src/key/key.ts
@@ -126,7 +126,7 @@ class KeyControl implements IControl {
pane.appendChild(el('h3', 'Petroleum'))
mount(pane, this.petroleumTable())
pane.appendChild(el('h3', 'Water'))
- mount(pane, this.waterTable())
+ mount(pane, await this.waterTable())
this._pane = pane
mount(this._container, pane)
@@ -233,12 +233,15 @@ class KeyControl implements IControl {
return table
}
- waterTable() {
+ async waterTable() {
const rows = [
['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)]
+ ['Wastewater', svgLine(colour_wastewater, line_thickness)],
+ ['Water Treatment Plant', await this.sprite('water_treatment_plant')],
+ ['Sewage Treatment Plant', await this.sprite('sewage_treatment_plant')],
+ ['Pumping Station', await this.sprite('water_pumping_station')]
]
const table = list('table', Tr)
table.update(rows)
diff --git a/web/src/style/style.ts b/web/src/style/style.ts
index 61c0c26..ca8fa8d 100644
--- a/web/src/style/style.ts
+++ b/web/src/style/style.ts
@@ -1,5 +1,8 @@
import { StyleSpecification } from 'maplibre-gl'
+const oim_attribution =
+ '<a href="https://www.openstreetmap.org/copyright">© OpenStreetMap contributors</a>, <a href="https://openinframap.org/copyright">OpenInfraMap</a>'
+
const style: StyleSpecification = {
version: 8,
name: 'OpenInfraMap',
@@ -28,13 +31,35 @@ const style: StyleSpecification = {
maxzoom: 14,
attribution: '<a href="https://openmaptiles.org/">© OpenMapTiles</a>'
},
- openinframap: {
+ power: {
+ type: 'vector',
+ tiles: ['https://openinframap.org/map/power/{z}/{x}/{y}.pbf'],
+ maxzoom: 17,
+ attribution: oim_attribution
+ },
+ petroleum: {
+ type: 'vector',
+ tiles: ['https://openinframap.org/map/petroleum/{z}/{x}/{y}.pbf'],
+ maxzoom: 17,
+ attribution: oim_attribution
+ },
+ telecoms: {
+ type: 'vector',
+ tiles: ['https://openinframap.org/map/telecoms/{z}/{x}/{y}.pbf'],
+ maxzoom: 17,
+ attribution: oim_attribution
+ },
+ water: {
type: 'vector',
- url: '/map.json'
+ tiles: ['https://openinframap.org/map/water/{z}/{x}/{y}.pbf'],
+ maxzoom: 17,
+ attribution: oim_attribution
},
solar_heatmap: {
type: 'vector',
- url: '/heatmap.json'
+ tiles: ['https://openinframap.org/map/solar_heatmap/{z}/{x}/{y}.pbf'],
+ maxzoom: 17,
+ attribution: oim_attribution
}
},
glyphs: '/fonts/{fontstack}/{range}.pbf',
diff --git a/web/src/style/style_oim_petroleum.ts b/web/src/style/style_oim_petroleum.ts
index 3a19234..e54bea0 100644
--- a/web/src/style/style_oim_petroleum.ts
+++ b/web/src/style/style_oim_petroleum.ts
@@ -43,10 +43,10 @@ const pipeline_label: ExpressionSpecification = [
const layers: LayerSpecificationWithZIndex[] = [
{
- zorder: 0,
+ zorder: 1,
id: 'petroleum_pipeline_case',
type: 'line',
- source: 'openinframap',
+ source: 'petroleum',
minzoom: 7,
'source-layer': 'petroleum_pipeline',
paint: {
@@ -67,10 +67,10 @@ const layers: LayerSpecificationWithZIndex[] = [
}
},
{
- zorder: 1,
+ zorder: 2,
id: 'petroleum_pipeline',
type: 'line',
- source: 'openinframap',
+ source: 'petroleum',
minzoom: 2,
'source-layer': 'petroleum_pipeline',
paint: {
@@ -90,7 +90,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 100,
id: 'petroleum_site',
type: 'fill',
- source: 'openinframap',
+ source: 'petroleum',
minzoom: 8,
'source-layer': 'petroleum_site',
paint: {
@@ -103,7 +103,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 101,
id: 'petroleum_well',
type: 'circle',
- source: 'openinframap',
+ source: 'petroleum',
minzoom: 10,
'source-layer': 'petroleum_well',
paint: {
@@ -117,7 +117,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 500,
id: 'petroleum_pipeline_label',
type: 'symbol',
- source: 'openinframap',
+ source: 'petroleum',
'source-layer': 'petroleum_pipeline',
minzoom: 12,
paint: text_paint,
@@ -135,7 +135,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 501,
id: 'petroleum_site_label',
type: 'symbol',
- source: 'openinframap',
+ source: 'petroleum',
'source-layer': 'petroleum_site',
minzoom: 12,
layout: {
@@ -151,7 +151,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 502,
id: 'petroleum_well_label',
type: 'symbol',
- source: 'openinframap',
+ source: 'petroleum',
'source-layer': 'petroleum_well',
minzoom: 13,
layout: {
diff --git a/web/src/style/style_oim_power.ts b/web/src/style/style_oim_power.ts
index e3acde3..a69cf75 100644
--- a/web/src/style/style_oim_power.ts
+++ b/web/src/style/style_oim_power.ts
@@ -321,7 +321,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 60,
id: 'power_line_case',
type: 'line',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
filter: ['==', ['get', 'tunnel'], true],
minzoom: 12,
@@ -340,7 +340,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_line_underground_1',
type: 'line',
filter: ['all', underground_p, power_visible_p],
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
minzoom: 0,
paint: {
@@ -360,7 +360,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_line_underground_2',
type: 'line',
filter: ['all', underground_p, power_visible_p, ['has', 'voltage_2']],
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
minzoom: multi_voltage_min_zoom,
paint: {
@@ -380,7 +380,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_line_underground_3',
type: 'line',
filter: ['all', underground_p, power_visible_p, ['has', 'voltage_3']],
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
minzoom: multi_voltage_min_zoom,
paint: {
@@ -399,7 +399,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 160,
id: 'power_plant',
type: 'fill',
- source: 'openinframap',
+ source: 'power',
minzoom: 5,
'source-layer': 'power_plant',
paint: {
@@ -411,7 +411,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_plant_outline',
type: 'line',
filter: ['!', construction_p],
- source: 'openinframap',
+ source: 'power',
minzoom: 8,
'source-layer': 'power_plant',
paint: {
@@ -428,7 +428,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_plant_outline_construction',
type: 'line',
filter: construction_p,
- source: 'openinframap',
+ source: 'power',
minzoom: 8,
'source-layer': 'power_plant',
paint: {
@@ -446,7 +446,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_substation',
type: 'fill',
filter: substation_visible_p,
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_substation',
minzoom: 13,
paint: {
@@ -459,7 +459,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 162,
id: 'power_solar_panel',
type: 'fill',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_generator_area',
filter: ['==', ['get', 'source'], 'solar'],
minzoom: 13,
@@ -472,7 +472,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 260,
id: 'power_line_1',
type: 'line',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
filter: ['all', ['!', underground_p], power_visible_p],
minzoom: 0,
@@ -491,7 +491,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 260,
id: 'power_line_2',
type: 'line',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
filter: ['all', ['!', underground_p], power_visible_p, ['has', 'voltage_2']],
minzoom: multi_voltage_min_zoom,
@@ -510,7 +510,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 260,
id: 'power_line_3',
type: 'line',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
filter: ['all', ['!', underground_p], power_visible_p, ['has', 'voltage_3']],
minzoom: multi_voltage_min_zoom,
@@ -529,7 +529,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 261,
id: 'power_transformer',
type: 'symbol',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_transformer',
minzoom: 14,
paint: text_paint,
@@ -541,7 +541,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 262,
id: 'power_compensator',
type: 'symbol',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_compensator',
minzoom: 14,
paint: text_paint,
@@ -553,7 +553,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 263,
id: 'power_switch',
type: 'symbol',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_switch',
minzoom: 14,
paint: text_paint,
@@ -566,7 +566,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_tower',
type: 'symbol',
filter: ['==', ['get', 'type'], 'tower'],
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_tower',
minzoom: 13,
paint: text_paint,
@@ -606,7 +606,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_pole',
type: 'symbol',
filter: ['==', ['get', 'type'], 'pole'],
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_tower',
minzoom: 13,
paint: text_paint,
@@ -645,7 +645,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 266,
id: 'power_wind_turbine',
type: 'symbol',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_generator',
filter: ['==', ['get', 'source'], 'wind'],
minzoom: 11,
@@ -665,7 +665,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 267,
id: 'power_wind_turbine_point',
type: 'circle',
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_generator',
//['all',
filter: ['==', ['get', 'source'], 'wind'],
@@ -684,7 +684,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_substation_point',
type: 'circle',
filter: ['all', substation_visible_p, substation_point_visible_p, ['!', converter_p]],
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_substation_point',
minzoom: 5,
layout: {},
@@ -707,7 +707,7 @@ const layers: LayerSpecificationWithZIndex[] = [
['!=', ['coalesce', ['get', 'ref'], ''], ''],
['<', ['length', ['get', 'ref']], 5]
],
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
minzoom: 7,
layout: {
@@ -724,7 +724,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_line_label',
type: 'symbol',
filter: power_visible_p,
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
minzoom: 10,
paint: text_paint,
@@ -750,7 +750,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_line_label_low_zoom',
type: 'symbol',
filter: ['all', power_visible_p, ['any', ['>', ['get', 'voltage'], 350], hvdc_p]],
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_line',
minzoom: 5,
maxzoom: 10,
@@ -770,7 +770,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_substation_ref_label',
type: 'symbol',
filter: substation_label_visible_p,
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_substation_point',
minzoom: 14.5,
layout: {
@@ -788,7 +788,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 562,
id: 'power_substation_label',
type: 'symbol',
- source: 'openinframap',
+ source: 'power',
filter: substation_label_visible_p,
'source-layer': 'power_substation_point',
minzoom: 8,
@@ -817,7 +817,7 @@ const layers: LayerSpecificationWithZIndex[] = [
id: 'power_converter_point',
type: 'symbol',
filter: ['all', converter_p, substation_point_visible_p],
- source: 'openinframap',
+ source: 'power',
'source-layer': 'power_substation_point',
minzoom: 5.5,
layout: {
@@ -844,7 +844,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 563,
id: 'power_plant_label',
type: 'symbol',
- source: 'openinframap',
+ source: 'power',
filter: plant_label_visible_p,
'source-layer': 'power_plant_point',
minzoom: 6,
diff --git a/web/src/style/style_oim_telecoms.ts b/web/src/style/style_oim_telecoms.ts
index 7258d36..13143da 100644
--- a/web/src/style/style_oim_telecoms.ts
+++ b/web/src/style/style_oim_telecoms.ts
@@ -7,7 +7,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 40,
id: 'telecoms_line',
type: 'line',
- source: 'openinframap',
+ source: 'telecoms',
minzoom: 2,
'source-layer': 'telecoms_communication_line',
paint: {
@@ -20,7 +20,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 140,
id: 'telecoms_data_center',
type: 'fill',
- source: 'openinframap',
+ source: 'telecoms',
minzoom: 10,
'source-layer': 'telecoms_data_center',
paint: {
@@ -33,7 +33,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 141,
id: 'telecoms_mast',
type: 'symbol',
- source: 'openinframap',
+ source: 'telecoms',
minzoom: 10,
'source-layer': 'telecoms_mast',
paint: text_paint,
@@ -50,9 +50,10 @@ const layers: LayerSpecificationWithZIndex[] = [
}
},
{
+ zorder: 563,
id: 'telecoms_data_center_symbol',
type: 'symbol',
- source: 'openinframap',
+ source: 'telecoms',
minzoom: 11,
'source-layer': 'telecoms_data_center',
paint: text_paint,
@@ -65,9 +66,10 @@ const layers: LayerSpecificationWithZIndex[] = [
}
},
{
+ zorder: 564,
id: 'telecoms_line_label',
type: 'symbol',
- source: 'openinframap',
+ source: 'telecoms',
minzoom: 9,
'source-layer': 'telecoms_communication_line',
paint: text_paint,
diff --git a/web/src/style/style_oim_water.ts b/web/src/style/style_oim_water.ts
index d91ba50..5ce727c 100644
--- a/web/src/style/style_oim_water.ts
+++ b/web/src/style/style_oim_water.ts
@@ -48,11 +48,50 @@ const substance_colour: ExpressionSpecification = [
]
const layers: LayerSpecificationWithZIndex[] = [
+ {
+ zorder: 19,
+ id: 'water_treatment_plant',
+ type: 'fill',
+ source: 'water',
+ minzoom: 10,
+ 'source-layer': 'water_treatment_plant_polygon',
+ paint: {
+ 'fill-color': '#7BBAAC',
+ 'fill-opacity': 0.3,
+ 'fill-outline-color': 'rgba(0, 0, 0, 1)'
+ }
+ },
+ {
+ zorder: 19,
+ id: 'water_sewage_treatment_plant',
+ type: 'fill',
+ source: 'water',
+ minzoom: 10,
+ 'source-layer': 'wastewater_plant_polygon',
+ paint: {
+ 'fill-color': '#c19653',
+ 'fill-opacity': 0.3,
+ 'fill-outline-color': 'rgba(0, 0, 0, 1)'
+ }
+ },
+ {
+ zorder: 19,
+ id: 'water_pumping_station',
+ type: 'fill',
+ source: 'water',
+ minzoom: 10,
+ 'source-layer': 'pumping_station_polygon',
+ paint: {
+ 'fill-color': '#7B7CBA',
+ 'fill-opacity': 0.3,
+ 'fill-outline-color': 'rgba(0, 0, 0, 1)'
+ }
+ },
{
zorder: 20,
id: 'water_pipeline_case',
type: 'line',
- source: 'openinframap',
+ source: 'water',
minzoom: 7,
'source-layer': 'water_pipeline',
paint: {
@@ -68,7 +107,7 @@ const layers: LayerSpecificationWithZIndex[] = [
zorder: 21,
id: 'water_pipeline',
type: 'line',
- source: 'openinframap',
+ source: 'water',
minzoom: 3,
'source-layer': 'water_pipeline',
paint: {
@@ -77,10 +116,22 @@ const layers: LayerSpecificationWithZIndex[] = [
}
},
{
- zorder: 520,
+ zorder: 21,
+ id: 'water_pressurised',
+ type: 'line',
+ source: 'water',
+ minzoom: 3,
+ 'source-layer': 'pressurised_waterway',
+ paint: {
+ 'line-color': substance_colour,
+ 'line-width': ['interpolate', ['linear'], ['zoom'], 3, 0.3, 16, 4]
+ }
+ },
+ {
+ zorder: 519,
id: 'water_pipeline_label',
type: 'symbol',
- source: 'openinframap',
+ source: 'water',
'source-layer': 'water_pipeline',
minzoom: 11,
paint: text_paint,
@@ -98,6 +149,78 @@ const layers: LayerSpecificationWithZIndex[] = [
'text-offset': [0, 1],
'text-max-angle': 10
}
+ },
+ {
+ zorder: 520,
+ id: 'water_pumping_station_symbol',
+ type: 'symbol',
+ source: 'water',
+ 'source-layer': 'pumping_station_point',
+ minzoom: 9,
+ layout: {
+ 'icon-image': 'water_pumping_station',
+ 'icon-size': 0.15,
+ 'text-field': ['step', ['zoom'], '', 10, ['get', 'name']],
+ 'text-font': font,
+ 'text-size': ['interpolate', ['linear'], ['zoom'], 11, 10, 18, 16],
+ 'text-anchor': 'top',
+ 'text-offset': [0, 1],
+ 'icon-allow-overlap': true,
+ 'text-optional': true
+ },
+ paint: {
+ ...text_paint,
+ // Control visibility using the opacity property...
+ 'icon-opacity': ['step', ['zoom'], 1, 12, ['case', ['get', 'is_node'], 1, 0]]
+ }
+ },
+ {
+ zorder: 521,
+ id: 'water_treatment_plant_symbol',
+ type: 'symbol',
+ source: 'water',
+ 'source-layer': 'water_treatment_plant_point',
+ minzoom: 8,
+ layout: {
+ 'icon-image': 'water_treatment_plant',
+ 'icon-size': ['interpolate', ['linear'], ['zoom'], 8, 0.1, 10, 0.2],
+ 'text-field': ['step', ['zoom'], '', 10, ['get', 'name']],
+ 'text-font': font,
+ 'text-size': ['interpolate', ['linear'], ['zoom'], 11, 10, 18, 16],
+ 'text-anchor': 'top',
+ 'text-offset': [0, 1],
+ 'icon-allow-overlap': true,
+ 'text-optional': true
+ },
+ paint: {
+ ...text_paint,
+ // Control visibility using the opacity property...
+ 'icon-opacity': ['step', ['zoom'], 1, 12, 0]
+ }
+ },
+ {
+ zorder: 522,
+ id: 'water_sewage_treatment_plant_symbol',
+ type: 'symbol',
+ source: 'water',
+ 'source-layer': 'wastewater_plant_point',
+ minzoom: 8,
+ layout: {
+ 'icon-image': 'sewage_treatment_plant',
+ 'icon-size': ['interpolate', ['linear'], ['zoom'], 8, 0.1, 10, 0.2],
+ 'text-field': ['step', ['zoom'], '', 10, ['get', 'name']],
+ 'text-font': font,
+ 'text-size': ['interpolate', ['linear'], ['zoom'], 11, 10, 18, 16],
+ 'text-anchor': 'top',
+ 'text-offset': [0, 1],
+ 'icon-allow-overlap': true,
+ 'text-optional': true
+ },
+ paint: {
+ ...text_paint,
+ // Control visibility using the opacity property...
+ 'icon-opacity': ['step', ['zoom'], 1, 12, 0]
+ }
}
]