jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-25 09:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump subarulink to v0.7.0 (#83213)

Browse Source 
fixes undefined
This commit is contained in:
Garrett 2022-12-05 04:53:05 -05:00 committed by GitHub
parent 68e454712d
commit efc637cb2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/subaru/manifest.json
View File

@ -3,7 +3,7 @@
"name": "Subaru", "name": "Subaru",
"config_flow": true, "config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/subaru", "documentation": "https://www.home-assistant.io/integrations/subaru",
"requirements": ["subarulink==0.6.1"], "requirements": ["subarulink==0.7.0"],
"codeowners": ["@G-Two"], "codeowners": ["@G-Two"],
"iot_class": "cloud_polling", "iot_class": "cloud_polling",
"loggers": ["stdiomask", "subarulink"] "loggers": ["stdiomask", "subarulink"]

16
homeassistant/components/subaru/sensor.py
View File

@ -14,12 +14,10 @@ from homeassistant.components.sensor import (
) )
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ( from homeassistant.const import (
ELECTRIC_POTENTIAL_VOLT,
LENGTH_KILOMETERS, LENGTH_KILOMETERS,
LENGTH_MILES, LENGTH_MILES,
PERCENTAGE, PERCENTAGE,
PRESSURE_HPA, PRESSURE_HPA,
TEMP_CELSIUS,
VOLUME_GALLONS, VOLUME_GALLONS,
VOLUME_LITERS, VOLUME_LITERS,
) )
@ -117,20 +115,6 @@ API_GEN_2_SENSORS = [
native_unit_of_measurement=PRESSURE_HPA, native_unit_of_measurement=PRESSURE_HPA,
state_class=SensorStateClass.MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,
), ),
SensorEntityDescription(
key=sc.EXTERNAL_TEMP,
device_class=SensorDeviceClass.TEMPERATURE,
name="External temp",
native_unit_of_measurement=TEMP_CELSIUS,
state_class=SensorStateClass.MEASUREMENT,
),
SensorEntityDescription(
key=sc.BATTERY_VOLTAGE,
device_class=SensorDeviceClass.VOLTAGE,
name="12V battery voltage",
native_unit_of_measurement=ELECTRIC_POTENTIAL_VOLT,
state_class=SensorStateClass.MEASUREMENT,
),
] ]
# Sensors available to "Subaru Safety Plus" subscribers with PHEV vehicles # Sensors available to "Subaru Safety Plus" subscribers with PHEV vehicles

2
requirements_all.txt
View File

@ -2373,7 +2373,7 @@ streamlabswater==1.0.1
stringcase==1.2.0 stringcase==1.2.0
# homeassistant.components.subaru # homeassistant.components.subaru
subarulink==0.6.1 subarulink==0.7.0
# homeassistant.components.solarlog # homeassistant.components.solarlog
sunwatcher==0.2.1 sunwatcher==0.2.1

2
requirements_test_all.txt
View File

@ -1652,7 +1652,7 @@ stookalert==0.1.4
stringcase==1.2.0 stringcase==1.2.0
# homeassistant.components.subaru # homeassistant.components.subaru
subarulink==0.6.1 subarulink==0.7.0
# homeassistant.components.solarlog # homeassistant.components.solarlog
sunwatcher==0.2.1 sunwatcher==0.2.1

48
tests/components/subaru/api_responses.py
View File

