Changeset 36309 in osm

Timestamp:

2024-08-15T22:50:35+02:00 (4 months ago)

Author:

stoecker

Message:

fix regression of r35967, again support negative latitude or longitude, remove windows line encodings, fix warnings, use java 11, cleanup readmes

Location:

applications/editors/josm/plugins/ElevationProfile

Files:

• README (modified) (1 diff)
• build.xml (modified) (1 diff)
• pub.bat (deleted)
• src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/ElevationMapMode.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/HgtReader.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/elevation/IElevationProfile.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/UnitMode.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationWayPointKind.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/gpx/GeoidCorrectionKind.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxWaypointVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileController.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileLoader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileSource.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/grid/SimpleVertexRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/gui/TextAlignment.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/gui/TriangleDir.java (modified) (1 diff)

applications/editors/josm/plugins/ElevationProfile/README

@@ -7 +7 @@
 
 SRTM data in test/data is downloaded from http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/Eurasia/
-
-Please report bugs to oliver.wieland@online.de.

applications/editors/josm/plugins/ElevationProfile/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="[josm_elevationprofile]"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="18494"/>
+    <property name="plugin.main.version" value="18970"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java

@@ -247 +247 @@
         }
 
-        int delta = (int) Math.max(Math.ceil(origSize / targetSize), 2);
+        int delta = (int) Math.max(origSize / targetSize, 2);
 
         List<WayPoint> res = new ArrayList<>(targetSize);

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationMapMode.java

