Minecon724/wtapi
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages 1 Wiki Activity Actions

city in coordinates

Browse source
This commit is contained in:
Minecon724 2024-06-22 12:52:19 +02:00
parent 93bf7e16c1
commit cbe97329b2
Signed by: Minecon724
GPG key ID: 3CCC4D267742C8E8
6 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
release.properties Normal file
View file

@ -0,0 +1,21 @@
#release configuration
#Sat Jun 22 12:52:10 CEST 2024
completedPhase=check-poms
exec.pomFileName=pom.xml
exec.snapshotReleasePluginAllowed=false
pinExternals=false
preparationGoals=clean verify
project.scm.eu.m724\:wtapi.developerConnection=scm\:git\:git@git.724.rocks\:Minecon724/wtapi.git
project.scm.eu.m724\:wtapi.tag=wtapi-0.5
projectVersionPolicyConfig=<projectVersionPolicyConfig>${projectVersionPolicyConfig}</projectVersionPolicyConfig>\n
projectVersionPolicyId=default
pushChanges=true
releaseStrategyId=default
remoteTagging=true
scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel}
scm.commentPrefix=[maven-release-plugin]
scm.developmentCommitComment=@{prefix} prepare for next development iteration
scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel}
scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel}
scm.tagNameFormat=@{project.artifactId}-@{project.version}
scm.url=scm\:git\:git@git.724.rocks\:Minecon724/wtapi.git

11
src/main/java/eu/m724/wtapi/object/Coordinates.java
View file

@ -6,9 +6,20 @@ package eu.m724.wtapi.object;
*/
public class Coordinates {
public double latitude, longitude;
public String country, city; // TODO should it stay here?
public Coordinates(double latitude, double longitude) {
this.latitude = (((latitude + 90) % 180) + 180) % 180 - 90;
this.longitude = (((longitude + 180) % 360) + 360) % 360 - 180;
}
public Coordinates setAddress(String country, String city) {
this.country = country;
this.city = city;
return this;
}
public String getAddress() {
return city + ", " + country;
}
}

2
src/main/java/eu/m724/wtapi/object/Weather.java
View file

@ -33,8 +33,6 @@ public class Weather {
*/
public long sunrise, sunset;
public String city;
/**
* short name of weather
*/

11
src/main/java/eu/m724/wtapi/provider/weather/impl/openweathermap/OWMResponseConverter.java
View file

@ -167,11 +167,16 @@ public class OWMResponseConverter {
break;
}
String city = json.getAsJsonPrimitive("name").getAsString();
if (city.equals("Globe") || city.equals("")) city = null;
JsonPrimitive countryJson = json.getAsJsonObject("sys").getAsJsonPrimitive("country");
String country = countryJson != null ? countryJson.getAsString() : null;
weather.coordinates =
new Coordinates(
json.getAsJsonObject("coord").getAsJsonPrimitive("lon").getAsDouble(),
json.getAsJsonObject("coord").getAsJsonPrimitive("lat").getAsDouble()
);
).setAddress(country, city);
weather.temperature = json
.getAsJsonObject("main")
@ -215,10 +220,6 @@ public class OWMResponseConverter {
.getAsJsonPrimitive("sunrise")
.getAsLong();
weather.city = json
.getAsJsonPrimitive("name")
.getAsString();
weather.description = json
.getAsJsonArray("weather")
.get(0).getAsJsonObject()

6
src/test/java/eu/m724/wtapi/object/CoordinateTest.java
View file

@ -13,6 +13,10 @@ public class CoordinateTest {
assert coordinates.longitude == -179.99;
coordinates = new Coordinates(-91.1, 180.1);
assert coordinates.longitude != -179.9; // TODO
System.out.printf("Precision loss expected: %f\n", coordinates.longitude);
assert coordinates.longitude != -179.9; // TODO fix precision loss
coordinates.setAddress("SQ", "San Escobar");
assert coordinates.getAddress().equals("San Escobar, SQ");
}
}

4
src/test/java/eu/m724/wtapi/weather/OpenWeatherMapTest.java
View file

@ -27,7 +27,7 @@ public class OpenWeatherMapTest {
Weather weather = weatherFuture.get();
assertNotNull(weather);
System.out.printf("current weather in %s: %s\n", weather.city, weather.description);
System.out.printf("current weather in %s, %s: %s\n", weather.coordinates.city, weather.coordinates.country, weather.description);
CompletableFuture<Weather[]> weatherBulkFuture =
provider.getWeatherBulk(
@ -41,7 +41,7 @@ public class OpenWeatherMapTest {
assert weathers.length == 3;
for (Weather weather1 : weathers) {
System.out.printf("current weather in %s: %s\n", weather1.city, weather1.description);
System.out.printf("current weather in %s, %s: %s\n", weather.coordinates.city, weather.coordinates.country, weather1.description);
}
}
}