Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
Infobox improvements
Russ Garrett383704a234c4
diff --git a/web/locales/en/translation.json b/web/locales/en/translation.jsonindex 6298eb3..a2ace68 100644--- a/web/locales/en/translation.json+++ b/web/locales/en/translation.json@@ -81,6 +81,21 @@"wastewater": "Wastewater","rainwater": "Rainwater"},+ "method": {+ "fission": "Fission",+ "fusion": "Fusion",+ "wind-turbine": "Wind turbine",+ "water-storage": "Water storage",+ "water-pumped-storage": "Pumped storage",+ "water-run-of-river": "Run-of-river",+ "tidal-barrage": "Barrage",+ "tidal-stream": "Stream",+ "solar-thermal": "Thermal",+ "solar-photovoltaic": "Photovoltaic",+ "combustion": "Combustion",+ "gasification": "Gasification",+ "anaerobic-digestion": "Anaerobic digestion"+ },"other-pumping-station": "Other pumping station"},"info": {diff --git a/web/src/infopopup.css b/web/src/infopopup.cssindex 4c5551d..bf3431f 100644--- a/web/src/infopopup.css+++ b/web/src/infopopup.css@@ -51,6 +51,12 @@ table.item_info th {table.item_info th {text-align: left;+ text-wrap: nowrap;+}++table.item_info td {+ width: 100%;+ overflow: hidden;}table.item_info tr:nth-child(odd) {diff --git a/web/src/infopopup.ts b/web/src/infopopup.tsindex bc9a21c..f3cc3e2 100644--- a/web/src/infopopup.ts+++ b/web/src/infopopup.ts@@ -59,6 +59,9 @@ function fieldValue(key: string, value: any): any {}if (key === 'source') {+ if (value == 'oil') {+ return t('names.substance.oil')+ }return t('power.source.' + value, value)}@@ -78,15 +81,76 @@ function fieldValue(key: string, value: any): any {)}+ if (key === 'method') {+ return (+ {+ fission: t('names.method.fission'),+ fusion: t('names.method.fusion'),+ wind_turbine: t('names.method.wind-turbine'),+ 'water-storage': t('names.method.water-storage'),+ 'water-pumped-storage': t('names.method.water-pumped-storage'),+ 'run-of-the-river': t('names.method.water-run-of-river'),+ barrage: t('names.method.tidal-barrage'),+ stream: t('names.method.tidal-stream'),+ thermal: t('names.method.solar-thermal'),+ photovoltaic: t('names.method.solar-photovoltaic'),+ combustion: t('names.method.combustion'),+ gasification: t('names.method.gasification'),+ anaerobic_digestion: t('names.method.anaerobic-digestion')+ }[value] || value+ )+ }+return titleCase(value)}+function truncateUrl(urlString: string, length: number): string {+ // Trim trailing slash+ urlString = urlString.replace(/\/$/, '')++ if (urlString.length <= length) {+ return urlString+ }++ const parsed = new URL(urlString)+ // Remove www from host+ parsed.host = parsed.host.replace(/^www\./, '')+ if (parsed.toString().length <= length) {+ return parsed.toString()+ }++ const TRUNCATE_SYMBOL_LENGTH = 2+ const pathParts = parsed.pathname.split('/')++ let remainingLength = length - parsed.host.length - TRUNCATE_SYMBOL_LENGTH+ const pathPartsReturnValue = []+ let index = pathParts.length++ while (index--) {+ const x = pathParts[index]++ if (x.length === 0) {+ continue+ }++ if (remainingLength < x.length + 1) {+ pathPartsReturnValue.push('…')+ break+ }++ pathPartsReturnValue.push(x)+ remainingLength -= x.length + 1+ }++ return [parsed.host, ...pathPartsReturnValue.reverse()].join('/')+}+function formatVoltage(value: number | number[]): string {if (!Array.isArray(value)) {value = [value]}- const formatter = new Intl.NumberFormat(undefined, { maximumFractionDigits: 2 })+ const formatter = new Intl.NumberFormat(i18next.language, { maximumFractionDigits: 2 })let text = [...value].sort((a, b) => a - b)@@ -102,7 +166,7 @@ function formatFrequency(value: number | number[]): string {value = [value]}- const formatter = new Intl.NumberFormat(undefined, { maximumFractionDigits: 2 })+ const formatter = new Intl.NumberFormat(i18next.language, { maximumFractionDigits: 2 })let text = [...value].sort((a, b) => a - b)@@ -114,7 +178,7 @@ function formatFrequency(value: number | number[]): string {}function formatPower(value: number): string {- const formatter = new Intl.NumberFormat(undefined, { maximumFractionDigits: 2 })+ const formatter = new Intl.NumberFormat(i18next.language, { maximumFractionDigits: 2 })if (value < 1) {return formatter.format(value * 1000) + ' ' + t('units.kV', 'kV')} else {@@ -216,30 +280,32 @@ class InfoPopup {return null}+ let prettyValue = value+if (key.startsWith('voltage')) {- value = formatVoltage(value)+ prettyValue = formatVoltage(value)}if (key == 'output') {- value = formatPower(parseFloat(value))+ prettyValue = formatPower(parseFloat(value))}if (key == 'frequency' && value == '0') {- value = t('units.DC')+ prettyValue = t('units.DC')}let prettyKey = keyif (key == 'url') {- value = el('a', t('info.website'), {+ prettyKey = t('info.website')+ prettyValue = el('a', truncateUrl(value, 30), {href: value,target: '_blank'})- prettyKey = t('info.website')} else {prettyKey = fieldName(key)}- return el('tr', el('th', prettyKey), el('td', fieldValue(key, value)))+ return el('tr', el('th', prettyKey), el('td', fieldValue(key, prettyValue)))}nameTags(feature: MapGeoJSONFeature) {