Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
82cf073
update gitignore
Stefal Oct 20, 2024
e2615bd
Read GPSHPositioningError from images and display this value on the i…
Stefal Oct 21, 2024
75b4fb8
Merge branch 'JOSM:master' into master
Stefal Nov 1, 2024
932ed59
Manage more exif tags during gps track correlation with images :
Stefal Nov 4, 2024
4a37573
Read GPSHPositioningError from images and display this value on the i…
Stefal Oct 21, 2024
b8b0186
Manage more exif tags during gps track correlation with images :
Stefal Nov 4, 2024
2f118f1
Merge branch 'add-GPSHPositioningError-into-images' of https://github…
Stefal Nov 4, 2024
cb3779c
Fix Float/Double/String mismatch for hposerr and pdopvalue
Stefal Nov 4, 2024
2299456
Fix type for stdhdev and pdop
Stefal Nov 5, 2024
1abe52f
rounded value for hposerr and dop
Stefal Nov 5, 2024
c448d22
Removing unneeded attribute for image to waypoint conversion
Stefal Nov 5, 2024
44bb869
removing logging
Stefal Nov 5, 2024
793c5dc
Set Datum option in image/gpx correlation is now visible only in expe…
Stefal Nov 5, 2024
2e07d2f
Include expert settings in an expertPanel
Stefal Nov 6, 2024
ba541b9
Save gpsdatum value to geoimage.datum preference
Stefal Nov 6, 2024
85549ee
comment
Stefal Nov 7, 2024
b41227a
Manage Double
Stefal Nov 7, 2024
1f29713
Merge branch 'JOSM:master' into master
Stefal Nov 17, 2024
49b507d
add java launch.json with josm dev arguments
Stefal Nov 19, 2024
9d53997
add multiline tooltip
Stefal Nov 19, 2024
04fb0e8
Move extended panel bellow direction panel
Stefal Nov 20, 2024
6051771
Merge branch 'JOSM:master' into master
Stefal Feb 14, 2025
86e10b9
Merge branch 'JOSM:master' into master
Stefal Feb 18, 2025
6cce2a4
Merge branch 'JOSM:master' into master
Stefal Feb 19, 2025
81b0b88
Merge branch 'master' into add-GPSHPositioningError-into-images
Stefal Feb 20, 2025
6b53f56
some checkstyle fixes
Stefal Feb 20, 2025
0e08b1c
Merge branch 'JOSM:master' into master
Stefal Feb 20, 2025
b742c8e
Merge branch 'master' into add-GPSHPositioningError-into-images
Stefal Feb 20, 2025
7fdd452
fix getGpsDop test.
Stefal Apr 16, 2025
01067f2
lowestProcIndex should be >= 0 or it won't be a valid Array index
Stefal Apr 17, 2025
52e4556
Add button to toggle extended metadata informations on the image view…
Stefal Apr 19, 2025
ad30e34
sync previous patch
Stefal Apr 19, 2025
2c7be02
Fix wrong default value.
Stefal Apr 19, 2025
01f1050
Already fixed
Stefal Apr 19, 2025
98eb56d
Write and read new variable in session importer/exporter:
Stefal Apr 19, 2025
60ab618
update epsg code in tooltip
Stefal Apr 19, 2025
8bf03a8
Syntax fix and more javadoc
Stefal Apr 19, 2025
33a05ea
Adding exif reading tests
Stefal Apr 19, 2025
b7b02a0
remove unused file
Stefal Apr 19, 2025
072a9f6
Merge branch 'master' of https://github.com/Stefal/josm
Stefal Apr 20, 2025
079fcff
Fix typo : gps or Gps -> GPS
Stefal Apr 20, 2025
cda4014
Fix typo on abbreviations: dop/Dop -> DOP
Stefal Apr 20, 2025
7eebd85
Uppercase for Gps
Stefal Apr 22, 2025
8fe6def
Read GPSHPositioningError from images and display this value on the i…
Stefal Oct 21, 2024
e34546d
Manage more exif tags during gps track correlation with images :
Stefal Nov 4, 2024
57fd0ba
Fix Float/Double/String mismatch for hposerr and pdopvalue
Stefal Nov 4, 2024
93156d5
Fix type for stdhdev and pdop
Stefal Nov 5, 2024
8a5d120
rounded value for hposerr and dop
Stefal Nov 5, 2024
7bca3e1
Removing unneeded attribute for image to waypoint conversion
Stefal Nov 5, 2024
985cab6
removing logging
Stefal Nov 5, 2024
7a4732a
Set Datum option in image/gpx correlation is now visible only in expe…
Stefal Nov 5, 2024
1ced906
Include expert settings in an expertPanel
Stefal Nov 6, 2024
b91cbfa
Save gpsdatum value to geoimage.datum preference
Stefal Nov 6, 2024
36276d0
comment
Stefal Nov 7, 2024
be9f87a
Manage Double
Stefal Nov 7, 2024
ab1a76e
add java launch.json with josm dev arguments
Stefal Nov 19, 2024
190286a
add multiline tooltip
Stefal Nov 19, 2024
a0a1cc1
Move extended panel bellow direction panel
Stefal Nov 20, 2024
0ab3210
some checkstyle fixes
Stefal Feb 20, 2025
c976a5f
fix getGpsDop test.
Stefal Apr 16, 2025
2f31a84
lowestProcIndex should be >= 0 or it won't be a valid Array index
Stefal Apr 17, 2025
4036fd2
Add button to toggle extended metadata informations on the image view…
Stefal Apr 19, 2025
067aea6
Already fixed
Stefal Apr 19, 2025
815905f
Write and read new variable in session importer/exporter:
Stefal Apr 19, 2025
10a97f7
update epsg code in tooltip
Stefal Apr 19, 2025
68b4747
Syntax fix and more javadoc
Stefal Apr 19, 2025
df53175
Adding exif reading tests
Stefal Apr 19, 2025
8df5bc3
remove unused file
Stefal Apr 19, 2025
6edf054
Fix typo : gps or Gps -> GPS
Stefal Apr 20, 2025
c7b81ca
Fix typo on abbreviations: dop/Dop -> DOP
Stefal Apr 20, 2025
92e6866
Uppercase for Gps
Stefal Apr 22, 2025
179d40b
Fix bad merge
Stefal Apr 23, 2025
1b57093
Merge branch 'add-GPSHPositioningError-into-images' of https://github…
Stefal Apr 23, 2025
b8a7224
syntax fixes
Stefal Apr 23, 2025
47da321
checkstyle: Add whitespace after typecast
Stefal Apr 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
/resources/data/projection/
/src/org/openstreetmap/josm/gui/mappaint/mapcss/parsergen/
/tools/ivy/
/target/
43 changes: 43 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "java",
"name": "Current File",
"request": "launch",
"mainClass": "${file}"
},
{
"type": "java",
"name": "ProjectionCLI",
"request": "launch",
"mainClass": "org.openstreetmap.josm.data.projection.ProjectionCLI",
"projectName": "josm"
},
{
"type": "java",
"name": "ProjectionRefTest",
"request": "launch",
"mainClass": "org.openstreetmap.josm.data.projection.ProjectionRefTest",
"projectName": "josm"
},
{
"type": "java",
"name": "ProjectionRegressionTest",
"request": "launch",
"mainClass": "org.openstreetmap.josm.data.projection.ProjectionRegressionTest",
"projectName": "josm"
},
{
"type": "java",
"name": "MainApplication",
"request": "launch",
"mainClass": "org.openstreetmap.josm.gui.MainApplication",
"projectName": "josm",
"vmArgs": "-Djosm.dir.name=JOSM-dev --add-exports=java.base/sun.security.action=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED",
}
]
}
Binary file added nodist/data/exif-position-error.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
77 changes: 77 additions & 0 deletions src/org/openstreetmap/josm/data/ImageData.java
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,83 @@ public void updateImageDirection(ImageEntry img, double direction) {
afterImageUpdated(img);
}

