Changeset 13792 in josm for trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

Timestamp:

2018-05-20T17:28:55+02:00 (6 years ago)

Author:

stoecker

Message:

fix #16103 - add map type definitions

File:

• trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryCategory;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.Shape;
@@ -220 +221 @@
                         "permission-ref",
                         "country-code",
+                        "category",
                         "icon",
                         "date",
@@ -425 +427 @@
                     break;
                 case "type":
-                    boolean found = false;
-                    for (ImageryType type : ImageryType.values()) {
-                        if (Objects.equals(accumulator.toString(), type.getTypeString())) {
-                            entry.setImageryType(type);
-                            found = true;
-                            break;
-                        }
-                    }
-                    if (!found) {
+                    ImageryType type = ImageryType.fromString(accumulator.toString());
+                    if(type != null)
+                        entry.setImageryType(type);
+                    else
                         skipEntry = true;
-                    }
                     break;
                 case "default":
@@ -524 +520 @@
                 case "minimum-tile-expire":
                     entry.setMinimumTileExpire(Integer.parseInt(accumulator.toString()));
+                    break;
+                case "category":
+                    String cat = accumulator.toString();
+                    ImageryCategory category = ImageryCategory.fromString(cat);
+                    if(category != null)
+                        entry.setImageryCategory(category);
+                    entry.setImageryCategoryOriginalString(cat);
                     break;
                 default: // Do nothing