Changeset 6854 in josm for trunk/src/org

Timestamp:

2014-02-16T12:34:38+01:00 (10 years ago)

Author:

bastiK

Message:

applied #9724 - User-defined WMS SRS setting for custom projections (patch by anonymous)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/CustomProjection.java (modified) (3 diffs)
• gui/preferences/projection/CustomProjectionChoice.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -68 +68 @@
         no_defs("no_defs", false),
         init("init", true),
-        // JOSM extension, not present in PROJ.4
+        // JOSM extensions, not present in PROJ.4
+        wmssrs("wmssrs", true),
         bounds("bounds", true);
 
@@ -152 +153 @@
                 this.bounds = parseBounds(s);
             }
+            s = parameters.get(Param.wmssrs.key);
+            if (s != null) {
+                this.code = s;
+            }
         }
     }
@@ -174 +179 @@
                 if (m.groupCount() >= 3) {
                     value = m.group(3);
-                    // same aliases
+                    // some aliases
                     if (key.equals(Param.proj.key)) {
                         if (value.equals("longlat") || value.equals("latlon") || value.equals("latlong")) {

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

@@ -188 +188 @@
             s.append(listKeys(Projections.nadgrids)+"<br>");
             s.append("<b>+bounds=</b>minlon,minlat,maxlon,maxlat - <i>"+tr("Projection bounds (in degrees)")+"</i><br>");
+            s.append("<b>+wmssrs=</b>EPSG:123456 - <i>"+tr("WMS SRS (EPSG code)")+"</i><br>");
 
             return new HtmlPanel(s.toString());