DBC22-1130: Adjusted zoom level to show radius

bcgov · Nov 1, 2023 · 8aafb39 · 8aafb39
1 parent 6ef1aa7
commit 8aafb39
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/src/frontend/src/Components/Map.js b/src/frontend/src/Components/Map.js
@@ -269,6 +269,7 @@ export default function MapWrapper({
         },
       },
     });
+
     const vectorLayer = new VectorTileLayer({
       source: new VectorTileSource({
         format: new MVT(),
@@ -291,7 +292,7 @@ export default function MapWrapper({
       projection: 'EPSG:3857',
       constrainResolution: true,
       center: camera ? handleCenter() : fromLonLat(pan),
-      zoom: zoom,
+      zoom: isPreview ? 12 : zoom,
       maxZoom: 15,
       extent: transformedExtent
     });

diff --git a/src/frontend/src/Components/data/webcams.js b/src/frontend/src/Components/data/webcams.js
@@ -1,24 +1,35 @@
-import { post } from "./helper.js";
+import { post, get } from './helper.js';
 
 export function getWebcams(routePoints, url = null) {
   const payload = routePoints ? { route: routePoints } : {};
 
-  return post(
-    url ? url : `${process.env.REACT_APP_API_HOST}/api/webcams/`,
-    payload,
-    {
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    }
-
-  ).then((data) => data)
-  .catch((error) => {
-    console.log(error);
-  });
+  if (routePoints) {
+    return post(
+      url ? url : `${process.env.REACT_APP_API_HOST}/api/webcams/`,
+      payload,
+      {
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      },
+    )
+      .then(data => data)
+      .catch(error => {
+        console.log(error);
+      });
+  } else {
+    return get(
+      url ? url : `${process.env.REACT_APP_API_HOST}/api/webcams/`,
+      payload,
+    )
+      .then(data => data)
+      .catch(error => {
+        console.log(error);
+      });
+  }
 }
 
 export function getWebcamReplay(webcam) {
   // TODO: error handling
-  return fetch(webcam.links.replayTheDay).then((response) => response.json());
+  return fetch(webcam.links.replayTheDay).then(response => response.json());
 }
diff --git a/src/frontend/src/pages/CameraDetailsPage.js b/src/frontend/src/pages/CameraDetailsPage.js
@@ -59,7 +59,7 @@ export default function CameraDetailsPage() {
   const nearby = <FontAwesomeIcon icon={faFlag} />;
 
   async function initCamera() {
-    const camera = await getWebcams(null, `${process.env.REACT_APP_API_HOST}/api/webcams/${params.id}`);
+    const camera = await getWebcams(null, `${process.env.REACT_APP_API_HOST}/api/webcams/${params.id}/`);
     // Camera data
     setCamera(camera);