Ticket #21820: 21820.patch

File 21820.patch, 1.2 KB (added by taylor.smock, 4 years ago)

Prefer attribution text over name

  • src/org/openstreetmap/josm/gui/layer/ImageryLayer.java 

    diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index 933933da39..7293483783 100644
    a b import org.openstreetmap.josm.tools.ImageProcessor;  
    4444import org.openstreetmap.josm.tools.ImageProvider;
    4545import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
    4646import org.openstreetmap.josm.tools.Logging;
     47import org.openstreetmap.josm.tools.Utils;
    4748
    4849/**
    4950 * Abstract base class for background imagery layers ({@link WMSLayer}, {@link TMSLayer}, {@link WMTSLayer}).
    … … public abstract class ImageryLayer extends Layer {  
    360361
    361362    @Override
    362363    public String getChangesetSourceTag() {
    363         return getInfo().getSourceName();
     364        final ImageryInfo currentInfo = getInfo();
     365        // ImageryInfo does not use zoom, topLeft, or botRight parameters as of JOSM r18368
     366        if (!Utils.isBlank(currentInfo.getAttributionText(0, null, null))) {
     367            return currentInfo.getAttributionText(0, null, null);
     368        }
     369        return currentInfo.getSourceName();
    364370    }
    365371}