Merge pull request #105 from geoblocks/poi_indexes

Set poi indexes
geoblocks · Aug 25, 2023 · cad8034 · cad8034
2 parents 51327aa + e953889
commit cad8034
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 14 deletions.
diff --git a/demos/schm/style.js b/demos/schm/style.js
@@ -94,7 +94,6 @@ export const poiPoint = new Style({
   }),
   text: new Text({
     font: "11px Inter",
-    text: "99",
     offsetY: -10,
     fill: new Fill({
       color: "#fff",
@@ -109,7 +108,6 @@ export const poiPointSketchHit = new Style({
   }),
   text: new Text({
     font: "11px Inter",
-    text: "99",
     offsetY: -10,
     fill: new Fill({
       color: "#fff",
@@ -164,7 +162,14 @@ export function styleFunction(feature) {
       }
       return withPointerDevice ? null : sketchControlPoint;
     case "POI":
-      return sketchHitGeometry ? poiPointSketchHit : poiPoint;
+      if (sketchHitGeometry) {
+        return poiPointSketchHit
+      }
+      const index = feature.get("index");
+      if (index !== undefined) {
+        poiPoint.getText().setText((index + 1).toString());
+      }
+      return poiPoint;
     case "controlPoint":
       if (!withPointerDevice && sketchHitGeometry) {
         return sketchControlPointHint;

diff --git a/src/interaction/TrackData.ts b/src/interaction/TrackData.ts
@@ -1,6 +1,7 @@
 import {equals} from 'ol/coordinate.js';
 import Feature from 'ol/Feature.js';
 import LineString from 'ol/geom/LineString.js';
+import MultiPoint from 'ol/geom/MultiPoint.js';
 import type Point from 'ol/geom/Point.js';
 import type {Coordinate} from 'ol/coordinate.js';
 
@@ -66,6 +67,7 @@ export default class TrackData {
     this.segments = segments;
     this.pois = pois;
     this.controlPoints = controlPoints;
+    this.updatePOIIndexes();
   }
 
   getAdjacentSegments(controlPoint: Feature<Point>): AdjacentSegments {
@@ -254,6 +256,21 @@ export default class TrackData {
     };
   }
 
+  updatePOIIndexes() {
+    // build a multi point geometry from all segments coordinates
+    const points = new MultiPoint(this.segments.map((s) => s.getGeometry().getCoordinates()).flat());
+    const pointsCoordinates = points.getCoordinates();
+    const sorted = this.pois.map((poi) => {
+      // find the closest point to the POI and returns its index; that's it's "distance" from the start
+      const closestPoint = points.getClosestPoint(poi.getGeometry().getCoordinates());
+      return {
+        poi: poi,
+        index: pointsCoordinates.findIndex((c) => equals(c, closestPoint))
+      };
+    }).sort((a, b) => a.index - b.index);
+    sorted.forEach((s, index) => s.poi.set('index', index));
+  }
+
   /*
    * Remove the last control point.
    */

diff --git a/src/interaction/TrackManager.js b/src/interaction/TrackManager.js
@@ -218,18 +218,19 @@ class TrackManager {
        *
        * @param {import ('./TrackInteractionModify').ModifyEvent} event
        */
-      (event) => {
+      async (event) => {
         const feature = event.feature;
         const type = feature.get('type');
 
       if (type === 'POI') {
+        this.trackData_.updatePOIIndexes();
         this.onTrackChanged_();
       } else if (type === 'controlPoint') {
-        this.updater_.updateAdjacentSegmentsGeometries(feature).then(() => {
-          this.updater_.changeAdjacentSegmentsStyling(feature, '');
-          this.updater_.computeAdjacentSegmentsProfile(feature);
-        })
-        .then(() => this.onTrackChanged_());
+        await this.updater_.updateAdjacentSegmentsGeometries(feature);
+        this.updater_.changeAdjacentSegmentsStyling(feature, '');
+        await this.updater_.computeAdjacentSegmentsProfile(feature);
+        this.trackData_.updatePOIIndexes();
+        this.onTrackChanged_();
       } else if (type === 'segment') {
         const indexOfSegment = this.trackData_.getSegments().indexOf(feature);
 
@@ -246,11 +247,11 @@ class TrackManager {
         console.assert(!!before && !!after);
         this.source_.addFeatures([before, after]);
 
-        this.updater_.updateAdjacentSegmentsGeometries(controlPoint).then(() => {
-          this.updater_.changeAdjacentSegmentsStyling(controlPoint, '');
-          this.updater_.computeAdjacentSegmentsProfile(controlPoint);
-        })
-        .then(() => this.onTrackChanged_());
+        await this.updater_.updateAdjacentSegmentsGeometries(controlPoint);
+        this.updater_.changeAdjacentSegmentsStyling(controlPoint, '');
+        await this.updater_.computeAdjacentSegmentsProfile(controlPoint);
+        this.trackData_.updatePOIIndexes();
+        this.onTrackChanged_();
       }
     });