Changeset 13374 in josm

Timestamp:

2018-01-31T10:42:11+01:00 (7 years ago)

Author:

bastiK

Message:

fixed #15852 - add missing fields in ImageryInfo copy constructor (including tileSize)

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -460 +460 @@
     public ImageryInfo(ImageryInfo i) {
         super(i.name, i.url, i.id);
+        this.noTileHeaders = i.noTileHeaders;
+        this.noTileChecksums = i.noTileChecksums;
+        this.minZoom = i.minZoom;
+        this.maxZoom = i.maxZoom;
+        this.cookies = i.cookies;
+        this.tileSize = i.tileSize;
+        this.metadataHeaders = i.metadataHeaders;
+        this.modTileFeatures = i.modTileFeatures;
+
         this.origName = i.origName;
         this.langName = i.langName;
-        this.bestMarked = i.bestMarked;
         this.defaultEntry = i.defaultEntry;
-        this.cookies = i.cookies;
         this.eulaAcceptanceRequired = null;
         this.imageryType = i.imageryType;
@@ -472 +479 @@
         this.bounds = i.bounds;
         this.serverProjections = i.serverProjections;
+        this.description = i.description;
+        this.langDescription = i.langDescription;
         this.attributionText = i.attributionText;
+        this.permissionReferenceURL = i.permissionReferenceURL;
         this.attributionLinkURL = i.attributionLinkURL;
-        this.permissionReferenceURL = i.permissionReferenceURL;
         this.attributionImage = i.attributionImage;
         this.attributionImageURL = i.attributionImageURL;
@@ -481 +490 @@
         this.countryCode = i.countryCode;
         this.date = i.date;
+        this.bestMarked = i.bestMarked;
+        // do not copy field {@code mirrors}
         this.icon = i.icon;
-        this.description = i.description;
-        this.noTileHeaders = i.noTileHeaders;
-        this.noTileChecksums = i.noTileChecksums;
-        this.metadataHeaders = i.metadataHeaders;
         this.isGeoreferenceValid = i.isGeoreferenceValid;
         this.defaultLayers = i.defaultLayers;