Index: /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java =================================================================== --- /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java (revision 30871) +++ /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java (revision 30872) @@ -55,5 +55,5 @@ final static String DEFAULT_SEGMENTS = "plugins.terracer.segments"; final static String HANDLE_RELATION = "plugins.terracer.handle_relation"; - final static String DELETE_OUTLINE = "plugins.terracer.delete_outline"; + final static String KEEP_OUTLINE = "plugins.terracer.keep_outline"; final static String INTERPOLATION = "plugins.terracer.interpolation"; @@ -83,5 +83,5 @@ Choice interpolation; JCheckBox handleRelationCheckBox; - JCheckBox deleteOutlineCheckBox; + JCheckBox keepOutlineCheckBox; HouseNumberInputHandler inputHandler; @@ -182,5 +182,5 @@ handleRelationCheckBox = new JCheckBox(txt, relationExists ? Main.pref.getBoolean(HANDLE_RELATION, true) : false); - deleteOutlineCheckBox = new JCheckBox(tr("delete outline way"), Main.pref.getBoolean(DELETE_OUTLINE, true)); + keepOutlineCheckBox = new JCheckBox(tr("keep outline way"), Main.pref.getBoolean(KEEP_OUTLINE, false)); inputPanel = new JPanel(); @@ -209,6 +209,6 @@ inputPanel.add(getBuilding(), GBC.eol().insets(5,3,0,0)); inputPanel.add(handleRelationCheckBox, GBC.eol().insets(3,3,0,0)); - inputPanel.add(deleteOutlineCheckBox, GBC.eol().insets(3,3,0,0)); - + inputPanel.add(keepOutlineCheckBox, GBC.eol().insets(3,3,0,0)); + if (numbers.isVisible()) { loLabel.setVisible(false); @@ -261,5 +261,5 @@ return hi; } - + /** * This method initializes numbers @@ -270,5 +270,5 @@ if (numbers == null) { numbers = new JTextField(); - + Iterator it = housenumbers.iterator(); StringBuilder s = new StringBuilder(256); @@ -282,5 +282,5 @@ numbers.setVisible(false); } - + numbers.setText(s.toString()); numbers.setEditable(false); @@ -306,5 +306,5 @@ return streetComboBox; } - + /** * This method initializes building Index: /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java =================================================================== --- /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java (revision 30871) +++ /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java (revision 30872) @@ -304,5 +304,5 @@ streetName(), doHandleRelation(), - doDeleteOutline(), buildingType()); + doKeepOutline(), buildingType()); } catch (UserCancelException ex) { // Ignore @@ -380,5 +380,5 @@ return getItemText(dialog.streetComboBox); } - + /** * Gets the building type. @@ -389,5 +389,5 @@ return getItemText(dialog.buildingComboBox); } - + private static String getItemText(AutoCompletingComboBox box) { Object selected = box.getSelectedItem(); @@ -430,8 +430,8 @@ /** - * Whether the user likes to delete the outline way. - */ - public boolean doDeleteOutline() { - return dialog.deleteOutlineCheckBox.isSelected(); + * Whether the user likes to keep the outline way. + */ + public boolean doKeepOutline() { + return dialog.keepOutlineCheckBox.isSelected(); } @@ -454,5 +454,5 @@ public void saveValues() { Main.pref.put(HouseNumberInputDialog.HANDLE_RELATION, doHandleRelation()); - Main.pref.put(HouseNumberInputDialog.DELETE_OUTLINE, doDeleteOutline()); + Main.pref.put(HouseNumberInputDialog.KEEP_OUTLINE, doKeepOutline()); Main.pref.put(HouseNumberInputDialog.INTERPOLATION, stepSize().toString()); } Index: /applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java =================================================================== --- /applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java (revision 30871) +++ /applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java (revision 30872) @@ -69,5 +69,5 @@ Collection commands; - + private Collection primitives; private TagCollection tagsInConflict; @@ -96,5 +96,5 @@ return result; } - + private static final class InvalidUserInputException extends Exception { InvalidUserInputException(String message) { @@ -182,5 +182,5 @@ if (outline == null || !outline.isClosed() || outline.getNodesCount() < 5) throw new InvalidUserInputException("wrong or missing outline"); - + } catch (InvalidUserInputException ex) { Main.warn("Terracer: "+ex.getMessage()); @@ -202,7 +202,7 @@ candidates.add(street); } - + Set associatedStreets = findAssociatedStreets(candidates); - + if (!associatedStreets.isEmpty()) { associatedStreet = associatedStreets.iterator().next(); @@ -212,5 +212,5 @@ } } - + if (streetname == null && associatedStreet != null && associatedStreet.hasKey("name")) { streetname = associatedStreet.get("name"); @@ -297,6 +297,6 @@ * @param associatedStreet * @param segments The number of segments to generate - * @param From Starting housenumber - * @param To Ending housenumber + * @param start Starting housenumber + * @param end Ending housenumber * @param step The step width to use * @param housenumbers List of housenumbers to use. From and To are ignored @@ -306,25 +306,16 @@ * @param handleRelations If the user likes to add a relation or extend an * existing relation - * @param deleteOutline If the outline way should be deleted when done + * @param keepOutline If the outline way should be kept * @param buildingValue The value for {@code building} key to add - * @throws UserCancelException - */ - public void terraceBuilding(final Way outline, - Node init, - Way street, - Relation associatedStreet, - Integer segments, - String From, - String To, - int step, - ArrayList housenumbers, - String streetName, - boolean handleRelations, - boolean deleteOutline, String buildingValue) throws UserCancelException { + * @throws UserCancelException + */ + public void terraceBuilding(final Way outline, Node init, Way street, Relation associatedStreet, Integer segments, + String start, String end, int step, List housenumbers, String streetName, boolean handleRelations, + boolean keepOutline, String buildingValue) throws UserCancelException { final int nb; Integer to = null, from = null; if (housenumbers == null || housenumbers.isEmpty()) { - to = getNumber(To); - from = getNumber(From); + to = getNumber(end); + from = getNumber(start); if (to != null && from != null) { nb = 1 + (to.intValue() - from.intValue()) / step; @@ -336,6 +327,5 @@ "Could not determine segments from parameters, this is a bug. " + "Parameters were: segments " + segments - + " from " + from + " to " + to + " step " - + step); + + " from " + from + " to " + to + " step " + step); } } else { @@ -346,10 +336,5 @@ Pair interp = findFrontAndBack(outline); - boolean swap = false; - if (init != null) { - if (interp.a.lastNode().equals(init) || interp.b.lastNode().equals(init)) { - swap = true; - } - } + final boolean swap = init != null && (interp.a.lastNode().equals(init) || interp.b.lastNode().equals(init)); final double frontLength = wayLength(interp.a); @@ -357,9 +342,10 @@ // new nodes array to hold all intermediate nodes - // This set will contain at least 4 existing nodes from the original outline (those, which coordinates match coordinates of outline nodes) - Node[][] new_nodes = new Node[2][nb + 1]; + // This set will contain at least 4 existing nodes from the original outline + // (those, which coordinates match coordinates of outline nodes) + Node[][] newNodes = new Node[2][nb + 1]; // This list will contain nodes of the outline that are used in new lines. // These nodes will not be deleted with the outline (if deleting was prompted). - ArrayList reused_nodes = new ArrayList<>(); + List reusedNodes = new ArrayList<>(); this.commands = new LinkedList<>(); @@ -367,55 +353,63 @@ if (nb > 1) { + // add required new nodes and build list of nodes to reuse for (int i = 0; i <= nb; ++i) { - int i_dir = swap ? nb - i : i; - new_nodes[0][i] = interpolateAlong(interp.a, frontLength * i_dir / nb); - new_nodes[1][i] = interpolateAlong(interp.b, backLength * i_dir / nb); - if (!outline.containsNode(new_nodes[0][i])) - this.commands.add(new AddCommand(new_nodes[0][i])); + int iDir = swap ? nb - i : i; + newNodes[0][i] = interpolateAlong(interp.a, frontLength * iDir / nb); + newNodes[1][i] = interpolateAlong(interp.b, backLength * iDir / nb); + if (!outline.containsNode(newNodes[0][i])) + this.commands.add(new AddCommand(newNodes[0][i])); else - reused_nodes.add(new_nodes[0][i]); - if (!outline.containsNode(new_nodes[1][i])) - this.commands.add(new AddCommand(new_nodes[1][i])); + reusedNodes.add(newNodes[0][i]); + if (!outline.containsNode(newNodes[1][i])) + this.commands.add(new AddCommand(newNodes[1][i])); else - reused_nodes.add(new_nodes[1][i]); + reusedNodes.add(newNodes[1][i]); } // assemble new quadrilateral, closed ways for (int i = 0; i < nb; ++i) { - Way terr = new Way(); - terr.addNode(new_nodes[0][i]); - terr.addNode(new_nodes[0][i + 1]); - terr.addNode(new_nodes[1][i + 1]); - terr.addNode(new_nodes[1][i]); - terr.addNode(new_nodes[0][i]); - - // add the tags of the outline to each building (e.g. source=*) - TagCollection.from(outline).applyTo(terr); - ways.add(addressBuilding(terr, street, streetName, associatedStreet, housenumbers, i, + final Way terr; + if (i > 0 || keepOutline) { + terr = new Way(); + // add the tags of the outline to each building (e.g. source=*) + TagCollection.from(outline).applyTo(terr); + } else { + terr = new Way(outline); + terr.setNodes(null); + } + + terr.addNode(newNodes[0][i]); + terr.addNode(newNodes[0][i + 1]); + terr.addNode(newNodes[1][i + 1]); + terr.addNode(newNodes[1][i]); + terr.addNode(newNodes[0][i]); + + ways.add(addressBuilding(terr, street, streetName, associatedStreet, housenumbers, i, from != null ? Integer.toString(from + i * step) : null, buildingValue)); - - this.commands.add(new AddCommand(terr)); - } - - if (deleteOutline) { + + if (i > 0 || keepOutline) { + this.commands.add(new AddCommand(terr)); + } else { + this.commands.add(new ChangeCommand(outline, terr)); + } + } + + if (!keepOutline) { // Delete outline nodes having no tags and referrers but the outline itself List nodes = outline.getNodes(); ArrayList nodesToDelete = new ArrayList<>(); for (Node n : nodes) - if (!n.hasKeys() && n.getReferrers().size() == 1 && !reused_nodes.contains(n)) + if (!n.hasKeys() && n.getReferrers().size() == 1 && !reusedNodes.contains(n)) nodesToDelete.add(n); - if (nodesToDelete.size() > 0) + if (!nodesToDelete.isEmpty()) this.commands.add(DeleteCommand.delete(Main.main.getEditLayer(), nodesToDelete)); - // Delete the way itself without nodes - this.commands.add(DeleteCommand.delete(Main.main.getEditLayer(), Collections.singleton(outline), false, true)); - } } else { // Single building, just add the address details - ways.add(addressBuilding(outline, street, streetName, associatedStreet, housenumbers, 0, From, buildingValue)); - } - - // Remove the address nodes since their tags have been incorporated into - // the terraces. + ways.add(addressBuilding(outline, street, streetName, associatedStreet, housenumbers, 0, start, buildingValue)); + } + + // Remove the address nodes since their tags have been incorporated into the terraces. // Or should removing them also be an option? if (!housenumbers.isEmpty()) { @@ -426,31 +420,50 @@ if (handleRelations) { // create a new relation or merge with existing if (associatedStreet == null) { // create a new relation - associatedStreet = new Relation(); - associatedStreet.put("type", "associatedStreet"); - if (street != null) { // a street was part of the selection - associatedStreet.put("name", street.get("name")); - associatedStreet.addMember(new RelationMember("street", street)); - } else { - associatedStreet.put("name", streetName); - } - for (Way w : ways) { - associatedStreet.addMember(new RelationMember("house", w)); - } - this.commands.add(new AddCommand(associatedStreet)); + addNewAssociatedStreetRelation(street, streetName, ways); } else { // relation exists already - add new members - Relation newAssociatedStreet = new Relation(associatedStreet); - // remove housenumbers as they have been deleted - newAssociatedStreet.removeMembersFor(housenumbers); - for (Way w : ways) { - newAssociatedStreet.addMember(new RelationMember("house", w)); - } - if (deleteOutline) { - newAssociatedStreet.removeMembersFor(outline); - } - this.commands.add(new ChangeCommand(associatedStreet, newAssociatedStreet)); - } - } - - Main.main.undoRedo.add(new SequenceCommand(tr("Terrace"), commands) { + updateAssociatedStreetRelation(associatedStreet, housenumbers, ways); + } + } + + Main.main.undoRedo.add(createTerracingCommand(outline)); + if (nb <= 1 && street != null) { + // Select the way (for quick selection of a new house (with the same way)) + Main.main.getCurrentDataSet().setSelected(street); + } else { + // Select the new building outlines (for quick reversing) + Main.main.getCurrentDataSet().setSelected(ways); + } + } + + private void updateAssociatedStreetRelation(Relation associatedStreet, List housenumbers, Collection ways) { + Relation newAssociatedStreet = new Relation(associatedStreet); + // remove housenumbers as they have been deleted + newAssociatedStreet.removeMembersFor(housenumbers); + for (Way w : ways) { + newAssociatedStreet.addMember(new RelationMember("house", w)); + } + /*if (!keepOutline) { + newAssociatedStreet.removeMembersFor(outline); + }*/ + this.commands.add(new ChangeCommand(associatedStreet, newAssociatedStreet)); + } + + private void addNewAssociatedStreetRelation(Way street, String streetName, Collection ways) { + Relation associatedStreet = new Relation(); + associatedStreet.put("type", "associatedStreet"); + if (street != null) { // a street was part of the selection + associatedStreet.put("name", street.get("name")); + associatedStreet.addMember(new RelationMember("street", street)); + } else { + associatedStreet.put("name", streetName); + } + for (Way w : ways) { + associatedStreet.addMember(new RelationMember("house", w)); + } + this.commands.add(new AddCommand(associatedStreet)); + } + + private Command createTerracingCommand(final Way outline) { + return new SequenceCommand(tr("Terrace"), commands) { @Override public boolean executeCommand() { @@ -481,14 +494,7 @@ return result; } - }); - if (nb <= 1 && street != null) { - // Select the way (for quick selection of a new house (with the same way)) - Main.main.getCurrentDataSet().setSelected(street); - } else { - // Select the new building outlines (for quick reversing) - Main.main.getCurrentDataSet().setSelected(ways); - } - } - + }; + } + /** * Adds address details to a single building @@ -500,7 +506,8 @@ * @param buildingValue The value for {@code building} key to add * @return {@code outline} - * @throws UserCancelException - */ - private Way addressBuilding(Way outline, Way street, String streetName, Relation associatedStreet, ArrayList housenumbers, int i, String defaultNumber, String buildingValue) throws UserCancelException { + * @throws UserCancelException + */ + private Way addressBuilding(Way outline, Way street, String streetName, Relation associatedStreet, + List housenumbers, int i, String defaultNumber, String buildingValue) throws UserCancelException { Node houseNum = (housenumbers != null && i >= 0 && i < housenumbers.size()) ? housenumbers.get(i) : null; boolean buildingAdded = false; @@ -508,13 +515,13 @@ if (houseNum != null) { primitives = Arrays.asList(new OsmPrimitive[]{houseNum, outline}); - + TagCollection tagsToCopy = TagCollection.unionOfAllPrimitives(primitives).getTagsFor(houseNum.keySet()); tagsInConflict = tagsToCopy.getTagsFor(tagsToCopy.getKeysWithMultipleValues()); tagsToCopy = tagsToCopy.minus(tagsInConflict).minus(TagCollection.from(outline)); - + for (Tag tag : tagsToCopy) { this.commands.add(new ChangePropertyCommand(outline, tag.getKey(), tag.getValue())); } - + buildingAdded = houseNum.hasKey("building"); numberAdded = houseNum.hasKey("addr:housenumber");