Changeset 4405 in josm for trunk/src/org

Timestamp:

2011-09-07T23:54:08+02:00 (13 years ago)

Author:

simon04

Message:

fix #6740 - prefix imagery layer by country code

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (3 diffs)
• gui/preferences/ImageryPreference.java (modified) (3 diffs)
• io/imagery/ImageryReader.java (modified) (2 diffs)

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

@@ -58 +58 @@
     private String attributionLinkURL;
     private String termsOfUseURL;
+    private String countryCode = "";
 
     public ImageryInfo() {
@@ -166 +167 @@
     public int compareTo(ImageryInfo in)
     {
-        int i = name.compareTo(in.name);
-        if(i == 0) {
+        int i = countryCode.compareTo(in.countryCode);
+        if (i == 0) {
+            i = name.compareTo(in.name);
+        }
+        if (i == 0) {
             i = url.compareTo(in.url);
         }
-        if(i == 0) {
+        if (i == 0) {
             i = Double.compare(pixelPerDegree, in.pixelPerDegree);
         }
@@ -295 +299 @@
     }
 
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    public void setCountryCode(String countryCode) {
+        this.countryCode = countryCode;
+    }
+
     /**
      * Get the projections supported by the server. Only relevant for

trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java

@@ -390 +390 @@
 
             TableColumnModel mod = listdef.getColumnModel();
-            mod.getColumn(1).setPreferredWidth(800);
-            mod.getColumn(0).setPreferredWidth(200);
+            mod.getColumn(2).setPreferredWidth(800);
+            mod.getColumn(1).setPreferredWidth(400);
+            mod.getColumn(0).setPreferredWidth(50);
             mod = listActive.getColumnModel();
             mod.getColumn(2).setPreferredWidth(50);
@@ -641 +642 @@
         class ImageryDefaultLayerTableModel extends DefaultTableModel {
             public ImageryDefaultLayerTableModel() {
-                setColumnIdentifiers(new String[] { tr("Menu Name (Default)"), tr("Imagery URL (Default)") });
+                setColumnIdentifiers(new String[]{"", tr("Menu Name (Default)"), tr("Imagery URL (Default)")});
             }
 
@@ -658 +659 @@
                 switch (column) {
                 case 0:
+                    return info.getCountryCode();
+                case 1:
                     return info.getName();
-                case 1:
+                case 2:
                     return info.getExtendedUrl();
                 }

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

@@ -236 +236 @@
                         "terms-of-use-text",
                         "terms-of-use-url",
+                        "country-code",
                     }).contains(qName)) {
                         newState = State.ENTRY_ATTRIBUTE;
@@ -353 +354 @@
                     } else if (qName.equals("terms-of-use-url")) {
                         entry.setTermsOfUseURL(accumulator.toString());
+                    } else if (qName.equals("country-code")) {
+                        entry.setCountryCode(accumulator.toString());
+                    } else {
                     }
                     break;