-
-
Notifications
You must be signed in to change notification settings - Fork 759
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add support of extended Android geolocation (#1492)
- Loading branch information
1 parent
93a95fc
commit a1e1d1d
Showing
3 changed files
with
167 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
125 changes: 125 additions & 0 deletions
125
src/main/java/io/appium/java_client/android/geolocation/AndroidGeoLocation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
/* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* See the NOTICE file distributed with this work for additional | ||
* information regarding copyright ownership. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package io.appium.java_client.android.geolocation; | ||
|
||
import com.google.common.collect.ImmutableMap; | ||
|
||
import java.util.Map; | ||
|
||
import static java.util.Optional.ofNullable; | ||
|
||
public class AndroidGeoLocation { | ||
private Double longitude; | ||
private Double latitude; | ||
private Double altitude; | ||
private Integer satellites; | ||
private Double speed; | ||
|
||
/** | ||
* Initializes AndroidLocation instance. | ||
*/ | ||
public AndroidGeoLocation() { | ||
|
||
} | ||
|
||
/** | ||
* Initializes AndroidLocation instance with longitude and latitude values. | ||
* | ||
* @param longitude longitude value | ||
* @param latitude latitude value | ||
*/ | ||
public AndroidGeoLocation(double longitude, double latitude) { | ||
this.longitude = longitude; | ||
this.latitude = latitude; | ||
} | ||
|
||
/** | ||
* Sets geo longitude value. This value is required to set. | ||
* | ||
* @param longitude geo longitude | ||
* @return self instance for chaining | ||
*/ | ||
public AndroidGeoLocation withLongitude(double longitude) { | ||
this.longitude = longitude; | ||
return this; | ||
} | ||
|
||
/** | ||
* Sets geo latitude value. This value is required to set. | ||
* | ||
* @param latitude geo latitude | ||
* @return self instance for chaining | ||
*/ | ||
public AndroidGeoLocation withLatitude(double latitude) { | ||
this.latitude = latitude; | ||
return this; | ||
} | ||
|
||
/** | ||
* Sets geo altitude value. | ||
* | ||
* @param altitude geo altitude | ||
* @return self instance for chaining | ||
*/ | ||
public AndroidGeoLocation withAltitude(double altitude) { | ||
this.altitude = altitude; | ||
return this; | ||
} | ||
|
||
/** | ||
* Sets the number of geo satellites being tracked. | ||
* This number is respected on Emulators. | ||
* | ||
* @param satellites the count of satellites in range 1..12 | ||
* @return self instance for chaining | ||
*/ | ||
public AndroidGeoLocation withSatellites(int satellites) { | ||
this.satellites = satellites; | ||
return this; | ||
} | ||
|
||
/** | ||
* Sets the movement speed. It is measured in meters/second | ||
* for real devices and in knots for emulators. | ||
* | ||
* @param speed the actual speed, which should be greater than zero | ||
* @return self instance for chaining | ||
*/ | ||
public AndroidGeoLocation withSpeed(double speed) { | ||
this.speed = speed; | ||
return this; | ||
} | ||
|
||
/** | ||
* Builds parameters map suitable for passing to the downstream API. | ||
* | ||
* @return Parameters mapping | ||
*/ | ||
public Map<String, ?> build() { | ||
ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder(); | ||
ofNullable(longitude).map(x -> builder.put("longitude", x)) | ||
.orElseThrow(() -> new IllegalArgumentException( | ||
"A valid 'longitude' must be provided")); | ||
ofNullable(latitude).map(x -> builder.put("latitude", x)) | ||
.orElseThrow(() -> new IllegalArgumentException( | ||
"A valid 'latitude' must be provided")); | ||
ofNullable(altitude).map(x -> builder.put("altitude", x)); | ||
ofNullable(satellites).map(x -> builder.put("satellites", x)); | ||
ofNullable(speed).map(x -> builder.put("speed", x)); | ||
return builder.build(); | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
...n/java/io/appium/java_client/android/geolocation/SupportsExtendedGeolocationCommands.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* See the NOTICE file distributed with this work for additional | ||
* information regarding copyright ownership. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package io.appium.java_client.android.geolocation; | ||
|
||
import com.google.common.collect.ImmutableMap; | ||
import io.appium.java_client.CommandExecutionHelper; | ||
import io.appium.java_client.ExecutesMethod; | ||
import org.openqa.selenium.remote.DriverCommand; | ||
|
||
import java.util.AbstractMap; | ||
|
||
public interface SupportsExtendedGeolocationCommands extends ExecutesMethod { | ||
|
||
/** | ||
* Allows to set geo location with extended parameters | ||
* available for Android platform. | ||
* | ||
* @param location The location object to set. | ||
*/ | ||
default void setLocation(AndroidGeoLocation location) { | ||
ImmutableMap<String, ?> parameters = ImmutableMap | ||
.of("location", location.build()); | ||
CommandExecutionHelper.execute(this, | ||
new AbstractMap.SimpleEntry<>(DriverCommand.SET_LOCATION, parameters)); | ||
} | ||
} |