Skip to content

Commit ba494ad

Browse files
KlumbumbusKlumbumbus
Klumbumbus
authored and
Klumbumbus
committed
fix #17034 - Add power=connection (partly patch by gaben, icon self created PD and CC0 licensed)
git-svn-id: https://josm.openstreetmap.de/svn/trunk@18324 0c6e7542-c601-0410-84e7-c038aed88b3b
1 parent bcd5ede commit ba494ad

File tree

5 files changed

+18
-3
lines changed

5 files changed

+18
-3
lines changed

resources/data/defaultpresets.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6794,6 +6794,15 @@
67946794
<reference ref="ref_operator" />
67956795
</optional>
67966796
</item> <!-- Catenary mast -->
6797+
<item name="Connection" icon="presets/power/connection.svg" name_context="power" type="node" preset_name_label="true">
6798+
<link wiki="Tag:power=connection" />
6799+
<space />
6800+
<key key="power" value="connection" />
6801+
<optional>
6802+
<reference ref="cables" />
6803+
<reference ref="ref_operator" />
6804+
</optional>
6805+
</item> <!-- Connection -->
67976806
<item name="Insulator" icon="presets/power/insulator.svg" type="node,way" preset_name_label="true">
67986807
<link wiki="Tag:power=insulator" />
67996808
<space />
@@ -6802,6 +6811,7 @@
68026811
<combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
68036812
<reference ref="ref_operator" />
68046813
</item> <!-- Insulator -->
6814+
<separator/>
68056815
<item name="Power Line" icon="presets/power/line.svg" type="way" preset_name_label="true">
68066816
<link wiki="Tag:power=line" />
68076817
<space />

resources/data/validator/geometry.mapcss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ way[power=transformer],
107107
way[transformer],
108108
way[power=pole],
109109
way[power=catenary_mast],
110+
way[power=connection],
110111
way[power=terminal],
111112
way[power=tower]!:closed,
112113
way[amenity=vending_machine],

resources/styles/standard/elemstyles.mapcss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,10 @@ node[power=catenary_mast] {
12651265
icon-image: "presets/power/catenary_mast.svg";
12661266
set icon_z17;
12671267
}
1268+
node[power=connection] {
1269+
icon-image: "presets/power/connection.svg";
1270+
set icon_z17;
1271+
}
12681272
node[power=insulator] {
12691273
icon-image: "presets/power/insulator.svg";
12701274
set icon_z17;

src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class PowerLines extends Test {
4444
static final Collection<String> BUILDING_STATION_TAGS = Arrays.asList("transformer_tower");
4545
/** Values for {@code power} key interpreted as allowed power items */
4646
static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
47-
"portal", "terminal", "insulator");
47+
"portal", "terminal", "insulator", "connection");
4848

4949
private final Set<Node> badConnections = new LinkedHashSet<>();
5050
private final Set<Node> missingTowerOrPole = new LinkedHashSet<>();
@@ -55,7 +55,7 @@ public class PowerLines extends Test {
5555
* Constructs a new {@code PowerLines} test.
5656
*/
5757
public PowerLines() {
58-
super(tr("Power lines"), tr("Checks for nodes in power lines that do not have a power=tower/pole tag."));
58+
super(tr("Power lines"), tr("Checks for nodes in power lines that do not have a power=tower/pole/connection tag."));
5959
}
6060

6161
@Override
@@ -121,7 +121,7 @@ public void endTest() {
121121
for (Node n : missingTowerOrPole) {
122122
if (!isInPowerStation(n)) {
123123
errors.add(TestError.builder(this, Severity.WARNING, POWER_LINES)
124-
.message(tr("Missing power tower/pole within power line"))
124+
.message(tr("Missing power tower/pole/connection within power line"))
125125
.primitives(n)
126126
.build());
127127
}

0 commit comments

Comments
 (0)