Changeset 36463 in osm

Timestamp:

2025-11-06T16:11:22+01:00 (7 weeks ago)

Author:

GerdP

Message:

fix #21523: Setting the direction of a panned 360 photo causes a counterintuitive result

• apply photoadjust_21523_fix_direction_360.patch by gillux: "The arrow direction does not display the exif direction angle, instead it displays exif angle + image viewer angle. So when the plugin sets the exif angle from the arrow direction, it needs to substract the image viewer angle from it."
• remove targets from build.xml which invoke perl or overwrite the code to build javadoc

Location:

applications/editors/josm/plugins/photoadjust

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java (modified) (2 diffs)

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

@@ -26 +26 @@
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
-    <!-- ** internationalization ** -->
-    <import file="i18n/build-i18n.xml"/>
-
-    <target name="pot" description="Extract translatable strings from source." depends="gettext-init">
-        <mkdir dir="${plugin.po.dir}"/>
-        <gettext-extract keysFile="${ant.project.name}.pot" poDirectory="${plugin.po.dir}" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
-            <fileset dir="${plugin.src.dir}" includes="**/*.java"/>
-        </gettext-extract>
-        <echo file="${plugin.po.dir}/${ant.project.name}.pot" append="true">
-#. Plugin ${ant.project.name}
-#: build.xml:1
-msgid "${plugin.description}"
-msgstr ""
-</echo>
-    </target>
-
-    <!--
+  <!--
     **********************************************************
-    ** javadoc - create the plugin documentation
+    ** compile - complies the source tree
     **********************************************************
     -->
-    <target name="javadoc" description="generate documentation">
-        <javadoc destdir="${plugin.javadoc.dir}"
-                sourcepath="${plugin.src.dir}"
-                windowtitle="${ant.project.name}"
-                linksource="true"
-                private="true">
-            <classpath>
-                <pathelement location="${josm}"/>
-            </classpath>
-            <!-- Paths are relative to javadoc destdir (${plugin.javadoc.dir}). -->
-            <link href="../../../core/javadoc/"/>
-            <link href="https://josm.openstreetmap.de/doc/"/>
-            <link href="https://docs.oracle.com//javase/8/docs/api/"/>
-        </javadoc>
-    </target>
-
-    <target name="additional-manifest">
-        <antcall target="mftrans"/>
-    </target>
+  
 </project>

applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustWorker.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.layer.geoimage.ImageEntry;
 import org.openstreetmap.josm.gui.layer.geoimage.ImageViewerDialog;
+import org.openstreetmap.josm.gui.util.imagery.Vector3D;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -240 +242 @@
         }
         final LatLon mouseLL = MainApplication.getMap().mapView.getLatLon(evt.getX(), evt.getY());
+        Vector3D viewerVector = ImageViewerDialog.getInstance().getRotation(photo);
+        double viewerAngle = viewerVector != null ? Utils.toDegrees(viewerVector.getPolarAngle()) : 0d;
         // The projection doesn't matter here.
-        double direction = photoLL.bearing(mouseLL) * 360.0 / 2.0 / Math.PI;
+        double direction = photoLL.bearing(mouseLL) * 360.0 / 2.0 / Math.PI - viewerAngle;
         if (direction < 0.0) {
             direction += 360.0;