/**
* Update the GPS track direction of the image and trigger update.
* @param img the image to update
* @param trackDirection the new GPS track direction
* @since xxx
*/
public void updateImageGpsTrack(ImageEntry img, double trackDirection) {
img.setExifGpsTrack(trackDirection);
afterImageUpdated(img);
}

/**
* Update the image horizontal positioning error and trigger update.
* @param img the image to update
* @param hposerr the new horizontal positionning error
* @since xxx
*/
public void updateImageHPosErr(ImageEntry img, double hposerr) {
img.setExifHPosErr(hposerr);
afterImageUpdated(img);
}

/**
* Update the image GPS differential mode and trigger update.
* @param img the image to update
* @param gpsDiffMode the new GPS differential mode
* @since xxx
*/
public void updateImageGpsDiffMode(ImageEntry img, Integer gpsDiffMode) {
img.setGpsDiffMode(gpsDiffMode);
afterImageUpdated(img);
}

/**
* Update the image GPS 2d/3d mode value and trigger update.
* @param img the image to update
* @param gps2d3dMode the new 2d/3d GPS mode
* @since xxx
*/
public void updateImageGps2d3dMode(ImageEntry img, Integer gps2d3dMode) {
img.setGps2d3dMode(gps2d3dMode);
afterImageUpdated(img);
}

