Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java	(revision 5311)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java	(revision 5312)
@@ -4,14 +4,25 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.JoinedWay;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.tools.Geometry;
 
 public class PowerLines extends Test {
@@ -19,6 +30,15 @@
     protected static final int POWER_LINES = 2501;
     
-    protected Map<Way, String> towerPoleTagMap = new HashMap<Way, String>();
+    public static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
+    public static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
+    public static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "plant", "generator");
+    public static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator");
     
+    protected final Map<Way, String> towerPoleTagMap = new HashMap<Way, String>();
+    
+    protected final List<PowerLineError> potentialErrors = new ArrayList<PowerLineError>();
+
+    protected final List<OsmPrimitive> powerStations = new ArrayList<OsmPrimitive>();
+
     public PowerLines() {
         super(tr("Power lines"), tr("Checks for nodes in power lines that do not have a power=tower/pole tag."));
@@ -27,25 +47,70 @@
     @Override
     public void visit(Way w) {
-        if (w.isUsable() && isPowerLine(w)) {
-            String fixValue = null;
-            boolean erroneous = false;
-            boolean canFix = false;
-            for (Node n : w.getNodes()) {
-                if (!isPowerTower(n)) {
-                    errors.add(new PowerLineError(n, w));
-                    erroneous = true;
-                } else if (fixValue == null) {
-                    // First tower/pole tag found, remember it
-                    fixValue = n.get("power");
-                    canFix = true;
-                } else if (!fixValue.equals(n.get("power"))) {
-                    // The power line contains both "tower" and "pole" -> cannot fix this error
-                    canFix = false;
+        if (w.isUsable()) {
+            if (isPowerLine(w)) {
+                String fixValue = null;
+                boolean erroneous = false;
+                boolean canFix = false;
+                for (Node n : w.getNodes()) {
+                    if (!isPowerTower(n)) {
+                        if (!w.isFirstLastNode(n) && !isPowerAllowed(n)) {
+                            potentialErrors.add(new PowerLineError(n, w));
+                            erroneous = true;
+                        }
+                    } else if (fixValue == null) {
+                        // First tower/pole tag found, remember it
+                        fixValue = n.get("power");
+                        canFix = true;
+                    } else if (!fixValue.equals(n.get("power"))) {
+                        // The power line contains both "tower" and "pole" -> cannot fix this error
+                        canFix = false;
+                    }
+                }
+                if (erroneous && canFix) {
+                    towerPoleTagMap.put(w, fixValue);
+                }
+            } else if (w.isClosed() && isPowerStation(w)) {
+                powerStations.add(w);
+            }
+        }
+    }
+    
+    @Override
+    public void visit(Relation r) {
+        if (r.isMultipolygon() && isPowerStation(r)) {
+            powerStations.add(r);
+        }
+    }    
+
+    @Override
+    public void endTest() {
+        for (PowerLineError e : potentialErrors) {
+            if (!isInPowerStation(e.getNode())) {
+                errors.add(e);
+            }
+        }
+        super.endTest();
+    }
+    
+    protected final boolean isInPowerStation(Node n) {
+        for (OsmPrimitive station : powerStations) {
+            List<List<Node>> nodesLists = new ArrayList<List<Node>>();
+            if (station instanceof Way) {
+                nodesLists.add(((Way)station).getNodes());
+            } else if (station instanceof Relation) {
+                Multipolygon polygon = MultipolygonCache.getInstance().get(Main.map.mapView, (Relation) station);
+                if (polygon != null) {
+                    for (JoinedWay outer : Multipolygon.joinWays(polygon.getOuterWays())) {
+                        nodesLists.add(outer.getNodes());
+                    }
                 }
             }
-            if (erroneous && canFix) {
-                towerPoleTagMap.put(w, fixValue);
+            for (List<Node> nodes : nodesLists) {
+                if (Geometry.nodeInsidePolygon(n, nodes)) {
+                    return true;
+                }
             }
         }
+        return false;
     }
 
@@ -71,6 +136,14 @@
      */
     protected static final boolean isPowerLine(Way w) {
-        String v = w.get("power");
-        return v != null && (v.equals("line") || v.equals("minor_line"));
+        return isPowerIn(w, POWER_LINE_TAGS);
+    }
+
+    /**
+     * Determines if the specified primitive denotes a power station.
+     * @param w The way to be tested
+     * @return True if power key is set and equal to station/sub_station/plant
+     */
+    protected static final boolean isPowerStation(OsmPrimitive p) {
+        return isPowerIn(p, POWER_STATION_TAGS);
     }
 
@@ -81,6 +154,19 @@
      */
     protected static final boolean isPowerTower(Node n) {
-        String v = n.get("power");
-        return v != null && (v.equals("tower") || v.equals("pole"));
+        return isPowerIn(n, POWER_TOWER_TAGS);
+    }
+    
+    /**
+     * Determines if the specified node denotes a power infrastructure allowed on a power line.
+     * @param w The node to be tested
+     * @return True if power key is set and equal to switch/tranformer/busbar/generator
+     */
+    protected static final boolean isPowerAllowed(Node n) {
+        return isPowerIn(n, POWER_ALLOWED_TAGS);
+    }
+    
+    private static final boolean isPowerIn(OsmPrimitive p, Collection<String> values) {
+        String v = p.get("power");
+        return v != null && values != null && values.contains(v);
     }
     
@@ -92,4 +178,7 @@
             this.line = line;
         }
+        public final Node getNode() {
+            return (Node) getPrimitives().iterator().next();
+        }
     }
 }