Merge pull request #3 from arielherself/dev

v0.3.4-beta
arielherself · Dec 30, 2023 · 2c19ac2 · 2c19ac2
2 parents aaad1cc + 8a58920
commit 2c19ac2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/PublicProperty.js b/PublicProperty.js
@@ -1,7 +1,7 @@
 // no dependencies
 
 export const __DEBUG__ = 0;
-export const __APP_VERSION__ = 'v0.3.2-beta';
+export const __APP_VERSION__ = 'v0.3.4-beta';
 
 export const __APP_INTRO__ = `
 <b>Algorithm improvement.</b><br>

diff --git a/api/click.js b/api/click.js
@@ -68,6 +68,7 @@ const shortest_path = noexcept((nodes, ways, start_point, end_point) => {
     const ch_dict = {};
     const ch_dict_bench = {};
     let f = 1;
+    // let time = 0;
     for (const t in ways) {
         // if (t === ways[aff[actual_start_node_id]]) sill('yes');
         const [l, n] = get_row(ways, t);
@@ -87,6 +88,7 @@ const shortest_path = noexcept((nodes, ways, start_point, end_point) => {
         //         ch_dict_bench[prev] = [[curr, distance]];
         //     }
         // }
+        // const start_time = performance.now();
         let prev = '';
         let distance = 0;
         for (let i = 0; i < n; ++i) {
@@ -111,7 +113,10 @@ const shortest_path = noexcept((nodes, ways, start_point, end_point) => {
                 distance = 0;
             }
         }
+        // const end_time = performance.now();
+        // time += end_time - start_time;
     }
+    // sill(`Preprocessing time: ${time}`);
     // const clean_nodes = {};
     // Object.keys(nodes).forEach((node_id) => {
     //     if (ch_dict[node_id]) clean_nodes[node_id] = nodes[node_id];
@@ -146,8 +151,7 @@ export default function handler(req, res) {
     sill(`Requesting ${request_uri}`);
     const fetch_debug_response = fetch(request_uri).then((response) => {
         return response.json();
-    });
-    fetch_debug_response.then((debug_response) => {
+    }).then((debug_response) => {
         // sill(debug_response);
         let ps = {};
         let ws = {};
@@ -158,7 +162,8 @@ export default function handler(req, res) {
                 ws[it.id] = it.nodes;
             }
         });
-        const path_found = shortest_path(ps, ws, pts[0], pts[pts.length - 1]);
+        sill(pts.length);
+        const path_found = pts.length < 2 ? [] : shortest_path(ps, ws, pts[0], pts[pts.length - 1]);
         res.status(200).json({
             log: `Method: click\nArgs: ${pts}\nStatus: requested "${request_uri}", got response ${JSON.stringify(debug_response.elements)}`,
             multipolyline: JSON.stringify(path_found),

diff --git a/src/UMap.js b/src/UMap.js
@@ -39,7 +39,7 @@ class Markers extends Component {
     addMarker(lat, lng) {
         this.setState((prev) => ({
             markers: [...prev.markers, [lat, lng]],
-            candMarkers: prev.candMarkers,
+            candMarkers: [],
             mksEmpty: false,
             candEmpty: prev.candEmpty,
             polylines: prev.polylines,
@@ -115,12 +115,7 @@ function MapClickHandler({mks,focusUpdater,locator,locker}) {
             sill(`Clicking on ${lat} ${lng}`);
             mks.current.addMarker(lat, lng);
             post('POST', 'click', mks.current.state.markers.slice(-2)).then((response) => {
-                // TODO: real functionality
                 const pl = JSON.parse(response.multipolyline);
-                // DEBUG
-                // response.__debug_pts.forEach(({lat,lon})=>{
-                //     mks.current.addCandMarker(lat,lon);
-                // });
                 sill(`pl = ${JSON.stringify(pl)}`);
                 if (pl.length > 1) mks.current.flushPolylines(pl, false);
                 focusUpdater([lat,lng]);
@@ -165,7 +160,6 @@ const LocationSearch = ({mks, focus, nb}) => {
         setLoading(true);
         setQuery(v);
         try {
-            // setSuggestedLocations([]);
             if (v.trim() === '') {
                 setLoading(false);
                 return;
@@ -177,7 +171,6 @@ const LocationSearch = ({mks, focus, nb}) => {
             if (response.ok) {
                 response.json().then((data) => {
                     if (data.length > 0) {
-                        // const {lat, lon} = data[0];
                         mks.current.clearCandMarkers();
                         const res = [];
                         data.forEach((v, i, a) => {
@@ -231,6 +224,10 @@ export default function UMap() {
         sf(locatedFocus);
         setLocated(true);
     };
+    const clr = () => {
+        markersRef.current.clearMarkers();
+        markersRef.current.clearCandMarkers();
+    };
     const ViewportChange = () => {
         const map = useMapEvents({
             dragend: (e) => {
@@ -259,7 +256,7 @@ export default function UMap() {
                 <ViewportChange/>
             </MapContainer>
             <Sheet sx={{position: 'absolute', top: '20px', right: '10vw', zIndex: 'modal'}}>
-                <SimulateClick isLocated={located} relocator={relo} isMarkersEmpty={markersRef.current ? markersRef.current.state.mksEmpty : true} clearMarkers={markersRef.current ? markersRef.current.clearMarkers : null}/>
+                <SimulateClick isLocated={located} relocator={relo} isMarkersEmpty={markersRef.current ? markersRef.current.state.mksEmpty : true} clearMarkers={clr}/>
                 <LocationSearch nb={nearbyName} mks={markersRef} focus={focus}/>
             </Sheet>
         </Sheet>

diff --git a/tools/ShortestPath.js b/tools/ShortestPath.js
@@ -125,8 +125,6 @@ function __obvious_dijkstra(nodes, ways, loc, ch, count, aff, u, p) {
         const prev = curr;
         curr = fa[curr];
         if (vis.has(curr)) {
-            // sill(`Cycle at ${curr}`);
-            // sill(res);
             break;
         }
         vis.set(curr,true);
@@ -216,8 +214,6 @@ function __obvious_a_star(nodes, ways, loc, ch, count, aff, u, p, adaptive = fal
         const prev = curr;
         curr = fa[curr];
         if (vis.has(curr)) {
-            // sill(`Cycle at ${curr}`);
-            // sill(res);
             break;
         }
         vis.set(curr,true);