Changeset 33155 in osm for applications/editors/josm/plugins

Timestamp:

2017-02-25T01:08:38+01:00 (8 years ago)

Author:

donvip

Message:

see #josm14374 - update to JOSM 11606

Location:

applications/editors/josm/plugins/opendata

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/.classpath

@@ -27 +27 @@
         </classpathentry>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-EJML"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="11606"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.core.datasets;
 
-import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.combineTigerTags;
+import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.applyAutomaticTagConflictResolution;
 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.completeTagCollectionForEditing;
 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.normalizeTagCollectionBeforeEditing;
@@ -126 +126 @@
 
         TagCollection completeWayTags = new TagCollection(wayTags);
-        combineTigerTags(completeWayTags);
+        applyAutomaticTagConflictResolution(completeWayTags);
         normalizeTagCollectionBeforeEditing(completeWayTags, ways);
         TagCollection tagsToEdit = new TagCollection(completeWayTags);