Changeset 16328 in josm for trunk/src/org
- Timestamp:
- 2020-04-17T21:27:35+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io/remotecontrol
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
r15319 r16328 11 11 import java.awt.event.KeyEvent; 12 12 import java.awt.event.MouseEvent; 13 import java.util.Arrays;14 13 import java.util.Collection; 15 14 import java.util.HashMap; … … 18 17 import java.util.Map.Entry; 19 18 import java.util.Set; 20 import java.util.stream.Collectors;21 19 22 20 import javax.swing.AbstractAction; … … 38 36 import org.openstreetmap.josm.gui.util.TableHelper; 39 37 import org.openstreetmap.josm.tools.GBC; 38 import org.openstreetmap.josm.tools.TextTagParser; 40 39 41 40 /** … … 293 292 * @since 15316 294 293 */ 295 public static String[][] parseUrlTagsToKeyValues(String urlSection) { 296 return Arrays.stream(urlSection.split("\\|")) 297 .map(String::trim) 298 .filter(tag -> !tag.isEmpty() && tag.contains("=")) 299 .map(tag -> tag.split("\\s*=\\s*", 2)) 300 .map(pair -> { 301 pair[1] = pair.length < 2 ? "" : pair[1]; 302 return pair; 303 }) 304 .collect(Collectors.toList()).toArray(new String[][] {}); 294 public static Map<String, String> parseUrlTagsToKeyValues(String urlSection) { 295 return TextTagParser.readTagsByRegexp(urlSection, "\\|", "(.*?)=(.*?)", false); 305 296 } 306 297 … … 313 304 */ 314 305 public static void addTags(String[][] keyValue, String sender, Collection<? extends OsmPrimitive> primitives) { 315 if (trustedSenders.contains(sender)) { 316 if (MainApplication.getLayerManager().getEditDataSet() != null) { 317 for (String[] row : keyValue) { 318 UndoRedoHandler.getInstance().add(new ChangePropertyCommand(primitives, row[0], row[1])); 319 } 320 } 321 } else { 322 new AddTagsDialog(keyValue, sender, primitives).showDialog(); 323 } 306 new AddTagsDialog(keyValue, sender, primitives).showDialog(); 324 307 } 325 308 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
r16324 r16328 269 269 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 270 270 if (ds != null) { 271 for (String[] key : AddTagsDialog.parseUrlTagsToKeyValues(args.get("changeset_tags"))) { 272 ds.addChangeSetTag(key[0], key[1]); 273 } 271 AddTagsDialog.parseUrlTagsToKeyValues(args.get("changeset_tags")).forEach(ds::addChangeSetTag); 274 272 } 275 273 });
Note:
See TracChangeset
for help on using the changeset viewer.