Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Scale up transformer icon, add 3-winding variant

Russ Garrettc02a23a247fe
diff --git a/web/src/icons/power_transformer.svg b/web/src/icons/power_transformer.svg
index ab3897d..7051a22 100644
--- a/web/src/icons/power_transformer.svg
+++ b/web/src/icons/power_transformer.svg
@@ -1,7 +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 15 22" 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;">
- <g id="Layer_1" transform="matrix(1,0,0,1,0.4135,-0.055)">
+<svg width="100%" height="100%" viewBox="0 0 50 74" 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;">
+ <g id="Layer_1" transform="matrix(3.33333,0,0,3.33333,1.37833,-0.183333)">
<g transform="matrix(1,0,0,1,-0.5385,-0.601)">
<path d="M7.625,22C3.966,22 1,19.034 1,15.375C1,11.716 3.966,8.75 7.625,8.75C11.284,8.75 14.25,11.716 14.25,15.375C14.25,19.034 11.284,22 7.625,22Z" style="fill:white;fill-rule:nonzero;"/>
<path d="M7.625,22C3.966,22 1,19.034 1,15.375C1,11.716 3.966,8.75 7.625,8.75C11.284,8.75 14.25,11.716 14.25,15.375C14.25,19.034 11.284,22 7.625,22Z" style="fill-opacity:0;fill-rule:nonzero;stroke:rgb(59,59,59);stroke-width:1px;"/>
diff --git a/web/src/icons/power_transformer_3_winding.svg b/web/src/icons/power_transformer_3_winding.svg
new file mode 100644
index 0000000..5264ae0
--- /dev/null
+++ b/web/src/icons/power_transformer_3_winding.svg
@@ -0,0 +1,27 @@
+<?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 75 70" 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;">
+ <g id="Layer_1" transform="matrix(3.33333,0,0,3.33333,13.8783,-1.85)">
+ <g transform="matrix(1,0,0,1,3.10256,-1.20131)">
+ <path d="M7.625,22C3.966,22 1,19.034 1,15.375C1,11.716 3.966,8.75 7.625,8.75C11.284,8.75 14.25,11.716 14.25,15.375C14.25,19.034 11.284,22 7.625,22Z" style="fill:white;fill-rule:nonzero;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,-4.17956,-1.20131)">
+ <path d="M7.625,22C3.966,22 1,19.034 1,15.375C1,11.716 3.966,8.75 7.625,8.75C11.284,8.75 14.25,11.716 14.25,15.375C14.25,19.034 11.284,22 7.625,22Z" style="fill:white;fill-rule:nonzero;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,-0.5385,-0.000691454)">
+ <path d="M7.625,14.562C3.966,14.562 1,11.596 1,7.938C1,4.279 3.966,1.312 7.625,1.312C11.284,1.312 14.25,4.279 14.25,7.938C14.25,11.596 11.284,14.562 7.625,14.562Z" style="fill:white;fill-rule:nonzero;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,3.10256,-1.20131)">
+ <path d="M7.625,22C3.966,22 1,19.034 1,15.375C1,11.716 3.966,8.75 7.625,8.75C11.284,8.75 14.25,11.716 14.25,15.375C14.25,19.034 11.284,22 7.625,22Z" style="fill-opacity:0;fill-rule:nonzero;stroke:rgb(59,59,59);stroke-width:1px;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,-0.5385,-0.000691454)">
+ <path d="M7.625,14.562C3.966,14.562 1,11.596 1,7.938C1,4.279 3.966,1.312 7.625,1.312C11.284,1.312 14.25,4.279 14.25,7.938C14.25,11.596 11.284,14.562 7.625,14.562Z" style="fill-opacity:0;fill-rule:nonzero;stroke:rgb(59,59,59);stroke-width:1px;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,-3.75638,-1.20131)">
+ <path d="M7.625,22C3.966,22 1,19.034 1,15.375C1,11.716 3.966,8.75 7.625,8.75C11.284,8.75 14.25,11.716 14.25,15.375C14.25,19.034 11.284,22 7.625,22Z" style="fill:white;fill-opacity:0;fill-rule:nonzero;"/>
+ </g>
+ <g transform="matrix(1,0,0,1,-4.17956,-1.20131)">
+ <path d="M7.625,22C3.966,22 1,19.034 1,15.375C1,11.716 3.966,8.75 7.625,8.75C11.284,8.75 14.25,11.716 14.25,15.375C14.25,19.034 11.284,22 7.625,22Z" style="fill-opacity:0;fill-rule:nonzero;stroke:rgb(59,59,59);stroke-width:1px;"/>
+ </g>
+ </g>
+</svg>
diff --git a/web/src/style/style_oim_power.ts b/web/src/style/style_oim_power.ts
index eb20676..2999916 100644
--- a/web/src/style/style_oim_power.ts
+++ b/web/src/style/style_oim_power.ts
@@ -625,12 +625,16 @@ const layers: LayerSpecificationWithZIndex[] = [
minzoom: 14,
paint: text_paint,
layout: {
- 'icon-image': 'power_transformer',
+ 'icon-image': if_(has('voltage_tertiary'), 'power_transformer_3_winding', 'power_transformer'),
'icon-allow-overlap': true,
- 'icon-size': interpolate(zoom, [
- [14, 0.3],
- [21, 2]
- ])
+ 'icon-size': interpolate(
+ zoom,
+ [
+ [14, 0.1],
+ [21, 1]
+ ],
+ 1.2
+ )
}
},
{