Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

More petroleum tweaks

Russ Garrett2ed449f88762
diff --git a/tegola/layers.yml b/tegola/layers.yml
index 2a9bc6a..64fac3f 100644
--- a/tegola/layers.yml
+++ b/tegola/layers.yml
@@ -309,7 +309,7 @@ layers:
'y-grade', 'hydrocarbons', 'hydrogen', 'carbon_dioxide', 'carbon_monoxide',
'ethylene', 'propylene', 'chemicals', 'chemical', 'ammonia',
'methane', 'ethane', 'nitrogen', 'isobutane', 'butane',
- 'propane', 'condensate', 'butadiene'
+ 'propane', 'condensate', 'butadiene', 'naphtha'
) AND construction = ''
AND ((tags->'usage' IS NOT NULL AND tags->'usage' = 'transmission')
OR !ZOOM! > 8
diff --git a/web/src/key/key.js b/web/src/key/key.js
index 7048be0..5ccf3a3 100644
--- a/web/src/key/key.js
+++ b/web/src/key/key.js
@@ -12,7 +12,7 @@ import {
colour_oil,
colour_gas,
colour_fuel,
- colour_petroleum_other,
+ colour_intermediate,
colour_hydrogen,
colour_co2,
colour_unknown
@@ -207,8 +207,8 @@ class KeyControl {
let rows = [
['Oil', svgLine(colour_oil, line_thickness)],
['Gas', svgLine(colour_gas, line_thickness)],
+ ['Petroleum Intermediate', svgLine(colour_intermediate, line_thickness)],
['Fuel', svgLine(colour_fuel, line_thickness)],
- ['Other hydrocarbon', svgLine(colour_petroleum_other, line_thickness)],
['Hydrogen', svgLine(colour_hydrogen, line_thickness)],
['CO<sub>2</sub>', svgLine(colour_co2, line_thickness)],
['Other', svgLine(colour_unknown, line_thickness)],
diff --git a/web/src/style/style_oim_petroleum.js b/web/src/style/style_oim_petroleum.js
index ae504bb..5e38634 100644
--- a/web/src/style/style_oim_petroleum.js
+++ b/web/src/style/style_oim_petroleum.js
@@ -3,7 +3,7 @@ import { text_paint, font } from './style_oim_common.js';
const colour_gas = '#BFBC6B';
const colour_oil = '#6B6B6B';
const colour_fuel = '#CC9F83';
-const colour_petroleum_other = '#78CC9E';
+const colour_intermediate = '#78CC9E';
const colour_hydrogen = '#CC78AB';
const colour_co2 = '#7885CC';
const colour_unknown = '#BABABA';
@@ -15,7 +15,7 @@ const pipeline_colour = ["match",
['gas', 'natural_gas', 'cng', 'lpg', 'lng'], colour_gas,
'oil', colour_oil,
'fuel', colour_fuel,
- ['ngl', 'y-grade', 'hydrocarbons', 'condensate'], colour_petroleum_other,
+ ['ngl', 'y-grade', 'hydrocarbons', 'condensate', 'naphtha'], colour_intermediate,
'hydrogen', colour_hydrogen,
'carbon_dioxide', colour_co2,
colour_unknown
@@ -163,7 +163,7 @@ export {
colour_gas,
colour_oil,
colour_fuel,
- colour_petroleum_other,
+ colour_intermediate,
colour_hydrogen,
colour_co2,
colour_unknown