Skip to content

Commit

Permalink
Merge pull request #112 from urbancamo/pom-refresh-remove-aws
Browse files Browse the repository at this point in the history
Pom refresh remove aws
  • Loading branch information
urbancamo authored Nov 18, 2024
2 parents 737ddb1 + 5382019 commit c5159e1
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 89 deletions.
3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
for the main outdoor activities such as SOTA, POTA, GMA, HEMA etc.
</description>

<groupId>uk.m0nom</groupId>
<artifactId>adif-processor</artifactId>
<version>1.4.15</version>
<groupId>uk.m0nom</groupId>
<artifactId>adif-processor</artifactId>
<version>1.4.16</version>

<name>ADIF Processor</name>
<url>https://github.com/urbancamo/adif-processor</url>
Expand Down Expand Up @@ -202,7 +202,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.14.0</version>
<version>2.12.0</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protected void processActivity(ActivityType type, Station station, String ref) {
if (type == ActivityType.POTA) {
// POTA can be a list
PotaList potaList = PotaList.valueOf(ref);
for (Pota pota: potaList.getPotaList()) {
for (Pota pota: potaList.getPotaList().reversed()) {
station.addActivity(activities.getDatabase(ActivityType.POTA).get(pota.getValue()));
}
} else {
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/uk/m0nom/adifproc/file/AwsInternalFileService.java

This file was deleted.

60 changes: 0 additions & 60 deletions src/main/java/uk/m0nom/adifproc/file/AwsS3FileUtils.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,11 @@ public String setMyLocationFromSotaId(Qso qso, String sotaId) {
}

private boolean setMyLocationFromActivities(Qso qso) {
boolean locationSetFromActivity = false;
for (Activity activity : qso.getFrom().getActivities()) {
setMyLocationFromActivity(qso.getFrom(), qso.getRecord(), activity);
locationSetFromActivity = true;
return true;
}
return locationSetFromActivity;
return false;
}

private void setMyGridFromCoords(Station station, Adif3Record rec, GlobalCoordinates coords) {
Expand Down Expand Up @@ -110,17 +109,15 @@ private void setMyLocationFromActivity(Station station, Adif3Record rec, Activit
}
}

private boolean setMyLocationFromRecGridsquare(Qso qso) {
private void setMyLocationFromRecGridsquare(Qso qso) {
Adif3Record rec = qso.getRecord();
if (rec.getMyGridSquare() != null && !MaidenheadLocatorConversion.isADubiousGridSquare(rec.getMyGridSquare())) {
// Less Accurate from a Gridsquare, but better than nothing
GlobalCoordinates myLoc = MaidenheadLocatorConversion.locatorToCoords(LocationSource.OVERRIDE, rec.getMyGridSquare());
rec.setMyCoordinates(myLoc);
qso.getFrom().setGrid(rec.getMyGridSquare());
qso.getFrom().setCoordinates(new GlobalCoords3D(myLoc, rec.getMyAltitude() != null ? rec.getMyAltitude() : 0.0));
return true;
}
return false;
}

private boolean setMyLocationFromQrzLatLong(Qso qso, QrzCallsign callsignData) {
Expand Down

0 comments on commit c5159e1

Please sign in to comment.