Changeset 15658 in josm

Timestamp:

2020-01-07T23:19:57+01:00 (5 years ago)

Author:

simon04

Message:

fix #18172 - Add new imagery categories "elevation" and "qa"

Location:

trunk

Files:

• data/maps.xsd (modified) (1 diff)
• images/data/imagery/elevation.png (added)
• images/data/imagery/qa.png (added)
• scripts/SyncEditorLayerIndex.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (2 diffs)

trunk/data/maps.xsd

@@ -682 +682 @@
                             <xs:element name="terms-of-use-url" minOccurs="0" maxOccurs="1" type="xs:string" />
                             <!-- The image category, don't use enumeration, so future extension is possible -->
-                            <!-- Currently defined values are: "photo", "map", "historicmap", "osmbasedmap", "historicphoto" and "other" -->
+                            <!-- Currently defined values are: "photo", "elevation", "map", "historicmap", "osmbasedmap", "historicphoto", "qa" and "other" -->
                             <xs:element name="category" minOccurs="1" maxOccurs="1" type="xs:string" />
                             <!-- The ISO 3166 country code -->

trunk/scripts/SyncEditorLayerIndex.java

@@ -1175 +1175 @@
                 }
             }
-            List<String> knownCategories = Arrays.asList("photo", "map", "historicmap", "osmbasedmap", "historicphoto", "other");
+            List<String> knownCategories = Arrays.asList(
+                    "photo", "elevation", "map", "historicmap", "osmbasedmap", "historicphoto", "qa", "other");
             String cat = getCategory(j);
             if (isBlank(cat)) {

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

@@ -112 +112 @@
         /** A aerial or satellite photo. **/
         PHOTO(/* ICON(data/imagery/) */ "photo", tr("Aerial or satellite photo")),
+        /** A map of digital terrain model or digital surface model. **/
+        ELEVATION(/* ICON(data/imagery/) */ "elevation", tr("Elevation map")),
         /** A map. **/
         MAP(/* ICON(data/imagery/) */ "map", tr("Map")),
@@ -120 +122 @@
         /** A historic or otherwise outdated aerial or satellite photo. **/
         HISTORICPHOTO(/* ICON(data/imagery/) */ "historicphoto", tr("Historic or otherwise outdated aerial or satellite photo")),
+        /** A map for quality assurance **/
+        QUALITY_ASSURANCE(/* ICON(data/imagery/) */ "qa", tr("Map for quality assurance")),
         /** Any other type of imagery **/
         OTHER(/* ICON(data/imagery/) */ "other", tr("Imagery not matching any other category"));