@ -53,7 +53,6 @@ MOCK_DATETIME = datetime.fromtimestamp(1595560000, timezone.utc)
VEHICLE_STATUS_EV = { VEHICLE_STATUS_EV = {
"status": { "status": {
"AVG_FUEL_CONSUMPTION": 2.3, "AVG_FUEL_CONSUMPTION": 2.3,
"BATTERY_VOLTAGE": 12.0,
"DISTANCE_TO_EMPTY_FUEL": 707, "DISTANCE_TO_EMPTY_FUEL": 707,
"DOOR_BOOT_LOCK_STATUS": "UNKNOWN", "DOOR_BOOT_LOCK_STATUS": "UNKNOWN",
"DOOR_BOOT_POSITION": "CLOSED", "DOOR_BOOT_POSITION": "CLOSED",
@ -75,7 +74,6 @@ VEHICLE_STATUS_EV = {
"EV_STATE_OF_CHARGE_MODE": "EV_MODE", "EV_STATE_OF_CHARGE_MODE": "EV_MODE",
"EV_STATE_OF_CHARGE_PERCENT": 20, "EV_STATE_OF_CHARGE_PERCENT": 20,
"EV_TIME_TO_FULLY_CHARGED_UTC": MOCK_DATETIME, "EV_TIME_TO_FULLY_CHARGED_UTC": MOCK_DATETIME,
"EXT_EXTERNAL_TEMP": 21.5,
"ODOMETER": 1234, "ODOMETER": 1234,
"POSITION_HEADING_DEGREE": 150, "POSITION_HEADING_DEGREE": 150,
"POSITION_SPEED_KMPH": "0", "POSITION_SPEED_KMPH": "0",
@ -103,7 +101,7 @@ VEHICLE_STATUS_EV = {
"TYRE_PRESSURE_FRONT_LEFT": 0, "TYRE_PRESSURE_FRONT_LEFT": 0,
"TYRE_PRESSURE_FRONT_RIGHT": 2550, "TYRE_PRESSURE_FRONT_RIGHT": 2550,
"TYRE_PRESSURE_REAR_LEFT": 2450, "TYRE_PRESSURE_REAR_LEFT": 2450,
"TYRE_PRESSURE_REAR_RIGHT": 2350, "TYRE_PRESSURE_REAR_RIGHT": None,
"TYRE_STATUS_FRONT_LEFT": "UNKNOWN", "TYRE_STATUS_FRONT_LEFT": "UNKNOWN",
"TYRE_STATUS_FRONT_RIGHT": "UNKNOWN", "TYRE_STATUS_FRONT_RIGHT": "UNKNOWN",
"TYRE_STATUS_REAR_LEFT": "UNKNOWN", "TYRE_STATUS_REAR_LEFT": "UNKNOWN",
@ -115,9 +113,9 @@ VEHICLE_STATUS_EV = {
"WINDOW_REAR_LEFT_STATUS": "UNKNOWN", "WINDOW_REAR_LEFT_STATUS": "UNKNOWN",
"WINDOW_REAR_RIGHT_STATUS": "UNKNOWN", "WINDOW_REAR_RIGHT_STATUS": "UNKNOWN",
"WINDOW_SUNROOF_STATUS": "UNKNOWN", "WINDOW_SUNROOF_STATUS": "UNKNOWN",
"heading": 170, "HEADING": 170,
"latitude": 40.0, "LATITUDE": 40.0,
"longitude": -100.0, "LONGITUDE": -100.0,
} }
} }
@ -125,7 +123,6 @@ VEHICLE_STATUS_EV = {
VEHICLE_STATUS_G2 = { VEHICLE_STATUS_G2 = {
"status": { "status": {
"AVG_FUEL_CONSUMPTION": 2.3, "AVG_FUEL_CONSUMPTION": 2.3,
"BATTERY_VOLTAGE": 12.0,
"DISTANCE_TO_EMPTY_FUEL": 707, "DISTANCE_TO_EMPTY_FUEL": 707,
"DOOR_BOOT_LOCK_STATUS": "UNKNOWN", "DOOR_BOOT_LOCK_STATUS": "UNKNOWN",
"DOOR_BOOT_POSITION": "CLOSED", "DOOR_BOOT_POSITION": "CLOSED",
@ -139,7 +136,6 @@ VEHICLE_STATUS_G2 = {
"DOOR_REAR_LEFT_POSITION": "CLOSED", "DOOR_REAR_LEFT_POSITION": "CLOSED",
"DOOR_REAR_RIGHT_LOCK_STATUS": "UNKNOWN", "DOOR_REAR_RIGHT_LOCK_STATUS": "UNKNOWN",
"DOOR_REAR_RIGHT_POSITION": "CLOSED", "DOOR_REAR_RIGHT_POSITION": "CLOSED",
"EXT_EXTERNAL_TEMP": None,
"ODOMETER": 1234, "ODOMETER": 1234,
"POSITION_HEADING_DEGREE": 150, "POSITION_HEADING_DEGREE": 150,
"POSITION_SPEED_KMPH": "0", "POSITION_SPEED_KMPH": "0",
@ -167,7 +163,7 @@ VEHICLE_STATUS_G2 = {
"TYRE_PRESSURE_FRONT_LEFT": 2550, "TYRE_PRESSURE_FRONT_LEFT": 2550,
"TYRE_PRESSURE_FRONT_RIGHT": 2550, "TYRE_PRESSURE_FRONT_RIGHT": 2550,
"TYRE_PRESSURE_REAR_LEFT": 2450, "TYRE_PRESSURE_REAR_LEFT": 2450,
"TYRE_PRESSURE_REAR_RIGHT": 2350, "TYRE_PRESSURE_REAR_RIGHT": None,
"TYRE_STATUS_FRONT_LEFT": "UNKNOWN", "TYRE_STATUS_FRONT_LEFT": "UNKNOWN",
"TYRE_STATUS_FRONT_RIGHT": "UNKNOWN", "TYRE_STATUS_FRONT_RIGHT": "UNKNOWN",
"TYRE_STATUS_REAR_LEFT": "UNKNOWN", "TYRE_STATUS_REAR_LEFT": "UNKNOWN",
@ -179,15 +175,14 @@ VEHICLE_STATUS_G2 = {
"WINDOW_REAR_LEFT_STATUS": "UNKNOWN", "WINDOW_REAR_LEFT_STATUS": "UNKNOWN",
"WINDOW_REAR_RIGHT_STATUS": "UNKNOWN", "WINDOW_REAR_RIGHT_STATUS": "UNKNOWN",
"WINDOW_SUNROOF_STATUS": "UNKNOWN", "WINDOW_SUNROOF_STATUS": "UNKNOWN",
"heading": 170, "HEADING": 170,
"latitude": 40.0, "LATITUDE": 40.0,
"longitude": -100.0, "LONGITUDE": -100.0,
} }
} }
EXPECTED_STATE_EV_IMPERIAL = { EXPECTED_STATE_EV_IMPERIAL = {
"AVG_FUEL_CONSUMPTION": "102.3", "AVG_FUEL_CONSUMPTION": "102.3",
"BATTERY_VOLTAGE": "12.0",
"DISTANCE_TO_EMPTY_FUEL": "439.3", "DISTANCE_TO_EMPTY_FUEL": "439.3",
"EV_CHARGER_STATE_TYPE": "CHARGING", "EV_CHARGER_STATE_TYPE": "CHARGING",
"EV_CHARGE_SETTING_AMPERE_TYPE": "MAXIMUM", "EV_CHARGE_SETTING_AMPERE_TYPE": "MAXIMUM",
@ -197,7 +192,6 @@ EXPECTED_STATE_EV_IMPERIAL = {
"EV_STATE_OF_CHARGE_MODE": "EV_MODE", "EV_STATE_OF_CHARGE_MODE": "EV_MODE",
"EV_STATE_OF_CHARGE_PERCENT": "20", "EV_STATE_OF_CHARGE_PERCENT": "20",
"EV_TIME_TO_FULLY_CHARGED_UTC": "2020-07-24T03:06:40+00:00", "EV_TIME_TO_FULLY_CHARGED_UTC": "2020-07-24T03:06:40+00:00",
"EXT_EXTERNAL_TEMP": "70.7",
"ODOMETER": "766.8", "ODOMETER": "766.8",
"POSITION_HEADING_DEGREE": "150", "POSITION_HEADING_DEGREE": "150",
"POSITION_SPEED_KMPH": "0", "POSITION_SPEED_KMPH": "0",
@ -207,16 +201,15 @@ EXPECTED_STATE_EV_IMPERIAL = {
"TYRE_PRESSURE_FRONT_LEFT": "0.0", "TYRE_PRESSURE_FRONT_LEFT": "0.0",
"TYRE_PRESSURE_FRONT_RIGHT": "37.0", "TYRE_PRESSURE_FRONT_RIGHT": "37.0",
"TYRE_PRESSURE_REAR_LEFT": "35.5", "TYRE_PRESSURE_REAR_LEFT": "35.5",
"TYRE_PRESSURE_REAR_RIGHT": "34.1", "TYRE_PRESSURE_REAR_RIGHT": "unknown",
"VEHICLE_STATE_TYPE": "IGNITION_OFF", "VEHICLE_STATE_TYPE": "IGNITION_OFF",
"heading": 170, "HEADING": 170,
"latitude": 40.0, "LATITUDE": 40.0,
"longitude": -100.0, "LONGITUDE": -100.0,
} }
EXPECTED_STATE_EV_METRIC = { EXPECTED_STATE_EV_METRIC = {
"AVG_FUEL_CONSUMPTION": "2.3", "AVG_FUEL_CONSUMPTION": "2.3",
"BATTERY_VOLTAGE": "12.0",
"DISTANCE_TO_EMPTY_FUEL": "707", "DISTANCE_TO_EMPTY_FUEL": "707",
"EV_CHARGER_STATE_TYPE": "CHARGING", "EV_CHARGER_STATE_TYPE": "CHARGING",
"EV_CHARGE_SETTING_AMPERE_TYPE": "MAXIMUM", "EV_CHARGE_SETTING_AMPERE_TYPE": "MAXIMUM",
@ -226,7 +219,6 @@ EXPECTED_STATE_EV_METRIC = {
"EV_STATE_OF_CHARGE_MODE": "EV_MODE", "EV_STATE_OF_CHARGE_MODE": "EV_MODE",
"EV_STATE_OF_CHARGE_PERCENT": "20", "EV_STATE_OF_CHARGE_PERCENT": "20",
"EV_TIME_TO_FULLY_CHARGED_UTC": "2020-07-24T03:06:40+00:00", "EV_TIME_TO_FULLY_CHARGED_UTC": "2020-07-24T03:06:40+00:00",
"EXT_EXTERNAL_TEMP": "21.5",
"ODOMETER": "1234", "ODOMETER": "1234",
"POSITION_HEADING_DEGREE": "150", "POSITION_HEADING_DEGREE": "150",
"POSITION_SPEED_KMPH": "0", "POSITION_SPEED_KMPH": "0",
@ -236,17 +228,16 @@ EXPECTED_STATE_EV_METRIC = {
"TYRE_PRESSURE_FRONT_LEFT": "0", "TYRE_PRESSURE_FRONT_LEFT": "0",
"TYRE_PRESSURE_FRONT_RIGHT": "2550", "TYRE_PRESSURE_FRONT_RIGHT": "2550",
"TYRE_PRESSURE_REAR_LEFT": "2450", "TYRE_PRESSURE_REAR_LEFT": "2450",
"TYRE_PRESSURE_REAR_RIGHT": "2350", "TYRE_PRESSURE_REAR_RIGHT": "unknown",
"VEHICLE_STATE_TYPE": "IGNITION_OFF", "VEHICLE_STATE_TYPE": "IGNITION_OFF",
"heading": 170, "HEADING": 170,
"latitude": 40.0, "LATITUDE": 40.0,
"longitude": -100.0, "LONGITUDE": -100.0,
} }
EXPECTED_STATE_EV_UNAVAILABLE = { EXPECTED_STATE_EV_UNAVAILABLE = {
"AVG_FUEL_CONSUMPTION": "unavailable", "AVG_FUEL_CONSUMPTION": "unavailable",
"BATTERY_VOLTAGE": "unavailable",
"DISTANCE_TO_EMPTY_FUEL": "unavailable", "DISTANCE_TO_EMPTY_FUEL": "unavailable",
"EV_CHARGER_STATE_TYPE": "unavailable", "EV_CHARGER_STATE_TYPE": "unavailable",
"EV_CHARGE_SETTING_AMPERE_TYPE": "unavailable", "EV_CHARGE_SETTING_AMPERE_TYPE": "unavailable",
@ -256,7 +247,6 @@ EXPECTED_STATE_EV_UNAVAILABLE = {
"EV_STATE_OF_CHARGE_MODE": "unavailable", "EV_STATE_OF_CHARGE_MODE": "unavailable",
"EV_STATE_OF_CHARGE_PERCENT": "unavailable", "EV_STATE_OF_CHARGE_PERCENT": "unavailable",
"EV_TIME_TO_FULLY_CHARGED_UTC": "unavailable", "EV_TIME_TO_FULLY_CHARGED_UTC": "unavailable",
"EXT_EXTERNAL_TEMP": "unavailable",
"ODOMETER": "unavailable", "ODOMETER": "unavailable",
"POSITION_HEADING_DEGREE": "unavailable", "POSITION_HEADING_DEGREE": "unavailable",
"POSITION_SPEED_KMPH": "unavailable", "POSITION_SPEED_KMPH": "unavailable",
@ -268,7 +258,7 @@ EXPECTED_STATE_EV_UNAVAILABLE = {
"TYRE_PRESSURE_REAR_LEFT": "unavailable", "TYRE_PRESSURE_REAR_LEFT": "unavailable",
"TYRE_PRESSURE_REAR_RIGHT": "unavailable", "TYRE_PRESSURE_REAR_RIGHT": "unavailable",
"VEHICLE_STATE_TYPE": "unavailable", "VEHICLE_STATE_TYPE": "unavailable",
"heading": "unavailable", "HEADING": "unavailable",
"latitude": "unavailable", "LATITUDE": "unavailable",
"longitude": "unavailable", "LONGITUDE": "unavailable",
} }

14
tests/components/subaru/fixtures/diagnostics_config_entry.json
View File

@ -6,12 +6,13 @@
"pin": "**REDACTED**", "pin": "**REDACTED**",
"device_id": "**REDACTED**" "device_id": "**REDACTED**"
}, },
"options": { "update_enabled": true }, "options": {
"update_enabled": true
},
"data": [ "data": [
{ {
"status": { "status": {
"AVG_FUEL_CONSUMPTION": 2.3, "AVG_FUEL_CONSUMPTION": 2.3,
"BATTERY_VOLTAGE": 12.0,
"DISTANCE_TO_EMPTY_FUEL": 707, "DISTANCE_TO_EMPTY_FUEL": 707,
"DOOR_BOOT_LOCK_STATUS": "UNKNOWN", "DOOR_BOOT_LOCK_STATUS": "UNKNOWN",
"DOOR_BOOT_POSITION": "CLOSED", "DOOR_BOOT_POSITION": "CLOSED",
@ -33,7 +34,6 @@
"EV_STATE_OF_CHARGE_MODE": "EV_MODE", "EV_STATE_OF_CHARGE_MODE": "EV_MODE",
"EV_STATE_OF_CHARGE_PERCENT": 20, "EV_STATE_OF_CHARGE_PERCENT": 20,
"EV_TIME_TO_FULLY_CHARGED_UTC": "2020-07-24T03:06:40+00:00", "EV_TIME_TO_FULLY_CHARGED_UTC": "2020-07-24T03:06:40+00:00",
"EXT_EXTERNAL_TEMP": 21.5,
"ODOMETER": "**REDACTED**", "ODOMETER": "**REDACTED**",
"POSITION_HEADING_DEGREE": 150, "POSITION_HEADING_DEGREE": 150,
"POSITION_SPEED_KMPH": "0", "POSITION_SPEED_KMPH": "0",
@ -61,7 +61,7 @@
"TYRE_PRESSURE_FRONT_LEFT": 0, "TYRE_PRESSURE_FRONT_LEFT": 0,
"TYRE_PRESSURE_FRONT_RIGHT": 2550, "TYRE_PRESSURE_FRONT_RIGHT": 2550,
"TYRE_PRESSURE_REAR_LEFT": 2450, "TYRE_PRESSURE_REAR_LEFT": 2450,
"TYRE_PRESSURE_REAR_RIGHT": 2350, "TYRE_PRESSURE_REAR_RIGHT": null,
"TYRE_STATUS_FRONT_LEFT": "UNKNOWN", "TYRE_STATUS_FRONT_LEFT": "UNKNOWN",
"TYRE_STATUS_FRONT_RIGHT": "UNKNOWN", "TYRE_STATUS_FRONT_RIGHT": "UNKNOWN",
"TYRE_STATUS_REAR_LEFT": "UNKNOWN", "TYRE_STATUS_REAR_LEFT": "UNKNOWN",
@ -73,9 +73,9 @@
"WINDOW_REAR_LEFT_STATUS": "UNKNOWN", "WINDOW_REAR_LEFT_STATUS": "UNKNOWN",
"WINDOW_REAR_RIGHT_STATUS": "UNKNOWN", "WINDOW_REAR_RIGHT_STATUS": "UNKNOWN",
"WINDOW_SUNROOF_STATUS": "UNKNOWN", "WINDOW_SUNROOF_STATUS": "UNKNOWN",
"heading": 170, "HEADING": 170,
"latitude": "**REDACTED**", "LATITUDE": "**REDACTED**",
"longitude": "**REDACTED**" "LONGITUDE": "**REDACTED**"
} }
} }
] ]

14
tests/components/subaru/fixtures/diagnostics_device.json
View File

@ -6,11 +6,12 @@
"pin": "**REDACTED**", "pin": "**REDACTED**",
"device_id": "**REDACTED**" "device_id": "**REDACTED**"
}, },
"options": { "update_enabled": true }, "options": {
"update_enabled": true
},
"data": { "data": {
"status": { "status": {
"AVG_FUEL_CONSUMPTION": 2.3, "AVG_FUEL_CONSUMPTION": 2.3,
"BATTERY_VOLTAGE": 12.0,
"DISTANCE_TO_EMPTY_FUEL": 707, "DISTANCE_TO_EMPTY_FUEL": 707,
"DOOR_BOOT_LOCK_STATUS": "UNKNOWN", "DOOR_BOOT_LOCK_STATUS": "UNKNOWN",
"DOOR_BOOT_POSITION": "CLOSED", "DOOR_BOOT_POSITION": "CLOSED",
@ -32,7 +33,6 @@
"EV_STATE_OF_CHARGE_MODE": "EV_MODE", "EV_STATE_OF_CHARGE_MODE": "EV_MODE",
"EV_STATE_OF_CHARGE_PERCENT": 20, "EV_STATE_OF_CHARGE_PERCENT": 20,
"EV_TIME_TO_FULLY_CHARGED_UTC": "2020-07-24T03:06:40+00:00", "EV_TIME_TO_FULLY_CHARGED_UTC": "2020-07-24T03:06:40+00:00",
"EXT_EXTERNAL_TEMP": 21.5,
"ODOMETER": "**REDACTED**", "ODOMETER": "**REDACTED**",
"POSITION_HEADING_DEGREE": 150, "POSITION_HEADING_DEGREE": 150,
"POSITION_SPEED_KMPH": "0", "POSITION_SPEED_KMPH": "0",
@ -60,7 +60,7 @@
"TYRE_PRESSURE_FRONT_LEFT": 0, "TYRE_PRESSURE_FRONT_LEFT": 0,
"TYRE_PRESSURE_FRONT_RIGHT": 2550, "TYRE_PRESSURE_FRONT_RIGHT": 2550,
"TYRE_PRESSURE_REAR_LEFT": 2450, "TYRE_PRESSURE_REAR_LEFT": 2450,
"TYRE_PRESSURE_REAR_RIGHT": 2350, "TYRE_PRESSURE_REAR_RIGHT": null,
"TYRE_STATUS_FRONT_LEFT": "UNKNOWN", "TYRE_STATUS_FRONT_LEFT": "UNKNOWN",
"TYRE_STATUS_FRONT_RIGHT": "UNKNOWN", "TYRE_STATUS_FRONT_RIGHT": "UNKNOWN",
"TYRE_STATUS_REAR_LEFT": "UNKNOWN", "TYRE_STATUS_REAR_LEFT": "UNKNOWN",
@ -72,9 +72,9 @@
"WINDOW_REAR_LEFT_STATUS": "UNKNOWN", "WINDOW_REAR_LEFT_STATUS": "UNKNOWN",
"WINDOW_REAR_RIGHT_STATUS": "UNKNOWN", "WINDOW_REAR_RIGHT_STATUS": "UNKNOWN",
"WINDOW_SUNROOF_STATUS": "UNKNOWN", "WINDOW_SUNROOF_STATUS": "UNKNOWN",
"heading": 170, "HEADING": 170,
"latitude": "**REDACTED**", "LATITUDE": "**REDACTED**",
"longitude": "**REDACTED**" "LONGITUDE": "**REDACTED**"
} }
} }
} }