Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

New generic compensator icon

Russ Garrettef0041b66b59
diff --git a/web/src/icons/power_compensator_frame.svg b/web/src/icons/power_compensator_frame.svg
new file mode 100644
index 0000000..9665200
--- /dev/null
+++ b/web/src/icons/power_compensator_frame.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 80" 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.05749,0,0,0.941319,-2.01476,-7.53568)">
+ <rect x="5.946" y="13.23" width="86.482" height="74.538" style="fill:rgb(235,235,235);stroke:black;stroke-width:2.52px;"/>
+ </g>
+</svg>
diff --git a/web/src/icons/power_filter.svg b/web/src/icons/power_filter.svg
index 30b997e..4a9d962 100644
--- a/web/src/icons/power_filter.svg
+++ b/web/src/icons/power_filter.svg
@@ -1,13 +1,13 @@
<?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.05749,0,0,1.24532,-2.0148,-12.6747)">
+<svg width="100%" height="100%" viewBox="0 0 100 80" 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.05749,0,0,0.941319,-2.01476,-7.53568)">
<rect x="5.946" y="13.23" width="86.482" height="74.538" style="fill:rgb(235,235,235);stroke:black;stroke-width:2.52px;"/>
</g>
- <g transform="matrix(0.165807,0,0,0.327873,-23.4896,-52.2501)">
+ <g transform="matrix(0.165807,0,0,0.327873,-23.4896,-62.2501)">
<path d="M229.957,316.755C231.816,315.277 233.668,313.79 235.52,312.303M235.52,312.303C248.281,302.079 261.055,291.794 274.773,282.87M274.773,282.87C286.904,274.978 299.941,268.09 314.027,264.47M314.027,264.47C326.877,261.186 340.351,260.939 353.28,263.956M353.28,263.956C367.341,267.196 380.415,273.829 392.534,281.519M392.534,281.519C406.301,290.244 419.087,300.427 431.787,310.619M431.787,310.619C444.606,320.888 457.372,331.289 471.041,340.419M471.041,340.419C483.18,348.545 496.187,355.772 510.294,359.823M510.294,359.823C523.043,363.484 536.522,364.24 549.547,361.605M549.547,361.605C563.572,358.831 576.686,352.539 588.801,345.102M588.801,345.102C602.613,336.61 615.404,326.571 628.054,316.458M628.054,316.458C637.471,308.931 646.839,301.337 656.49,294.11" style="fill:none;stroke:black;stroke-width:24.06px;stroke-linejoin:miter;stroke-miterlimit:2;"/>
</g>
- <g transform="matrix(1,0,0,1,3.24379,-0.599285)">
+ <g transform="matrix(1,0,0,1,3.24379,-10.5993)">
<path d="M24.251,75.003L69.261,26.62" style="fill:none;stroke:black;stroke-width:2.92px;"/>
</g>
</svg>
diff --git a/web/src/icons/power_generator_solar.svg b/web/src/icons/power_generator_solar.svg
index 5e4044f..a223a89 100644
--- a/web/src/icons/power_generator_solar.svg
+++ b/web/src/icons/power_generator_solar.svg
@@ -1,11 +1,13 @@
<?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.0539,0,0,1.0539,-1.87758,-4.45753)">
- <path d="M28.334,91.592C13.975,84.057 4.171,69 4.171,51.672C4.171,26.807 24.359,6.619 49.224,6.619C70.563,6.619 88.456,21.486 93.103,41.418" style="fill:white;stroke:black;stroke-width:2.77px;"/>
- </g>
- <g transform="matrix(1.0539,0,0,1.0539,-1.87758,-4.45753)">
- <path d="M93.103,41.418C93.871,44.712 94.277,48.145 94.277,51.672C94.277,76.538 74.09,96.725 49.224,96.725C41.687,96.725 34.58,94.87 28.334,91.592" style="fill:rgb(114,107,169);stroke:black;stroke-width:2.77px;"/>
+ <g transform="matrix(0.974987,0,0,0.965938,1.50148,1.70308)">
+ <g transform="matrix(1.0539,0,0,1.0539,-1.87758,-4.45753)">
+ <path d="M28.334,91.592C13.975,84.057 4.171,69 4.171,51.672C4.171,26.807 24.359,6.619 49.224,6.619C70.563,6.619 88.456,21.486 93.103,41.418" style="fill:rgb(235,235,235);stroke:black;stroke-width:6.06px;"/>
+ </g>
+ <g transform="matrix(1.0539,0,0,1.0539,-1.87758,-4.45753)">
+ <path d="M93.103,41.418C93.871,44.712 94.277,48.145 94.277,51.672C94.277,76.538 74.09,96.725 49.224,96.725C41.687,96.725 34.58,94.87 28.334,91.592" style="fill:rgb(114,107,169);stroke:black;stroke-width:6.06px;"/>
+ </g>
</g>
<g transform="matrix(0.502803,0.684469,-0.680672,0.500015,24.1819,-10.5527)">
<path d="M37.189,37.377L37.189,32.29L78.905,32.29L78.905,22.962L90.71,34.833L78.905,46.705L78.905,37.377L37.189,37.377Z"/>
diff --git a/web/src/key/key.ts b/web/src/key/key.ts
index 8d4d1de..7093bc7 100644
--- a/web/src/key/key.ts
+++ b/web/src/key/key.ts
@@ -186,6 +186,7 @@ class KeyControl implements IControl {
const rows = [
['Wind turbine', await this.sprite('power_wind', 14)],
['Solar panel', svgRectFromLayer(power_layers, 'power_solar_panel')],
+ ['Solar panel (node)', await this.sprite('power_generator_solar')],
['Other generator', await this.sprite('power_generator')]
]
const table = list('table', Tr)
@@ -215,7 +216,8 @@ class KeyControl implements IControl {
['Shunt reactor', await this.sprite('power_reactor_shunt')],
['Series capacitor', await this.sprite('power_capacitor')],
['Shunt capacitor', await this.sprite('power_capacitor_shunt')],
- ['Other compensator', await this.sprite('power_compensator')],
+ ['Filter', await this.sprite('power_filter')],
+ ['Other compensator', await this.sprite('power_compensator_frame')],
['Converter', await this.sprite('converter')]
]
const table = list('table', Tr)
diff --git a/web/src/style/style_oim_power.ts b/web/src/style/style_oim_power.ts
index 4755de0..eb20676 100644
--- a/web/src/style/style_oim_power.ts
+++ b/web/src/style/style_oim_power.ts
@@ -651,8 +651,28 @@ const layers: LayerSpecificationWithZIndex[] = [
['shunt_capacitor', 'power_capacitor_shunt'],
['filter', 'power_filter']
],
- 'power_compensator'
+ 'power_compensator_frame'
),
+ 'text-field': step(zoom, '', [
+ [
+ 16,
+ match(
+ get('type'),
+ [
+ ['static_var', 'SVC'],
+ ['statcom', 'STC'],
+ ['voltage_regulator', 'VR'],
+ ['synchronous_condenser', 'SC']
+ ],
+ ''
+ )
+ ]
+ ]),
+ 'text-font': font,
+ 'text-size': interpolate(zoom, [
+ [16, 8],
+ [21, 35]
+ ]),
'icon-allow-overlap': true,
'icon-size': interpolate(
zoom,