Ticket #11783: terracer.patch

terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputDialog.java

@@ -94 +94 @@
             String buildingType, boolean relationExists, List<Node> houseNumbers) {
         super(MainApplication.getMainFrame(),
                 tr("Terrace a house"),
-                new String[] {tr("OK"), tr("Cancel")},
+                new String[] { tr("Long side"), tr("Short side"), tr("Cancel") },
                 true
         );
         this.inputHandler = handler;
@@ -106 +106 @@
         handler.dialog = this;
         JPanel content = getInputPanel();
         setContent(content);
-        setButtonIcons("ok", "cancel");
+        setButtonIcons("ok", "ok", "cancel");
         getJContentPane();
         initialize();
         setDefaultButton(1);

terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputHandler.java

@@ -128 +128 @@
         isOk &= checkNumberStringField(dialog.segments, tr("Segments"),
                         message);
 
-        JButton okButton = getButton(dialog, "OK");
-        if (okButton != null)
-            okButton.setEnabled(isOk);
+        JButton longSideButton = getButton(dialog, tr("Long side"));
+        if (longSideButton != null)
+            longSideButton.setEnabled(isOk);
+        JButton shortSideButton = getButton(dialog, tr("Short side"));
+        if (shortSideButton != null)
+            shortSideButton.setEnabled(isOk);
         if (isOk) {
 
             // For some reason the messageLabel doesn't want to show up
@@ -271 +274 @@
         // OK or Cancel button-actions
         if (e.getSource() instanceof JButton) {
             JButton button = (JButton) e.getSource();
-            if (tr("OK").equals(button.getActionCommand()) && button.isEnabled()) {
+            if (tr("Long side").equals(button.getActionCommand()) && button.isEnabled()) {
                 if (validateInput()) {
                     saveValues();
 
@@ -287 +290 @@
                         housenumbers,
                         streetName(),
                         doHandleRelation(),
-                        doKeepOutline(), buildingType());
+                        doKeepOutline(), buildingType(),
+                        false);
+
+                    this.dialog.setVisible(false);
+                }
+            } else if (tr("Short side").equals(button.getActionCommand()) && button.isEnabled()) {
+                if (validateInput()) {
+                    saveValues();
+
+                    terracerAction.terraceBuilding(
+                        outline,
+                        init,
+                        street,
+                        associatedStreet,
+                        segments(),
+                        dialog.lo.getText(),
+                        dialog.hi.getText(),
+                        stepSize(),
+                        housenumbers,
+                        streetName(),
+                        doHandleRelation(),
+                        doKeepOutline(), buildingType(),
+                        true);
 
                     this.dialog.setVisible(false);
                 }

terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java

@@ -215 +215 @@
             // Special case of one outline and one address node.
             // Don't open the dialog
             terraceBuilding(outline, init, street, associatedStreet, 0, null, null, 0,
-                    housenumbers, streetname, associatedStreet != null, false, "yes");
+                    housenumbers, streetname, associatedStreet != null, false, "yes", false);
         } else {
             String title = trn("Change {0} object", "Change {0} objects", sel.size(), sel.size());
             // show input dialog.
@@ -300 +300 @@
      *        existing relation
      * @param keepOutline If the outline way should be kept
      * @param buildingValue The value for {@code building} key to add
+     * @param invertSide If true, splits on the short side instead of the long side
      */
     public void terraceBuilding(final Way outline, Node init, Way street, Relation associatedStreet, Integer segments,
                 String start, String end, int step, List<Node> housenumbers, String streetName, boolean handleRelations,
-                boolean keepOutline, String buildingValue) {
+                boolean keepOutline, String buildingValue, boolean invertSide) {
         final int nb;
         Integer to;
         Integer from = null;
@@ -326 +327 @@
         }
 
         // now find which is the longest side connecting the first node
-        Pair<Way, Way> interp = findFrontAndBack(outline);
+        Pair<Way, Way> interp = findFrontAndBack(outline, invertSide);
 
         final boolean swap = init != null && (init.equals(interp.a.lastNode()) || init.equals(interp.b.lastNode()));
 
@@ -595 +596 @@
      * segments to find the "sides". Sides are assumed to be single segments
      * which cannot be contiguous.
      *
-     * @param w The way to analyse.
+     * @param invertSide If true, forces the use of the alternative (adjacent) pair
+     *                   of sides, effectively rotating the split axis.
      * @return A pair of ways (front, back) pointing in the same directions.
      */
-    private static Pair<Way, Way> findFrontAndBack(Way w) {
+    private static Pair<Way, Way> findFrontAndBack(Way w, boolean invertSide) {
         // calculate the "side-ness" score for each segment of the way
         double[] sideness = calculateSideness(w);
 
@@ -627 +629 @@
             side2 = (side2 + 1) % (w.getNodesCount() - 1);
         }
 
+        // if inverted, shift the selection to the adjacent segments to use the
+        // alternative pair of sides (e.g. top/bottom instead of left/right).
+        if (invertSide) {
+            side1 = (side1 + 1) % (w.getNodesCount() - 1);
+            side2 = (side2 + 1) % (w.getNodesCount() - 1);
+        }
+
         // swap side1 and side2 into sorted order.
         if (side1 > side2) {
             int tmp = side2;

terracer/test/unit/org/openstreetmap/josm/plugins/terracer/ReverseTerraceActionTest.java

@@ -51 +51 @@
         way2.addNode(way2.firstNode());
         dataSet.setSelected(way2);
         new TerracerAction().terraceBuilding(way2, null, null, null, 5,
-                "80", "88", 2, Collections.emptyList(), null, false, false, "apartments");
+                "80", "88", 2, Collections.emptyList(), null, false, false, "apartments", false);
         final List<Way> addressedWays = dataSet.getWays().stream().filter(w -> w != way1)
                 .sorted(Comparator.comparingLong(w -> -w.getUniqueId())).collect(Collectors.toList());
         assertAll("Terrace should work as expected", () -> assertEquals(5, addressedWays.size()),