Changeset 33608 in osm

Timestamp:

2017-09-15T20:25:12+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm15312 - update to JOSM 12859

Location:

applications/editors/josm/plugins/terracer

Files:

• build.xml (modified) (1 diff)
• src/terracer/HouseNumberInputDialog.java (modified) (2 diffs)
• src/terracer/HouseNumberInputHandler.java (modified) (2 diffs)
• src/terracer/TerracerAction.java (modified) (12 diffs)

applications/editors/josm/plugins/terracer/build.xml

@@ -2 +2 @@
 <project name="terracer" default="dist" basedir=".">
     <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/>
-    <property name="plugin.main.version" value="12678"/>
+    <property name="plugin.main.version" value="12859"/>
     <property name="plugin.author" value="Matt Amos"/>
     <property name="plugin.class" value="terracer.TerracerPlugin"/>

applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionSet;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.tools.GBC;
@@ -311 +313 @@
 
         if (buildingComboBox == null) {
-            final List<AutoCompletionListItem> values = MainApplication
-                .getLayerManager().getEditDataSet().getAutoCompletionManager().getValues("building");
-
             buildingComboBox = new AutoCompletingComboBox();
-            buildingComboBox.setPossibleACItems(values);
+            buildingComboBox.setPossibleAcItems(AutoCompletionManager.of(Main.main.getEditDataSet()).getTagValues("building"));
             buildingComboBox.setEditable(true);
             if (buildingType != null && !buildingType.isEmpty()) {

applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UserCancelException;
@@ -391 +391 @@
         } else {
             String name;
-            if (selected instanceof AutoCompletionListItem) {
-               name = ((AutoCompletionListItem) selected).getValue();
+            if (selected instanceof AutoCompletionItem) {
+               name = ((AutoCompletionItem) selected).getValue();
             } else {
                name = selected.toString();

applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java

@@ -12 +12 @@
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -30 +32 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -60 +63 @@
 public final class TerracerAction extends JosmAction {
 
-    // smsms1 asked for the last value to be remembered to make it easier to do
-    // repeated terraces. this is the easiest, but not necessarily nicest, way.
-    // private static String lastSelectedValue = "";
-
-    Collection<Command> commands;
-
+    private Collection<Command> commands;
     private Collection<OsmPrimitive> primitives;
     private TagCollection tagsInConflict;
@@ -347 +345 @@
         this.commands = new LinkedList<>();
         Collection<Way> ways = new LinkedList<>();
+        DataSet ds = getLayerManager().getEditDataSet();
 
         if (nb > 1) {
@@ -355 +354 @@
                 newNodes[1][i] = interpolateAlong(interp.b, backLength * iDir / nb);
                 if (!outline.containsNode(newNodes[0][i]))
-                    this.commands.add(new AddCommand(newNodes[0][i]));
+                    this.commands.add(new AddCommand(ds, newNodes[0][i]));
                 else
                     reusedNodes.add(newNodes[0][i]);
                 if (!outline.containsNode(newNodes[1][i]))
-                    this.commands.add(new AddCommand(newNodes[1][i]));
+                    this.commands.add(new AddCommand(ds, newNodes[1][i]));
                 else
                     reusedNodes.add(newNodes[1][i]);
@@ -388 +387 @@
                 if (createNewWay) {
                     ways.add(terr);
-                    this.commands.add(new AddCommand(terr));
+                    this.commands.add(new AddCommand(ds, terr));
                 } else {
                     ways.add(outline);
@@ -404 +403 @@
                 }
                 if (!nodesToDelete.isEmpty())
-                    this.commands.add(DeleteCommand.delete(MainApplication.getLayerManager().getEditLayer(), nodesToDelete));
+                    this.commands.add(DeleteCommand.delete(nodesToDelete));
             }
         } else {
@@ -415 +414 @@
         // Or should removing them also be an option?
         if (!housenumbers.isEmpty()) {
-            commands.add(DeleteCommand.delete(MainApplication.getLayerManager().getEditLayer(),
-                    housenumbers, true, true));
+            commands.add(DeleteCommand.delete(housenumbers, true, true));
         }
 
@@ -462 +460 @@
             associatedStreet.addMember(new RelationMember("house", w));
         }
-        this.commands.add(new AddCommand(associatedStreet));
+        this.commands.add(new AddCommand(getLayerManager().getEditDataSet(), associatedStreet));
     }
 
@@ -514 +512 @@
         boolean buildingAdded = false;
         boolean numberAdded = false;
+        Map<String, String> tags = new HashMap<>();
         if (houseNum != null) {
             primitives = Arrays.asList(new OsmPrimitive[]{houseNum, outline});
@@ -522 +521 @@
 
             for (Tag tag : tagsToCopy) {
-                this.commands.add(new ChangePropertyCommand(outline, tag.getKey(), tag.getValue()));
+                tags.put(tag.getKey(), tag.getValue());
             }
 
@@ -529 +528 @@
         }
         if (!buildingAdded && buildingValue != null && !buildingValue.isEmpty()) {
-            this.commands.add(new ChangePropertyCommand(outline, "building", buildingValue));
+            tags.put("building", buildingValue);
         }
         if (defaultNumber != null && !numberAdded) {
-            this.commands.add(new ChangePropertyCommand(outline, "addr:housenumber", defaultNumber));
+            tags.put("addr:housenumber", defaultNumber);
         }
         // Only put addr:street if no relation exists or if it has no name
         if (associatedStreet == null || !associatedStreet.hasKey("name")) {
             if (street != null) {
-                this.commands.add(new ChangePropertyCommand(outline, "addr:street", street.get("name")));
+                tags.put("addr:street", street.get("name"));
             } else if (streetName != null && !streetName.trim().isEmpty()) {
-                this.commands.add(new ChangePropertyCommand(outline, "addr:street", streetName.trim()));
-            }
+                tags.put("addr:street", streetName.trim());
+            }
+        }
+        if (!tags.isEmpty()) {
+            commands.add(new ChangePropertyCommand(getLayerManager().getEditDataSet(), Collections.singleton(outline), tags));
         }
     }