Changeset 13536 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2018-03-17T17:01:12+01:00 (6 years ago)

Author:

stoecker

Message:

add possibility to change map ids (see #14655), add overlay flag for imagery

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• ImageryInfo.java (modified) (11 diffs)
• ImageryLayerInfo.java (modified) (2 diffs)

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

@@ -27 +27 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.StructUtils.StructEntry;
 import org.openstreetmap.josm.io.Capabilities;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.IPreferences;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -199 +201 @@
       */
     private boolean bestMarked;
+    /**
+      * marked as overlay
+      * @since 13536
+      */
+    private boolean overlay;
+    /**
+      * list of old IDs, only for loading, not handled anywhere else
+      * @since 13536
+      */
+    private Collection<String> oldIds;
     /** mirrors of different type for this entry */
     private List<ImageryInfo> mirrors;
@@ -245 +257 @@
         @StructEntry boolean bestMarked;
         @StructEntry boolean modTileFeatures;
+        @StructEntry boolean overlay;
         // TODO: disabled until change of layers is implemented
         // @StructEntry String default_layers;
@@ -271 +284 @@
             date = i.date;
             bestMarked = i.bestMarked;
+            overlay = i.overlay;
             logo_image = i.attributionImage;
             logo_url = i.attributionImageURL;
@@ -439 +453 @@
         date = e.date;
         bestMarked = e.bestMarked;
+        overlay = e.overlay;
         termsOfUseText = e.terms_of_use_text;
         termsOfUseURL = e.terms_of_use_url;
@@ -494 +509 @@
         this.date = i.date;
         this.bestMarked = i.bestMarked;
+        this.overlay = i.overlay;
         // do not copy field {@code mirrors}
         this.icon = i.icon;
@@ -526 +542 @@
                 Objects.equals(this.modTileFeatures, other.modTileFeatures) &&
                 Objects.equals(this.bestMarked, other.bestMarked) &&
+                Objects.equals(this.overlay, other.overlay) &&
                 Objects.equals(this.isGeoreferenceValid, other.isGeoreferenceValid) &&
                 Objects.equals(this.cookies, other.cookies) &&
@@ -901 +918 @@
 
     /**
+     * Return the sorted list of activated Imagery IDs
+     * @since 13536
+     */
+    static public Collection<String> getActiveIds() {
+        ArrayList<String> ids = new ArrayList<String>();
+        IPreferences pref = Config.getPref();
+        if (pref != null) {
+            List<ImageryPreferenceEntry> entries = StructUtils.getListOfStructs(
+                pref, "imagery.entries", null, ImageryPreferenceEntry.class);
+            if (entries != null) {
+                for (ImageryPreferenceEntry prefEntry : entries) {
+                    if(prefEntry.id != null && prefEntry.id.length() != 0)
+                        ids.add(prefEntry.id);
+                }
+                Collections.sort(ids);
+            }
+        }
+        return ids;
+    }
+    
+    /**
      * Returns a tool tip text for display.
      * @return The text
@@ -917 +955 @@
             html = true;
         }
+        if (overlay) {
+            res.append("<br>").append(tr("This imagery is an overlay."));
+            html = true;
+        }
         String desc = getDescription();
         if (desc != null && !desc.isEmpty()) {
@@ -1215 +1257 @@
 
     /**
+     * Returns the overlay indication.
+     * @return <code>true</code> if it is and overlay.
+     * @since 13536
+     */
+    public boolean isOverlay() {
+        return overlay;
+    }
+
+    /**
      * Sets an indicator that in other editors it is marked as best imagery
      * @param bestMarked <code>true</code> if it is marked as best in other editors.
@@ -1221 +1272 @@
     public void setBestMarked(boolean bestMarked) {
         this.bestMarked = bestMarked;
+    }
+
+    /**
+     * Sets overlay indication
+     * @param overlay <code>true</code> if it is an overlay.
+     * @since 13536
+     */
+    public void setOverlay(boolean overlay) {
+        this.overlay = overlay;
+    }
+
+    /**
+     * Adds an old Id.
+     *
+     * @param id the Id to be added
+     * @since 13536
+     */
+    public void addOldId(String id) {
+       if (oldIds == null) {
+           oldIds = new ArrayList<>();
+       }
+       oldIds.add(id);
+    }
+
+    /**
+     * Get old Ids.
+     *
+     * @return collection of ids
+     * @since 13536
+     */
+    public Collection<String> getOldIds() {
+        return oldIds;
     }
 

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

@@ -50 +50 @@
 
     private static final String[] DEFAULT_LAYER_SITES = {
-        Main.getJOSMWebsite()+"/maps"
+        Main.getJOSMWebsite()+"/maps%<?ids=>"
     };
 
@@ -224 +224 @@
                 }
                 idMap.put(i.getId(), i);
+                Collection<String> old = i.getOldIds();
+                if(old != null) {
+                    for (String id : old) {
+                        if (idMap.containsKey(id)) {
+                            Logging.error("Old Id ''{0}'' is not unique - used by ''{1}'' and ''{2}''!",
+                                    i.getId(), i.getName(), idMap.get(i.getId()).getName());
+                        } else {
+                            idMap.put(id, i);
+                        }
+                    }
+                }
             }
         }