Ignore:
Timestamp:
2018-03-04T15:18:05+01:00 (21 months ago)
Author:
Don-vip
Message:

fix #16051, see #8039, see #10456 - more fixes for download/upload policies and locked status (merge of layers)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r13462 r13497  
    552552        }
    553553
    554         Area a = data.getDataSourceArea();
    555 
    556         // copy the merged layer's data source info.
    557         // only add source rectangles if they are not contained in the layer already.
    558         for (DataSource src : from.getDataSources()) {
    559             if (a == null || !a.contains(src.bounds.asRect())) {
    560                 data.addDataSource(src);
    561             }
    562         }
    563 
    564         // copy the merged layer's API version
    565         if (data.getVersion() == null) {
    566             data.setVersion(from.getVersion());
    567         }
    568 
    569554        int numNewConflicts = 0;
    570555        for (Conflict<?> c : visitor.getConflicts()) {
Note: See TracChangeset for help on using the changeset viewer.