Changeset 5226 in josm for trunk/src

Timestamp:

2012-05-09T21:29:17+02:00 (12 years ago)

Author:

bastiK

Message:

improvements for custom projection

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• data/projection/CustomProjection.java (modified) (8 diffs)
• data/projection/CustomProjectionPrefGui.java (added)
• data/projection/GaussKrueger.java (modified) (5 diffs)
• data/projection/Lambert.java (modified) (3 diffs)
• data/projection/Projections.java (modified) (6 diffs)
• data/projection/datum/NTV2Datum.java (modified) (3 diffs)
• data/projection/datum/NTV2GridShiftFileWrapper.java (added)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)
• gui/preferences/projection (added)
• gui/preferences/projection/ProjectionPreference.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/preferences/map/ProjectionPreference.java ) (4 diffs)
• gui/preferences/projection/SubPrefsOptions.java (added)
• gui/widgets/AbstractTextComponentValidator.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -69 +69 @@
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
-import org.openstreetmap.josm.gui.preferences.map.ProjectionPreference;
 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitorExecutor;

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.GridBagLayout;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -14 +10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -21 +15 @@
 import org.openstreetmap.josm.data.projection.datum.CentricDatum;
 import org.openstreetmap.josm.data.projection.datum.Datum;
+import org.openstreetmap.josm.data.projection.datum.NTV2Datum;
+import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileWrapper;
 import org.openstreetmap.josm.data.projection.datum.SevenParameterDatum;
 import org.openstreetmap.josm.data.projection.datum.ThreeParameterDatum;
+import org.openstreetmap.josm.data.projection.datum.WGS84Datum;
 import org.openstreetmap.josm.data.projection.proj.Proj;
 import org.openstreetmap.josm.data.projection.proj.ProjParameters;
@@ -32 +29 @@
  * Inspired by PROJ.4 and Proj4J.
  */
