Changeset 4452 in josm

Timestamp:

Sep 19, 2011 3:19:11 PM (20 months ago)

Author:

bastiK

Message:

remaining parameters for imagery preferences

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (1 diff)
• imagery/ImageryInfo.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -967 +967 @@
                     continue;
                 }
+            } else if (f.getType() == Double.class || f.getType() == double.class) {
+                try {
+                    value = Double.parseDouble(valueString);
+                } catch (NumberFormatException nfe) {
+                    continue;
+                }
             } else  if (f.getType() == String.class) {
                 value = valueString;

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

@@ -86 +86 @@
         @pref String type;
         @pref String url;
+        @pref double pixel_per_eastnorth;
         @pref String eula;
         @pref String attribution_text;
         @pref String attribution_url;
+        @pref String logo_image;
         @pref String terms_of_use_url;
         @pref String country_code = "";
@@ -105 +107 @@
             type = i.imageryType.getUrlString();
             url = i.url;
+            pixel_per_eastnorth = i.pixelPerDegree;
             eula = i.eulaAcceptanceRequired;
             attribution_text = i.attributionText;
             attribution_url = i.attributionLinkURL;
+            logo_image = i.attributionImage;
             terms_of_use_url = i.termsOfUseURL;
             country_code = i.countryCode;
@@ -173 +177 @@
         name = e.name;
         url = e.url;
+        cookies = e.cookies;
         eulaAcceptanceRequired = e.eula;
         for (ImageryType type : ImageryType.values()) {
@@ -180 +185 @@
             }
         }
+        pixelPerDegree = e.pixel_per_eastnorth;
         defaultMaxZoom = e.max_zoom;
         defaultMinZoom = e.min_zoom;
@@ -198 +204 @@
         }
         attributionText = e.attribution_text;
+        attributionImage = e.logo_image;
         attributionLinkURL = e.attribution_url;
         termsOfUseURL = e.terms_of_use_url;