Changeset 4861 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2012-01-23T18:37:24+01:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
r4856 r4861 40 40 41 41 private String urlString; 42 42 43 ImageryType(String urlString) { 43 44 this.urlString = urlString; 44 45 } 46 45 47 public String getUrlString() { 46 48 return urlString; 49 } 50 51 public static ImageryType fromUrlString(String s) { 52 for (ImageryType type : ImageryType.values()) { 53 if (type.getUrlString().equals(s)) { 54 return type; 55 } 56 } 57 return null; 47 58 } 48 59 } … … 180 191 } 181 192 193 public ImageryInfo(String name, String url, String type, String eulaAcceptanceRequired, String cookies) { 194 this.name=name; 195 setExtendedUrl(url); 196 ImageryType t = ImageryType.fromUrlString(type); 197 this.cookies=cookies; 198 if (t != null) { 199 this.imageryType = t; 200 } 201 } 202 182 203 public ImageryInfo(String name, String url, String cookies, double pixelPerDegree) { 183 204 this.name=name; … … 194 215 cookies = e.cookies; 195 216 eulaAcceptanceRequired = e.eula; 196 for (ImageryType type : ImageryType.values()) { 197 if (type.getUrlString().equals(e.type)) { 198 imageryType = type; 199 break; 200 } 201 } 217 imageryType = ImageryType.fromUrlString(e.type); 202 218 if (imageryType == null) throw new IllegalArgumentException("unknown type"); 203 219 pixelPerDegree = e.pixel_per_eastnorth;
Note:
See TracChangeset
for help on using the changeset viewer.