/**
* Update the image GPS DOP value and trigger update.
* @param img the image to update
* @param exifGpsDop the new GPS DOP value
* @since xxx
*/
public void updateImageExifGpsDop(ImageEntry img, Double exifGpsDop) {
img.setExifGpsDop(exifGpsDop);
afterImageUpdated(img);
}

/**
* Update the image GPS datum and trigger update.
* @param img the image to update
* @param exifGpsDatum the new datum string value
* @since xxx
*/
public void updateImageExifGpsDatum(ImageEntry img, String exifGpsDatum) {
img.setExifGpsDatum(exifGpsDatum);
afterImageUpdated(img);
}

/**
* Update the image GPS processing method and trigger update.
* @param img the image to update
* @param exifGpsProcMethod the new GPS processing method
* @since xxx
*/
public void updateImageExifGpsProcMethod(ImageEntry img, String exifGpsProcMethod) {
img.setExifGpsProcMethod(exifGpsProcMethod);
afterImageUpdated(img);
}

/**
* Manually trigger the {@link ImageDataUpdateListener#imageDataUpdated(ImageData)}
*/
Expand Down
9 changes: 7 additions & 2 deletions src/org/openstreetmap/josm/data/gpx/GpxConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ public interface GpxConstants {
* Fractional seconds are allowed for millisecond timing in tracklogs. */
String PT_TIME = "time";

/** True Course/Bearing angle over ground.
* @since xxx
*/
String PT_COURSE = "course";

/** Magnetic variation (in degrees) at the point. 0.0 <= value < 360.0 */
String PT_MAGVAR = "magvar";

Expand Down Expand Up @@ -188,8 +193,8 @@ public interface GpxConstants {
* Ordered list of all possible waypoint keys.
*/
List<String> WPT_KEYS = Collections.unmodifiableList(Arrays.asList(PT_ELE, PT_TIME, PT_MAGVAR, PT_GEOIDHEIGHT,
GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, PT_SYM, PT_TYPE,
PT_FIX, PT_SAT, PT_HDOP, PT_VDOP, PT_PDOP, PT_AGEOFDGPSDATA, PT_DGPSID, PT_STD_HDEV, PT_STD_VDEV));
GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, PT_SYM, PT_TYPE, PT_FIX, PT_SAT, PT_COURSE,
PT_HDOP, PT_VDOP, PT_PDOP, PT_AGEOFDGPSDATA, PT_DGPSID, PT_STD_HDEV, PT_STD_VDEV));

/**
* Ordered list of all possible route and track keys.
Expand Down
Loading