Changeset 7013 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2014-04-27T15:48:04+02:00 (10 years ago)

Author:

Don-vip

Message:

drop support of OSM API 0.5

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -395 +395 @@
         }
 
-        // copy the merged layer's API version, downgrade if required
+        // copy the merged layer's API version
         if (data.getVersion() == null) {
             data.setVersion(from.getVersion());
-        } else if ("0.5".equals(data.getVersion()) ^ "0.5".equals(from.getVersion())) {
-            Main.warn(tr("Mixing 0.6 and 0.5 data results in version 0.5"));
-            data.setVersion("0.5");
         }