Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
Update translations and fix code style issues
Jan Alexander3f39374027a1
diff --git a/web/locales/de/translation.json b/web/locales/de/translation.jsonindex 6f4fbb9..dfcade4 100644--- a/web/locales/de/translation.json+++ b/web/locales/de/translation.json@@ -74,6 +74,17 @@"well": "Bohrloch","facility": "Erdöl-Betrieb"},+ "gas": {+ "pipeline": {+ "transmission": "Fernleitung",+ "distribution": "Verteilung",+ "pressure": {+ "high": "Hochdruck",+ "intermediate": "Mitteldruck",+ "low": "Niederdruck"+ }+ }+ },"cable": "Erdkabel","telecom": {"tower-mast": "Sendemast",@@ -106,6 +117,7 @@"power-line-supports": "Strommasten","switchgear": "Schaltanlagen","telecoms": "Telekommunikation",+ "gas": "Gas","petroleum": "Brennstoffe","water": "Wasser","traction": "Traktion (< 50 Hz)"diff --git a/web/locales/en/translation.json b/web/locales/en/translation.jsonindex afaac62..f0edc10 100644--- a/web/locales/en/translation.json+++ b/web/locales/en/translation.json@@ -54,6 +54,17 @@"well": "Well","facility": "Petroleum facility"},+ "gas": {+ "pipeline": {+ "transmission": "Transmission",+ "distribution": "Distribution",+ "pressure": {+ "high": "High Pressure",+ "intermediate": "Intermediate Pressure",+ "low": "Low Pressure"+ }+ }+ },"water": {"pipeline": "Water pipeline","sewage-treatment-plant": "Sewage treatment plant",@@ -153,6 +164,7 @@"power-line-supports": "Power Line Supports","switchgear": "Switchgear","telecoms": "Telecoms",+ "gas": "Gas","petroleum": "Petroleum","water": "Water","traction": "Traction (< 50 Hz)"diff --git a/web/src/key/key.ts b/web/src/key/key.tsindex 0be8246..0307793 100644--- a/web/src/key/key.ts+++ b/web/src/key/key.ts@@ -278,7 +278,7 @@ class KeyControl implements IControl {[`${t('names.gas.pipeline.distribution', 'Distribution')} ${t('names.gas.pipeline.pressure.low', 'Low Pressure')}`,svgLine(colour_gas_other, line_thickness)- ],+ ]]const table = list('table', Tr)table.update(rows)diff --git a/web/src/style/style_oim_petroleum.ts b/web/src/style/style_oim_petroleum.tsindex e8f5a8e..ed1ae60 100644--- a/web/src/style/style_oim_petroleum.ts+++ b/web/src/style/style_oim_petroleum.ts@@ -20,32 +20,23 @@ const transmission_large_p = all(has('usage'),has('diameter'),['==', get('usage'), 'transmission'],- ['>=', ['to-number', get('diameter'), 0], 700],-);+ ['>=', ['to-number', get('diameter'), 0], 700]+)const transmission_medium_p = all(has('usage'),has('diameter'),['==', get('usage'), 'transmission'],- ['>=', ['to-number', get('diameter'), 0], 300],-);-const transmission_p = all(- has('usage'),- ['==', get('usage'), 'transmission'],-);+ ['>=', ['to-number', get('diameter'), 0], 300]+)+const transmission_p = all(has('usage'), ['==', get('usage'), 'transmission'])const pressure_high_p = all(has('pressure'),- any(- ['==', get('pressure'), 'high'],- ['>=', ['to-number', get('pressure'), 0], 1],- ),-);+ any(['==', get('pressure'), 'high'], ['>=', ['to-number', get('pressure'), 0], 1])+)const pressure_intermediate_p = all(has('pressure'),- any(- ['==', get('pressure'), 'intermediate'],- ['>=', ['to-number', get('pressure'), 0], 0.1],- ),-);+ any(['==', get('pressure'), 'intermediate'], ['>=', ['to-number', get('pressure'), 0], 0.1])+)const usage_diameter_pressure_colour: ExpressionSpecification = case_([@@ -53,10 +44,10 @@ const usage_diameter_pressure_colour: ExpressionSpecification = case_([transmission_medium_p, colour_gas_transmission_medium],[transmission_p, colour_gas_transmission_other],[pressure_high_p, colour_gas_pressure_high],- [pressure_intermediate_p, colour_gas_pressure_intermediate],+ [pressure_intermediate_p, colour_gas_pressure_intermediate]],colour_gas_other-);+)const pipeline_colour: ExpressionSpecification = match(substance,