Ticket #19545: josm-units.patch

src/org/openstreetmap/josm/data/SystemOfMeasurement.java

@@ -74 +74 @@
      * Known systems of measurement.
      * @since 3406
      */
-    public static final Map<String, SystemOfMeasurement> ALL_SYSTEMS = Collections.unmodifiableMap(
+    public static final Map<String, SystemOfMeasurement> ALL_SYSTEMS =
             Stream.of(METRIC, CHINESE, IMPERIAL, NAUTICAL_MILE)
-            .collect(Collectors.toMap(SystemOfMeasurement::getName, Function.identity())));
+            .collect(Collectors.toMap(SystemOfMeasurement::getName, Function.identity()));
 
     /**
      * Preferences entry for system of measurement.

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -333 +333 @@
         checkModifiable();
         this.version = version;
     }
+    
+    private double scale = 1;
+    
+    @Override
+    public double getScale() {
+        return scale;
+    }
+    
+    @Override
+    public void setScale(double scale) {
+        if (scale > 0) {
+            this.scale = scale;
+        }
+    }
 
     @Override
     public DownloadPolicy getDownloadPolicy() {

src/org/openstreetmap/josm/data/osm/OsmData.java

@@ -35 +35 @@
      * @return the API version this dataset was created from. May be null.
      */
     String getVersion();
+    
+    double getScale();
+    
+    void setScale(double scale);
 
     /**
      * Returns the name of this data set (optional).

src/org/openstreetmap/josm/io/AbstractReader.java

@@ -390 +390 @@
             ds.lock();
         }
     }
+    
+    protected final void parseScale(String scale) {
+        if (scale != null) {
+            double sc = 1;
+            try {
+                sc = Double.parseDouble(scale);
+            } catch (NumberFormatException e) {
+                sc = 1;
+            }
+            ds.setScale(sc);
+        }
+    }
 
     protected final void parseBounds(String generator, String minlon, String minlat, String maxlon, String maxlat, String origin)
             throws IllegalDataException {

src/org/openstreetmap/josm/io/OsmReader.java

@@ -144 +144 @@
             parseDownloadPolicy("download", parser.getAttributeValue(null, "download"));
             parseUploadPolicy("upload", parser.getAttributeValue(null, "upload"));
             parseLocked(parser.getAttributeValue(null, "locked"));
+            parseScale(parser.getAttributeValue(null, "scale"));
         } catch (IllegalDataException e) {
             throwException(e);
         }

src/org/openstreetmap/josm/io/OsmWriter.java

@@ -108 +108 @@
     }
 
     private void header(DownloadPolicy download, UploadPolicy upload, boolean locked) {
+        header(download, upload, locked, 1);
+    }
+
+    private void header(DownloadPolicy download, UploadPolicy upload, boolean locked, double scale) {
         out.println("<?xml version='1.0' encoding='UTF-8'?>");
         out.print("<osm version='");
         out.print(version);
@@ -122 +126 @@
         if (locked) {
             out.print("' locked='true");
         }
+        if (scale != 1 && scale > 0) {
+            out.print("' scale='");
+            out.print(Double.toString(scale));
+        }
         out.println("' generator='JOSM'>");
     }
 
@@ -158 +166 @@
      * @since 12800
      */
     public void write(DataSet data) {
-        header(data.getDownloadPolicy(), data.getUploadPolicy(), data.isLocked());
+        header(data.getDownloadPolicy(), data.getUploadPolicy(), data.isLocked(), data.getScale());
         writeDataSources(data);
         writeContent(data);
         footer();