Changeset 35132 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2019-09-26T15:31:53+02:00 (5 years ago)

Author:

donvip

Message:

fix #josm17349 - IAE when not using associatedStreet relations

File:

• applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/actions/mapmode/Address.java

@@ -18 +18 @@
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -278 +279 @@
 
     private void addStreetNameOrRelation(OsmPrimitive osm, Collection<Command> cmds) {
+        DataSet ds = OsmDataManager.getInstance().getEditDataSet();
         if (Config.getPref().getBoolean("cadastrewms.addr.dontUseRelation", false)) {
-            cmds.add(new ChangePropertyCommand(osm, tagHouseStreet, inputStreet.getText()));
+            Map<String, String> tags = new HashMap<>();
+            tags.put(tagHouseStreet, inputStreet.getText());
+            cmds.add(new ChangePropertyCommand(ds, Arrays.asList(osm), tags));
         } else if (selectedWay != null) {
             Relation selectedRelation = findRelationAddr(selectedWay);
@@ -295 +299 @@
                 newRel.addMember(new RelationMember(relationAddrStreetRole, selectedWay));
                 newRel.addMember(new RelationMember(relationMemberHouse, osm));
-                cmds.add(new AddCommand(OsmDataManager.getInstance().getEditDataSet(), newRel));
+                cmds.add(new AddCommand(ds, newRel));
             }
         }