Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DoubleSplitAction.java =================================================================== --- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DoubleSplitAction.java (revision 34235) +++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DoubleSplitAction.java (revision 34236) @@ -536,33 +536,27 @@ JComboBox values, int type) { TagMap newKeys1 = affectedKeysList.get(0); + String prevValue = null; if (keys.getSelectedItem() == "bridge") { newKeys1.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString()); newKeys1.put("layer", "1"); - selectedWay.get(0).setKeys(newKeys1); } else if (keys.getSelectedItem() == "tunnel") { newKeys1.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString()); if (!values.getSelectedItem().toString().equals("building_passage")) newKeys1.put("layer", "-1"); - selectedWay.get(0).setKeys(newKeys1); } else { if (newKeys1.containsKey("bus_bay")) { - String value = newKeys1.get("bus_bay"); - if (values.getSelectedItem().equals("left") && value.equals("right")) { - newKeys1.put(keys.getSelectedItem().toString(), "both"); - } else if (values.getSelectedItem().equals("right") && value.equals("left")) { - newKeys1.put(keys.getSelectedItem().toString(), "both"); - } else { - newKeys1.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString()); - } + prevValue = newKeys1.get("bus_bay"); + newKeys1.put(keys.getSelectedItem().toString(), "both"); } else { newKeys1.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString()); } - if (type != 2) { -// selectedWay.get(0).setKeys(newKeys1); - MainApplication.undoRedo.add(new ChangePropertyCommand(Collections.singleton(selectedWay.get(0)), newKeys1)); - } else { - MainApplication.undoRedo.add(new ChangePropertyCommand(Collections.singleton(selectedWay.get(0)), newKeys1)); - } + // if (type != 2) { + // selectedWay.get(0).setKeys(newKeys1); + // + // } else { + // MainApplication.undoRedo.add(new + // ChangePropertyCommand(Collections.singleton(selectedWay.get(0)), newKeys1)); + // } } @@ -573,31 +567,33 @@ newKeys2.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString()); newKeys2.put("layer", "1"); - selectedWay.get(1).setKeys(newKeys2); } else if (keys.getSelectedItem() == "tunnel") { newKeys2.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString()); if (!values.getSelectedItem().toString().equals("building_passage")) newKeys2.put("layer", "-1"); - selectedWay.get(1).setKeys(newKeys2); } else { if (newKeys2.containsKey("bus_bay")) { - String value = newKeys2.get("bus_bay"); - if (values.getSelectedItem().equals("left") && value.equals("right")) { - newKeys2.put(keys.getSelectedItem().toString(), "both"); - } else if (values.getSelectedItem().equals("right") && value.equals("left")) { - newKeys2.put(keys.getSelectedItem().toString(), "both"); + prevValue = newKeys2.get("bus_bay"); + newKeys2.put(keys.getSelectedItem().toString(), "both"); + if (values.getSelectedItem().equals("left") && prevValue.equals("left")) + newKeys1.put("bus_bay", "right"); + else if (values.getSelectedItem().equals("right") && prevValue.equals("right")) + newKeys1.put("bus_bay", "left"); + } else { + if (newKeys1.get("bus_bay").equals("both")) { + if (values.getSelectedItem().equals("left") && prevValue.equals("left")) + newKeys2.put("bus_bay", "right"); + else if (values.getSelectedItem().equals("right") && prevValue.equals("right")) + newKeys2.put("bus_bay", "left"); + else + newKeys2.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString()); } else { newKeys2.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString()); } - } else { - newKeys2.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString()); - } - if (type != 2) { -// selectedWay.get(1).setKeys(newKeys2); - MainApplication.undoRedo.add(new ChangePropertyCommand(Collections.singleton(selectedWay.get(1)), newKeys2)); - } else { - MainApplication.undoRedo.add(new ChangePropertyCommand(Collections.singleton(selectedWay.get(1)), newKeys2)); - } - } - } + } + } + MainApplication.undoRedo + .add(new ChangePropertyCommand(Collections.singleton(selectedWay.get(1)), newKeys2)); + } + MainApplication.undoRedo.add(new ChangePropertyCommand(Collections.singleton(selectedWay.get(0)), newKeys1)); resetLayer(); } @@ -723,10 +719,10 @@ rightHandTraffic = true; - for (Node n: atNodes) { - if (!RightAndLefthandTraffic.isRightHandTraffic(n.getCoor())) { - rightHandTraffic = false; - break; - } - } + for (Node n : atNodes) { + if (!RightAndLefthandTraffic.isRightHandTraffic(n.getCoor())) { + rightHandTraffic = false; + break; + } + } setButtonIcons("ok", "cancel"); @@ -762,7 +758,7 @@ if (rightHandTraffic) - values.setModel(new DefaultComboBoxModel<>(new String[] {"right", "left", "both"})); + values.setModel(new DefaultComboBoxModel<>(new String[] { "right", "left", "both" })); else - values.setModel(new DefaultComboBoxModel<>(new String[] {"left", "right", "both"})); + values.setModel(new DefaultComboBoxModel<>(new String[] { "left", "right", "both" })); // below code changes the list in values on the basis of key @@ -773,14 +769,16 @@ values.setModel(new DefaultComboBoxModel<>(new String[] { "both", "right", "left" })); if (rightHandTraffic) - values.setModel(new DefaultComboBoxModel<>(new String[] {"right", "left", "both"})); + values.setModel(new DefaultComboBoxModel<>(new String[] { "right", "left", "both" })); else - values.setModel(new DefaultComboBoxModel<>(new String[] {"left", "right", "both"})); + values.setModel(new DefaultComboBoxModel<>(new String[] { "left", "right", "both" })); } else if ("bridge".equals(keys.getSelectedItem())) { values.setModel(new DefaultComboBoxModel<>(new String[] { "yes" })); } else if ("tunnel".equals(keys.getSelectedItem())) { if (previousAffectedWay.hasKey("waterway") || affected.hasKey("waterway")) - values.setModel(new DefaultComboBoxModel<>(new String[] { "culvert", "yes", "building_passage" })); + values.setModel( + new DefaultComboBoxModel<>(new String[] { "culvert", "yes", "building_passage" })); else - values.setModel(new DefaultComboBoxModel<>(new String[] { "yes", "culvert", "building_passage" })); + values.setModel( + new DefaultComboBoxModel<>(new String[] { "yes", "culvert", "building_passage" })); } } @@ -802,13 +800,15 @@ if ("tunnel".equals(keys.getSelectedItem())) { if (previousAffectedWay.hasKey("waterway") || affected.hasKey("waterway")) - values.setModel(new DefaultComboBoxModel<>(new String[] { "culvert", "yes", "building_passage" })); + values.setModel( + new DefaultComboBoxModel<>(new String[] { "culvert", "yes", "building_passage" })); else - values.setModel(new DefaultComboBoxModel<>(new String[] { "yes", "culvert", "building_passage" })); + values.setModel( + new DefaultComboBoxModel<>(new String[] { "yes", "culvert", "building_passage" })); } else if ("bus_bay".equals(keys.getSelectedItem())) { values.setModel(new DefaultComboBoxModel<>(new String[] { "both", "right", "left" })); if (rightHandTraffic) - values.setModel(new DefaultComboBoxModel<>(new String[] {"right", "left", "both"})); + values.setModel(new DefaultComboBoxModel<>(new String[] { "right", "left", "both" })); else - values.setModel(new DefaultComboBoxModel<>(new String[] {"left", "right", "both"})); + values.setModel(new DefaultComboBoxModel<>(new String[] { "left", "right", "both" })); } else if ("bridge".equals(keys.getSelectedItem())) { values.setModel(new DefaultComboBoxModel<>(new String[] { "yes" })); @@ -819,5 +819,5 @@ private void setOptionsWithBridge() { - keys.setModel(new DefaultComboBoxModel<>(new String[] { "bridge", "bus_bay", "tunnel"})); + keys.setModel(new DefaultComboBoxModel<>(new String[] { "bridge", "bus_bay", "tunnel" })); values.setModel(new DefaultComboBoxModel<>(new String[] { "yes" })); @@ -829,13 +829,15 @@ if ("tunnel".equals(keys.getSelectedItem())) { if (previousAffectedWay.hasKey("waterway") || affected.hasKey("waterway")) - values.setModel(new DefaultComboBoxModel<>(new String[] { "culvert", "yes", "building_passage" })); + values.setModel( + new DefaultComboBoxModel<>(new String[] { "culvert", "yes", "building_passage" })); else - values.setModel(new DefaultComboBoxModel<>(new String[] { "yes", "culvert", "building_passage" })); + values.setModel( + new DefaultComboBoxModel<>(new String[] { "yes", "culvert", "building_passage" })); } else if ("bus_bay".equals(keys.getSelectedItem())) { values.setModel(new DefaultComboBoxModel<>(new String[] { "both", "right", "left" })); if (rightHandTraffic) - values.setModel(new DefaultComboBoxModel<>(new String[] {"right", "left", "both"})); + values.setModel(new DefaultComboBoxModel<>(new String[] { "right", "left", "both" })); else - values.setModel(new DefaultComboBoxModel<>(new String[] {"left", "right", "both"})); + values.setModel(new DefaultComboBoxModel<>(new String[] { "left", "right", "both" })); } else if ("bridge".equals(keys.getSelectedItem())) { values.setModel(new DefaultComboBoxModel<>(new String[] { "yes" })); @@ -846,34 +848,32 @@ private void findIntersection(Set newWays) { - DataSet ds = getLayerManager().getEditDataSet(); - NodeWayUtils.addWaysIntersectingWays( - ds.getWays(), - Arrays.asList(previousAffectedWay, affected), newWays); - Node n1 = previousAffectedWay.firstNode(); - Node n2 = previousAffectedWay.lastNode(); - Node n3 = affected.firstNode(); - Node n4 = affected.lastNode(); - List waysToBeRemoved = new ArrayList<>(); - for (Way way : newWays) { - int count = 0; - if (way.containsNode(n1)) - count++; - if (way.containsNode(n2)) - count++; - if (!previousAffectedWay.equals(affected)) { - if (way.containsNode(n3)) - count++; - if (way.containsNode(n4)) - count++; - } - if (count == 1) { - waysToBeRemoved.add(way); - } else { - if (!way.hasKey("highway") && !way.hasKey("waterway") && !way.hasKey("railway")) { - waysToBeRemoved.add(way); - } - } - } - newWays.removeAll(waysToBeRemoved); + DataSet ds = getLayerManager().getEditDataSet(); + NodeWayUtils.addWaysIntersectingWays(ds.getWays(), Arrays.asList(previousAffectedWay, affected), newWays); + Node n1 = previousAffectedWay.firstNode(); + Node n2 = previousAffectedWay.lastNode(); + Node n3 = affected.firstNode(); + Node n4 = affected.lastNode(); + List waysToBeRemoved = new ArrayList<>(); + for (Way way : newWays) { + int count = 0; + if (way.containsNode(n1)) + count++; + if (way.containsNode(n2)) + count++; + if (!previousAffectedWay.equals(affected)) { + if (way.containsNode(n3)) + count++; + if (way.containsNode(n4)) + count++; + } + if (count == 1) { + waysToBeRemoved.add(way); + } else { + if (!way.hasKey("highway") && !way.hasKey("waterway") && !way.hasKey("railway")) { + waysToBeRemoved.add(way); + } + } + } + newWays.removeAll(waysToBeRemoved); } @@ -893,5 +893,5 @@ } - } else if (getValue() != 3){ + } else if (getValue() != 3) { resetLayer(); }