@@ -9 +9 @@
 
 /**
+ * Provides the map mode and controls visibility of the elevation profile layer/panel.
  * @author Oliver Wieland <oliver.wieland@online.de>
- * Provides the map mode and controls visibility of the elevation profile layer/panel.
  */
 public class ElevationMapMode extends MapMode implements IElevationModelListener {

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/HgtReader.java

@@ -107 +107 @@
         try (InputStream fis = Compression.getUncompressedFileInputStream(Paths.get(file))) {
             // choose the right endianness
-            ByteBuffer bb = ByteBuffer.wrap(IOUtils.toByteArray(fis));
-            //System.out.println(Arrays.toString(bb.array()));
+            ByteBuffer bb = ByteBuffer.wrap(fis.readAllBytes());
             bb.order(ByteOrder.BIG_ENDIAN);
-            int size = (int) Math.sqrt(bb.array().length / 2);
+            int size = (int) Math.sqrt(bb.array().length / 2.0);
             data = new short[size][size];
             int x = 0;
@@ -130 +129 @@
      * Reads the elevation value for the given coordinate.
      *
-     * See also <a href="http://gis.stackexchange.com/questions/43743/how-to-extract-elevation-from-hgt-file">stackexchange.com</a>
+     * See also <a href="https://gis.stackexchange.com/questions/43743/how-to-extract-elevation-from-hgt-file">stackexchange.com</a>
      * @param coor the coordinate to get the elevation data for
      * @return the elevation value or <code>Double.NaN</code>, if no value is present
@@ -142 +141 @@
      * Reads the elevation value for the given coordinate.
      *
-     * See also <a href="http://gis.stackexchange.com/questions/43743/how-to-extract-elevation-from-hgt-file">stackexchange.com</a>
+     * See also <a href="https://gis.stackexchange.com/questions/43743/how-to-extract-elevation-from-hgt-file">stackexchange.com</a>
      * @param coor the coordinate to get the elevation data for
      * @param fileName The expected filename
@@ -205 +204 @@
 
         float fraction = ((float) SRTM_EXTENT) / (mapSize - 1);
-        int latitude = (int) Math.round(frac(latDegrees) / fraction);
-        int longitude = (int) Math.round(frac(lonDegrees) / fraction);
+        int latitude = (int) Math.round(frac(Math.abs(latDegrees)) / fraction);
+        int longitude = (int) Math.round(frac(Math.abs(lonDegrees)) / fraction);
         if (latDegrees >= 0)
         {

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationProfile.java

@@ -9 +9 @@
 
 /**
+ * Interface for an elevation profile providing special properties/values.
  * @author Oliver Wieland <oliver.wieland@online.de>
- * Interface for an elevation profile providing special properties/values.
  */
 public interface IElevationProfile {

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/UnitMode.java

@@ -3 +3 @@
 
 /**
+ * Enumeration for different unit types.
  * @author Oliver Wieland <oliver.wieland@online.de>
- * Enumeration for different unit types.
  */
 public enum UnitMode {

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java

@@ -24 +24 @@
  */
 public class ElevationModel implements IGpxVisitor, IElevationModel {
-    // private int sliceSize;
     private int trackCounter;
     private final GpxData gpxData;
@@ -61 +60 @@
 
     /**
+     * Return the tracks of the elevation model
      * @return the tracks
      */

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationWayPointKind.java

@@ -3 +3 @@
 
 /**
+ * Enumeration which classifies way points within an elevation profile.
  * @author Oliver Wieland <oliver.wieland@online.de>
- * Enumeration which classifies way points within an elevation profile.
  */
 public enum ElevationWayPointKind {

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GeoidCorrectionKind.java

@@ -3 +3 @@
 
 /**
+ * Enumeration for available elevation correction modes.
  * @author Oliver Wieland <oliver.wieland@online.de>
- * Enumeration for available elevation correction modes.
  */
 public enum GeoidCorrectionKind {

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxWaypointVisitor.java

@@ -5 +5 @@
 
 /**
+ * Interface for all GPX data visitors. Hopefully this will be part of JOSM some day.
  * @author Oliver Wieland <oliver.wieland@online.de>
- * Interface for all GPX data visitors. Hopefully this will be part of JOSM some day.
  */
 public interface IGpxWaypointVisitor {

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java

@@ -41 +41 @@
 
 /**
+ * Elevation grid display layer
  * @author Oliver Wieland <oliver.wieland@online.de>
  *
@@ -284 +285 @@
 
     @Override
-    public void destroy() {
+    public synchronized void destroy() {
         super.destroy();
         HgtReader.clearCache();

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileController.java

@@ -44 +44 @@
         return tile;
     }
-
-    /**
-     *
-     */
 }

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileLoader.java

@@ -19 +19 @@
 
 /**
+ * Tile loader for the elevation grid display
  * @author Olli
  *
@@ -24 +25 @@
 public class ElevationGridTileLoader extends TMSCachedTileLoader {
 
-    class ElevationGridTileJob extends JCSCachedTileLoaderJob<String, BufferedImageCacheEntry> implements TileJob {
+    static class ElevationGridTileJob extends JCSCachedTileLoaderJob<String, BufferedImageCacheEntry> implements TileJob {
 
         private final Tile tile;
         private final TileLoaderListener listener;
-        private final ICacheAccess<String, BufferedImageCacheEntry> cache;
 
         protected ElevationGridTileJob(TileLoaderListener listener, Tile tile, ICacheAccess<String, BufferedImageCacheEntry> cache, TileJobOptions options,
                 ThreadPoolExecutor downloadJobExecutor) {
             super(cache, options, downloadJobExecutor);
-            this.cache = cache;
             this.tile = tile;
             this.listener = listener;

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileSource.java

@@ -8 +8 @@
 
 /**
+ * Tile source class for the tile loader
  * @author Olli
- *
  */
 public class ElevationGridTileSource extends TMSTileSource {

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/SimpleVertexRenderer.java

@@ -8 +8 @@
 
 /**
+ * Simple implementation of vertex renderer
  * @author Olli
  *

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java

@@ -46 +46 @@
 
 /**
- * @author Oliver Wieland <oliver.wieland@online.de>
  * Implements a JOSM ToggleDialog to show the elevation profile. It monitors the
  * connection between layer and elevation profile.
+ * @author Oliver Wieland <oliver.wieland@online.de>
  */
 public class ElevationProfileDialog extends ToggleDialog

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TextAlignment.java

@@ -3 +3 @@
 
 /**
+ * Different text alignments
  * @author Oliver Wieland <oliver.wieland@online.de>
- *
  */
 public enum TextAlignment {

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TriangleDir.java

@@ -3 +3 @@
 
 /**
+ * All the triangle directions
  * @author Oliver Wieland <oliver.wieland@online.de>
- *
  */
 public enum TriangleDir {