Changeset 12486 in josm for trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

Timestamp:

2017-07-22T14:25:19+02:00 (7 years ago)

Author:

bastiK

Message:

see #15013, see #14877 - remember projection when session is saved to a .jos/.joz file

File:

• trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -11 +11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -40 +41 @@
 import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -213 +215 @@
         doc.appendChild(root);
 
-        Element viewportEl = doc.createElement("viewport");
-        root.appendChild(viewportEl);
-        Element centerEl = doc.createElement("center");
-        viewportEl.appendChild(centerEl);
-        EastNorth center = Main.map.mapView.getCenter();
-        LatLon centerLL = Projections.inverseProject(center);
-        centerEl.setAttribute("lat", Double.toString(centerLL.lat()));
-        centerEl.setAttribute("lon", Double.toString(centerLL.lon()));
-        Element scale = doc.createElement("scale");
-        viewportEl.appendChild(scale);
-        double dist100px = Main.map.mapView.getDist100Pixel();
-        scale.setAttribute("meter-per-pixel", Double.toString(dist100px / 100));
+        writeViewPort(root);
+        writeProjection(root);
 
         Element layersEl = doc.createElement("layers");
@@ -263 +255 @@
     }
 
+    private void writeViewPort(Element root) {
+        Document doc = root.getOwnerDocument();
+        Element viewportEl = doc.createElement("viewport");
+        root.appendChild(viewportEl);
+        Element centerEl = doc.createElement("center");
+        viewportEl.appendChild(centerEl);
+        EastNorth center = Main.map.mapView.getCenter();
+        LatLon centerLL = Projections.inverseProject(center);
+        centerEl.setAttribute("lat", Double.toString(centerLL.lat()));
+        centerEl.setAttribute("lon", Double.toString(centerLL.lon()));
+        Element scale = doc.createElement("scale");
+        viewportEl.appendChild(scale);
+        double dist100px = Main.map.mapView.getDist100Pixel();
+        scale.setAttribute("meter-per-pixel", Double.toString(dist100px / 100));
+    }
+
+    private void writeProjection(Element root) {
+        Document doc = root.getOwnerDocument();
+        Element projectionEl = doc.createElement("projection");
+        root.appendChild(projectionEl);
+        String pcId = ProjectionPreference.getCurrentProjectionChoiceId();
+        Element projectionChoiceEl = doc.createElement("projection-choice");
+        projectionEl.appendChild(projectionChoiceEl);
+        Element idEl = doc.createElement("id");
+        projectionChoiceEl.appendChild(idEl);
+        idEl.setTextContent(pcId);
+        Collection<String> parameters = ProjectionPreference.getSubprojectionPreference(pcId);
+        Element parametersEl = doc.createElement("parameters");
+        projectionChoiceEl.appendChild(parametersEl);
+        for (String param : parameters) {
+            Element paramEl = doc.createElement("param");
+            parametersEl.appendChild(paramEl);
+            paramEl.setTextContent(param);
+        }
+        String code = Main.getProjection().toCode();
+        Element codeEl = doc.createElement("code");
+        projectionEl.appendChild(codeEl);
+        codeEl.setTextContent(code);
+    }
+
     /**
      * Writes given .jos document to an output stream.