From 39532ed2a48061eadc81e17d61e401d865864dc6 Mon Sep 17 00:00:00 2001
From: Sheikh Jamir Alam <alamjamir15@gmail.com>
Date: Sat, 8 Apr 2023 10:04:59 +0530
Subject: [PATCH] Fix error when displaying heightgraph without waypoints

---
 src/Controls/index.jsx | 21 ++++-----
 src/Map/Map.jsx        | 96 ++++++++++++++++++++++++------------------
 2 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/src/Controls/index.jsx b/src/Controls/index.jsx
index 6c7dcbc..2d79b5c 100644
--- a/src/Controls/index.jsx
+++ b/src/Controls/index.jsx
@@ -54,20 +54,17 @@ class MainControl extends React.Component {
 
     this.getLastUpdate()
 
-    toast.success(
-      'Welcome to Valhalla! Global Routing Service - funded by FOSSGIS e.V.',
-      {
-        position: 'bottom-center',
-        autoClose: 5000,
-        hideProgressBar: false,
-        closeOnClick: true,
-        pauseOnHover: true,
-        draggable: true,
-        progress: undefined,
-        theme: 'light',
-      }
+    const msg = () => (
+      <>
+        <h4 style={{ marginBottom: '5px', color: '#117314' }}>
+          Welcome to Valhalla!
+        </h4>
+        <p>Global Routing Service - funded by FOSSGIS e.V.</p>
+      </>
     )
 
+    toast.success(msg)
+
     const params = Object.fromEntries(new URL(document.location).searchParams)
 
     if ('profile' in params) {
diff --git a/src/Map/Map.jsx b/src/Map/Map.jsx
index 35d8b5f..a03f44d 100644
--- a/src/Map/Map.jsx
+++ b/src/Map/Map.jsx
@@ -17,7 +17,7 @@ import axios from 'axios'
 import * as R from 'ramda'
 import ExtraMarkers from './extraMarkers'
 import { Button, Label, Icon, Popup } from 'semantic-ui-react'
-import { ToastContainer } from 'react-toastify'
+import { ToastContainer, toast } from 'react-toastify'
 import { CopyToClipboard } from 'react-copy-to-clipboard'
 import {
   fetchReverseGeocode,
@@ -281,7 +281,7 @@ class Map extends React.Component {
 
     const getHeightData = this.getHeightData
     const { showDirectionsPanel } = this.props
-    
+
     this.hg = L.control.heightgraph({
       mappings: colorMappings,
       graphStyle: {
@@ -644,11 +644,13 @@ class Map extends React.Component {
   updateExcludePolygons() {
     const excludePolygons = []
     excludePolygonsLayer.eachLayer((layer) => {
-      const lngLatArray = []
-      for (const coords of layer._latlngs[0]) {
-        lngLatArray.push([coords.lng, coords.lat])
+      if (layer._latlngs) {
+        const lngLatArray = []
+        for (const coords of layer._latlngs[0]) {
+          lngLatArray.push([coords.lng, coords.lat])
+        }
+        excludePolygons.push(lngLatArray)
       }
-      excludePolygons.push(lngLatArray)
     })
     const { dispatch } = this.props
     const name = 'exclude_polygons'
@@ -718,46 +720,57 @@ class Map extends React.Component {
 
   getHeightData = () => {
     const { results } = this.props.directions
-    const { dispatch } = this.props
+    if (Object.keys(results[VALHALLA_OSM_URL].data).length === 0) {
+      document.querySelector('.heightgraph-close-icon').click()
+      const msg = () => (
+        <>
+          <h4 style={{ marginBottom: '5px', color: '#e6bd17' }}>Warning!</h4>
+          <p>Place Waypoints before displaying heigh graph.</p>
+        </>
+      )
+      toast.warning(msg)
+    } else {
+      const { dispatch } = this.props
 
-    const heightPayload = buildHeightRequest(
-      results[VALHALLA_OSM_URL].data.decodedGeometry
-    )
+      const heightPayload = buildHeightRequest(
+        results[VALHALLA_OSM_URL].data.decodedGeometry
+      )
 
-    if (!R.equals(this.state.heightPayload, heightPayload)) {
-      this.hg._removeChart()
-      this.setState({ isHeightLoading: true, heightPayload })
-      axios
-        .post(VALHALLA_OSM_URL + '/height', heightPayload, {
-          headers: {
-            'Content-Type': 'application/json',
-          },
-        })
-        .then(({ data }) => {
-          this.setState({ isHeightLoading: false })
-          // lets build geojson object with steepness for the height graph
-          const reversedGeometry = JSON.parse(
-            JSON.stringify(results[VALHALLA_OSM_URL].data.decodedGeometry)
-          ).map((pair) => {
-            return [...pair.reverse()]
+      if (!R.equals(this.state.heightPayload, heightPayload)) {
+        this.hg._removeChart()
+        this.setState({ isHeightLoading: true, heightPayload })
+        axios
+          .post(VALHALLA_OSM_URL + '/height', heightPayload, {
+            headers: {
+              'Content-Type': 'application/json',
+            },
           })
-          const heightData = buildHeightgraphData(
-            reversedGeometry,
-            data.range_height
-          )
-          const { inclineTotal, declineTotal } = heightData[0].properties
-          dispatch(
-            updateInclineDeclineTotal({
-              inclineTotal,
-              declineTotal,
+          .then(({ data }) => {
+            this.setState({ isHeightLoading: false })
+            // lets build geojson object with steepness for the height graph
+            const reversedGeometry = JSON.parse(
+              JSON.stringify(results[VALHALLA_OSM_URL].data.decodedGeometry)
+            ).map((pair) => {
+              return [...pair.reverse()]
             })
-          )
+            const heightData = buildHeightgraphData(
+              reversedGeometry,
+              data.range_height
+            )
+            const { inclineTotal, declineTotal } = heightData[0].properties
+            dispatch(
+              updateInclineDeclineTotal({
+                inclineTotal,
+                declineTotal,
+              })
+            )
 
-          this.hg.addData(heightData)
-        })
-        .catch(({ response }) => {
-          console.log(response) //eslint-disable-line
-        })
+            this.hg.addData(heightData)
+          })
+          .catch(({ response }) => {
+            console.log(response) //eslint-disable-line
+          })
+      }
     }
   }
 
@@ -1047,6 +1060,7 @@ class Map extends React.Component {
             draggable
             pauseOnHover
             theme="light"
+            style={{ width: '21%' }}
           />
           <div id="map" className="map-style" />
           <button