-public class CustomProjection extends AbstractProjection implements ProjectionSubPrefs {
-
-    private String pref = "";
-
-    public void update(String pref) {
-        try {
+public class CustomProjection extends AbstractProjection {
+
+    /**
+     * pref String that defines the projection
+     *
+     * null means fall back mode (Mercator)
+     */
+    protected String pref = null;
+
+    public void update(String pref) throws ProjectionConfigurationException {
+        if (pref == null) {
+            this.pref = null;
+            ellps = Ellipsoid.WGS84;
+            datum = WGS84Datum.INSTANCE;
+            proj = new org.openstreetmap.josm.data.projection.proj.Mercator();
+        } else {
             Map<String, String> parameters = new HashMap<String, String>();
             String[] parts = pref.trim().split("\\s+");
             for (int i = 0; i < parts.length; i++) {
                 String part = parts[i];
-                if (part.charAt(0) != '+')
+                if (part.isEmpty() || part.charAt(0) != '+')
                     throw new ProjectionConfigurationException(tr("Parameter must begin with a ''+'' sign (found ''{0}'')", part));
                 Matcher m = Pattern.compile("\\+([a-zA-Z0-9_]+)(=(.*))?").matcher(part);
@@ -74 +81 @@
                 this.k_0 = parseDouble(s, "k_0");
             }
-        } catch (ProjectionConfigurationException e) {
-            System.err.println(e.toString()); // FIXME
-        }
-        this.pref = pref;
+            this.pref = pref;
+        }
     }
 
@@ -121 +126 @@
 
     public Datum parseDatum(Map<String, String> parameters, Ellipsoid ellps) throws ProjectionConfigurationException {
+        String nadgridsId = parameters.get("nadgrids");
+        if (nadgridsId != null) {
+            NTV2GridShiftFileWrapper nadgrids = Projections.getNadgrids(nadgridsId);
+            if (nadgrids == null)
+                throw new ProjectionConfigurationException(tr("Grid shift file ''{0}'' for option +nadgrids not supported.", nadgridsId));
+            return new NTV2Datum(nadgridsId, null, ellps, nadgrids);
+        }
+
         String towgs84 = parameters.get("towgs84");
         if (towgs84 != null)
@@ -298 +311 @@
     @Override
     public String toCode() {
-        return Utils.md5Hex(pref).substring(0, 10);
+        return "proj:" + (pref == null ? "ERROR" : pref);
     }
 
     @Override
     public String getCacheDirectoryName() {
-        return toCode();
+        return "proj-"+Utils.md5Hex(pref == null ? "" : pref).substring(0, 4);
     }
 
@@ -317 +330 @@
         return tr("Custom Projection (from PROJ.4 string)");
     }
-
-    @Override
-    public void setupPreferencePanel(JPanel p, ActionListener listener) {
-        JTextField input = new JTextField(pref, 50);
-        p.setLayout(new GridBagLayout());
-        p.add(input);
-    }
-
-    @Override
-    public Collection<String> getPreferences(JPanel p) {
-        Object prefTf = p.getComponent(0);
-        if (!(prefTf instanceof JTextField))
-            return null;
-        String pref = ((JTextField) prefTf).getText();
-        return Collections.singleton(pref);
-    }
-
-    @Override
-    public void setPreferences(Collection<String> args) {
-        update(args.iterator().next());
-    }
-
-    @Override
-    public String[] allCodes() {
-        return new String[0];
-    }
-
-    @Override
-    public Collection<String> getPreferencesFromCode(String code) {
-        return null;
-    }
-
 }

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

@@ -6 +6 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionListener;
-import java.io.InputStream;
 import java.util.Collection;
 import java.util.Collections;
@@ -14 +13 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.datum.NTV2Datum;
-import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFile;
+import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileWrapper;
 import org.openstreetmap.josm.data.projection.proj.ProjParameters;
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
@@ -35 +33 @@
     };
 
-    private static NTV2GridShiftFile BETA2007 = null;
-
     private static String[] zones = { "2", "3", "4", "5" };
 
@@ -44 +40 @@
 
     public GaussKrueger(int zone) {
-        if (BETA2007 == null) {
-            try {
-                String gridFileName = "BETA2007.gsb";
-                InputStream is = Main.class.getResourceAsStream("/data/"+gridFileName);
-                if (is == null)
-                    throw new RuntimeException(tr("Error: failed to open input stream for resource ''/data/{0}''.", gridFileName));
-                BETA2007 = new NTV2GridShiftFile();
-                BETA2007.loadGridShiftFile(is, false);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
         updateParameters(zone);
     }
@@ -62 +46 @@
         this.zone = zone;
         ellps = Ellipsoid.Bessel1841;
-        datum = new NTV2Datum("BETA2007", null, ellps, BETA2007);
+        datum = new NTV2Datum("BETA2007", null, ellps, NTV2GridShiftFileWrapper.BETA2007);
         ////less acurrate datum (errors up to 3m):
         //datum = new SevenParameterDatum(

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.projection.datum.NTV2Datum;
 import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFile;
+import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileWrapper;
 import org.openstreetmap.josm.data.projection.proj.LambertConformalConic;
 import org.openstreetmap.josm.data.projection.proj.ProjParameters;
@@ -77 +78 @@
     private int layoutZone;
 
-    private static NTV2GridShiftFile ntf_rgf93Grid = null;
-
-    public static NTV2GridShiftFile getNtf_rgf93Grid() {
-        return ntf_rgf93Grid;
-    }
-
     public Lambert() {
-        if (ntf_rgf93Grid == null) {
-            try {
-                String gridFileName = "ntf_r93_b.gsb";
-                InputStream is = Main.class.getResourceAsStream("/data/"+gridFileName);
-                if (is == null) {
-                    throw new RuntimeException(tr("Error: failed to open input stream for resource ''/data/{0}''. Cannot load NTF<->RGF93 grid", gridFileName));
-                }
-                ntf_rgf93Grid = new NTV2GridShiftFile();
-                ntf_rgf93Grid.loadGridShiftFile(is, false);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
         updateParameters(DEFAULT_ZONE);
     }
@@ -103 +85 @@
         this.layoutZone = layoutZone;
         ellps = Ellipsoid.clarkeIGN;
-        datum = new NTV2Datum("ntf_rgf93Grid", null, ellps, ntf_rgf93Grid);
+        datum = new NTV2Datum("ntf_rgf93Grid", null, ellps, NTV2GridShiftFileWrapper.ntf_rgf93);
         x_0 = x_0s[layoutZone];
         lon_0 = 2.0 + 20.0 / 60 + 14.025 / 3600; // 0 grade Paris

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.datum.Datum;
+import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileWrapper;
 import org.openstreetmap.josm.data.projection.datum.WGS84Datum;
 import org.openstreetmap.josm.data.projection.proj.LambertConformalConic;
@@ -16 +17 @@
 import org.openstreetmap.josm.data.projection.proj.SwissObliqueMercator;
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -49 +49 @@
     static {
         if (Main.pref.getBoolean("customprojection")) {
-            addProjection(new CustomProjection());
+            addProjection(new CustomProjectionPrefGui());
         }
     }
@@ -86 +86 @@
     private static Map<String, Class<? extends Proj>> projs = new HashMap<String, Class<? extends Proj>>();
     private static Map<String, Datum> datums = new HashMap<String, Datum>();
+    private static Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<String, NTV2GridShiftFileWrapper>();
 
     static {
@@ -99 +100 @@
 
         datums.put("WGS84", WGS84Datum.INSTANCE);
+
+        nadgrids.put("BETA2007.gsb", NTV2GridShiftFileWrapper.BETA2007);
+        nadgrids.put("ntf_r93_b.gsb", NTV2GridShiftFileWrapper.ntf_rgf93);
     }
 
@@ -122 +126 @@
         return datums.get(id);
     }
+
+    public static NTV2GridShiftFileWrapper getNadgrids(String id) {
+        return nadgrids.get(id);
+    }
 }

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Datum.java

@@ -10 +10 @@
 public class NTV2Datum extends AbstractDatum {
 
-    protected NTV2GridShiftFile nadgrids;
+    protected NTV2GridShiftFileWrapper nadgrids;
 
-    public NTV2Datum(String name, String proj4Id, Ellipsoid ellps, NTV2GridShiftFile nadgrids) {
+    public NTV2Datum(String name, String proj4Id, Ellipsoid ellps, NTV2GridShiftFileWrapper nadgrids) {
         super(name, proj4Id, ellps);
         this.nadgrids = nadgrids;
@@ -20 +20 @@
     public LatLon toWGS84(LatLon ll) {
         NTV2GridShift gs = new NTV2GridShift(ll);
-        nadgrids.gridShiftForward(gs);
+        nadgrids.getShiftFile().gridShiftForward(gs);
         return new LatLon(ll.lat() + gs.getLatShiftDegrees(), ll.lon() + gs.getLonShiftPositiveEastDegrees());
     }
@@ -27 +27 @@
     public LatLon fromWGS84(LatLon ll) {
         NTV2GridShift gs = new NTV2GridShift(ll);
-        nadgrids.gridShiftReverse(gs);
+        nadgrids.getShiftFile().gridShiftReverse(gs);
         return new LatLon(ll.lat() + gs.getLatShiftDegrees(), ll.lon() + gs.getLonShiftPositiveEastDegrees());
     }

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -43 +43 @@
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.help.Helpful;
-import org.openstreetmap.josm.gui.preferences.map.ProjectionPreference;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.Predicate;
 

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

@@ -39 +39 @@
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
 import org.openstreetmap.josm.gui.preferences.map.MapPreference;
-import org.openstreetmap.josm.gui.preferences.map.ProjectionPreference;
 import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.gui.preferences.shortcut.ShortcutPreference;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
-package org.openstreetmap.josm.gui.preferences.map;
+package org.openstreetmap.josm.gui.preferences.projection;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -85 +86 @@
     private JPanel projSubPrefPanelWrapper = new JPanel(new GridBagLayout());
 
+    private JLabel projectionCodeLabel;
+    private Component projectionCodeGlue;
     private JLabel projectionCode = new JLabel();
     private JLabel bounds = new JLabel();
@@ -122 +125 @@
         projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
         projPanel.add(projectionCombo, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
-        projPanel.add(new JLabel(tr("Projection code")), GBC.std().insets(25,5,0,5));
-        projPanel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
+        projPanel.add(projectionCodeLabel = new JLabel(tr("Projection code")), GBC.std().insets(25,5,0,5));
+        projPanel.add(projectionCodeGlue = GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
         projPanel.add(projectionCode, GBC.eop().fill(GBC.HORIZONTAL).insets(0,5,5,5));
         projPanel.add(new JLabel(tr("Bounds")), GBC.std().insets(25,5,0,5));
@@ -152 +155 @@
         CoordinateFormat cf = CoordinateFormat.getDefaultFormat();
         bounds.setText(b.getMin().latToString(cf)+"; "+b.getMin().lonToString(cf)+" : "+b.getMax().latToString(cf)+"; "+b.getMax().lonToString(cf));
+        boolean hideCode = proj instanceof SubPrefsOptions && !((SubPrefsOptions) proj).showProjectionCode();
+        projectionCodeLabel.setVisible(!hideCode);
+        projectionCodeGlue.setVisible(!hideCode);
+        projectionCode.setVisible(!hideCode);
     }
 

trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java

@@ -19 +19 @@
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -41 +42 @@
      */
     private Boolean valid = null;
+    // remember the message
+    private String msg;
 
     protected void feedbackInvalid(String msg) {
-        if (valid == null || valid) {
+        if (valid == null || valid || !Utils.equal(msg, this.msg)) {
             // only provide feedback if the validity has changed. This avoids
             // unnecessary UI updates.
@@ -50 +53 @@
             tc.setToolTipText(msg);
             valid = false;
+            this.msg = msg;
         }
     }
@@ -58 +62 @@
 
     protected void feedbackValid(String msg) {
-        if (valid == null || !valid) {
+        if (valid == null || !valid || !Utils.equal(msg, this.msg)) {
             // only provide feedback if the validity has changed. This avoids
             // unnecessary UI updates.
@@ -65 +69 @@
             tc.setToolTipText(msg == null ? "" : msg);
             valid = true;
+            this.msg = msg;
         }
     }
@@ -92 +97 @@
      */
     public AbstractTextComponentValidator(JTextComponent tc, boolean addActionListener) throws IllegalArgumentException {
+        this(tc, true, true, addActionListener);
+    }
+
+    public AbstractTextComponentValidator(JTextComponent tc, boolean addFocusListener, boolean addDocumentListener, boolean addActionListener) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(tc, "tc");
         this.tc = tc;
-        tc.addFocusListener(this);
-        tc.getDocument().addDocumentListener(this);
+        if (addFocusListener) {
+            tc.addFocusListener(this);
+        }
+        if (addDocumentListener) {
+            tc.getDocument().addDocumentListener(this);
+        }
         if (addActionListener) {
             if (tc instanceof JTextField) {