Changeset 33155 in osm for applications/editors/josm/plugins/opendata
- Timestamp:
- 2017-02-25T01:08:38+01:00 (8 years ago)
- Location:
- applications/editors/josm/plugins/opendata
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/opendata/.classpath
r32680 r33155 27 27 </classpathentry> 28 28 <classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/> 29 <classpathentry combineaccessrules="false" kind="src" path="/JOSM-EJML"/> 29 30 <classpathentry kind="output" path="bin"/> 30 31 </classpath> -
applications/editors/josm/plugins/opendata/build.xml
r32900 r33155 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <project name="opendata" default="dist" basedir="."> 3 <property name="plugin.main.version" value="1 0580"/>3 <property name="plugin.main.version" value="11606"/> 4 4 <property name="plugin.author" value="Don-vip"/> 5 5 <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
r32545 r33155 2 2 package org.openstreetmap.josm.plugins.opendata.core.datasets; 3 3 4 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil. combineTigerTags;4 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.applyAutomaticTagConflictResolution; 5 5 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.completeTagCollectionForEditing; 6 6 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.normalizeTagCollectionBeforeEditing; … … 126 126 127 127 TagCollection completeWayTags = new TagCollection(wayTags); 128 combineTigerTags(completeWayTags);128 applyAutomaticTagConflictResolution(completeWayTags); 129 129 normalizeTagCollectionBeforeEditing(completeWayTags, ways); 130 130 TagCollection tagsToEdit = new TagCollection(completeWayTags);
Note:
See TracChangeset
for help on using the changeset viewer.