diff --git a/.env.cec-euprd b/.env.cec-euprd index a9648bd..7b9dcef 100644 --- a/.env.cec-euprd +++ b/.env.cec-euprd @@ -16,3 +16,4 @@ REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f REACT_APP_ECCKEY_ENV= +REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":49.8327,"lng":9.8816,"zoom":4.5} diff --git a/.env.cec-prd b/.env.cec-prd index 9f9fb70..d30b7e4 100644 --- a/.env.cec-prd +++ b/.env.cec-prd @@ -16,3 +16,4 @@ REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f REACT_APP_ECCKEY_ENV= +REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5} diff --git a/.env.dev b/.env.dev index e08c37a..a04f46a 100644 --- a/.env.dev +++ b/.env.dev @@ -16,3 +16,4 @@ REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f REACT_APP_ECCKEY_ENV=stage,prod +REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5} diff --git a/.env.local b/.env.local index 71f52ab..788b410 100644 --- a/.env.local +++ b/.env.local @@ -16,3 +16,4 @@ REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f REACT_APP_ECCKEY_ENV=dev,stage,prod +REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5} diff --git a/.env.prd b/.env.prd index 4174e96..f812b2a 100644 --- a/.env.prd +++ b/.env.prd @@ -16,3 +16,4 @@ REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f REACT_APP_ECCKEY_ENV=stage +REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5} diff --git a/.env.stg b/.env.stg index 8bb96c4..702381f 100644 --- a/.env.stg +++ b/.env.stg @@ -16,3 +16,4 @@ REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f REACT_APP_ECCKEY_ENV=prod +REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5} diff --git a/.env.template b/.env.template index 1cdf893..517bef2 100644 --- a/.env.template +++ b/.env.template @@ -16,3 +16,4 @@ REACT_APP_ROLE_MANUFACTURE=3412e11a-a2d1-4355-be3e-ef9aa5065b69 REACT_APP_ROLE_SUPPLIER_APPROVER=a6c9805e-80b2-42b2-bfbb-9df52e5504d8 REACT_APP_ROLE_MANIFEST_MIGRATION=42798c8a-9fa7-4fb4-82c0-9582cabe364f REACT_APP_ECCKEY_ENV=dev,stage,prod +REACT_APP_HOME_MAP_DEFAULT_LOCATION={"lat":37.0902,"lng":-95.7129,"zoom":4.5} diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap index 909fc68..9795528 100644 --- a/src/components/App/__snapshots__/App.test.js.snap +++ b/src/components/App/__snapshots__/App.test.js.snap @@ -475,6 +475,79 @@ exports[`App Route / authenticated 1`] = `
+
+ +
+ + + +
+
+
+ +
+ + + +
+
{ const classes = useStyles(); @@ -60,17 +62,10 @@ const Component = () => { }; const centerAroundMarkers = (points) => { - // if (markers == null) { - // markers = [] - // } - // const coord = markers.reduce((coord, marker) => { - // coord[0] += marker[0] / markers.length; - // coord[1] += marker[1] / markers.length; - // return coord; - // }, [0, 0]) - - setCenter([37.0902, -95.7129]); - setZoom(4.5); + let defaultLocationJSON = process.env.REACT_APP_HOME_MAP_DEFAULT_LOCATION; + let defaultLocation = JSON.parse(defaultLocationJSON) + setCenter([defaultLocation.lat, defaultLocation.lng]); + setZoom(defaultLocation.zoom); }; useEffect(() => { @@ -109,6 +104,12 @@ const Component = () => { setSelectedVIN(vin); }; + const focusMap = (e) => { + let zoomLocation = JSON.parse(e.target.value) + setCenter(zoomLocation.center); + setZoom(zoomLocation.zoom) + } + const retrieveAndStoreCarState = (vin) => { getState(token, vin).then((results) => { setCarState({ ...results.data, vin: vin }); @@ -143,55 +144,58 @@ const Component = () => { } return ( - - - - {markers.map((marker) => ( - - -
-

- {marker[2]} -

- -
-
-
- ))} - - {carState ? ( - + + + - ) : null} - + + {markers.map((marker) => ( + + +
+

+ {marker[2]} +

+ +
+
+
+ ))} + + {carState ? ( + + ) : null} +
+ ); }; diff --git a/src/components/VehicleMap/zoomLocations.json b/src/components/VehicleMap/zoomLocations.json new file mode 100644 index 0000000..6c502c8 --- /dev/null +++ b/src/components/VehicleMap/zoomLocations.json @@ -0,0 +1,26 @@ +[ + { + "value": "{ \"center\": [37.0902, -95.7129], \"zoom\": 4.5 }", + "label": "North America" + }, + { + "value": "{ \"center\": [33.8463, -118.0461], \"zoom\": 10 }", + "label": "- La Palma" + }, + { + "value": "{ \"center\": [33.8847, -118.4109], \"zoom\": 10 }", + "label": "- Manhattan Beach" + }, + { + "value": "{ \"center\": [37.7749, -122.4194], \"zoom\": 10 }", + "label": "- San Francisco" + }, + { + "value": "{ \"center\": [49.8327, 9.8816], \"zoom\": 4.5 }", + "label": "Europe" + }, + { + "value": "{ \"center\": [47.0707, 15.4395], \"zoom\": 10 }", + "label": "- Graz" + } +] \ No newline at end of file