mobility-toolbox-js 2.0.0-beta.32 → 2.0.0-beta.33

package/ol/controls/RoutingControl.js

@@ -1,388 +0,0 @@
-import { Feature } from "ol";
-import { LineString, Point } from "ol/geom";
-import { Modify } from "ol/interaction";
-import { unByKey } from "ol/Observable";
-import { click } from "ol/events/condition";
-import { GeoJSON } from "ol/format";
-import { buffer } from "ol/extent";
-import { fromLonLat, toLonLat } from "ol/proj";
-import GeomType from "ol/geom/GeometryType";
-import { RoutingAPI } from "../../api";
-import Control from "../../common/controls/Control";
-import RoutingLayer from "../layers/RoutingLayer";
-const REGEX_VIA_POINT = /^([^@$!\n]*)(@?([\d.]+),([\d.]+))?(\$?([a-zA-Z0-9]{0,2}))$/;
-const REGEX_VIA_POINT_COORD = /^([\d.]+),([\d.]+)$/;
-const REGEX_VIA_POINT_STATION_ID = /^!([^$]*)(\$?([a-zA-Z0-9]{0,2}))$/;
-const STOP_FETCH_ABORT_CONTROLLER_KEY = "stop-fetch";
-const getFlatCoordinatesFromSegments = (segmentArray) => {
-  const coords = [];
-  segmentArray.forEach((seg) => {
-    coords.push(...seg.getGeometry().getCoordinates());
-  });
-  return coords;
-};
-class RoutingControl extends Control {
-  constructor(options = {}) {
-    super(options);
-    Object.defineProperties(this, {
-      mot: {
-        get: () => this.get("mot"),
-        set: (newMot) => {
-          if (newMot) {
-            this.set("mot", newMot);
-            if (this.viaPoints) {
-              this.drawRoute();
-            }
-          }
-        }
-      },
-      loading: {
-        get: () => this.get("loading"),
-        set: (newLoading) => {
-          this.set("loading", newLoading);
-        }
-      },
-      modify: {
-        get: () => this.get("modify"),
-        set: (modify) => {
-          this.set("modify", modify);
-        }
-      }
-    });
-    this.loading = false;
-    this.graphs = options.graphs || [["osm", 0, 99]];
-    this.mot = options.mot || "bus";
-    this.modify = options.modify !== false;
-    this.routingApiParams = options.routingApiParams || {};
-    this.useRawViaPoints = options.useRawViaPoints || false;
-    this.snapToClosestStation = options.snapToClosestStation || false;
-    this.cacheStationData = {};
-    this.abortControllers = [];
-    this.apiKey = options.apiKey;
-    this.stopsApiKey = options.stopsApiKey || this.apiKey;
-    this.segments = [];
-    this.stopsApiUrl = options.stopsApiUrl || "https://api.geops.io/stops/v1/";
-    this.api = new RoutingAPI({
-      ...options
-    });
-    this.routingLayer = options.routingLayer || new RoutingLayer({
-      name: "routing-layer",
-      style: options.style
-    });
-    this.onRouteError = options.onRouteError || ((error) => {
-      this.dispatchEvent({
-        type: "change:route",
-        target: this
-      });
-      this.reset();
-      console.error(error);
-    });
-    this.viaPoints = [];
-    this.onMapClick = this.onMapClick.bind(this);
-    this.onModifyEnd = this.onModifyEnd.bind(this);
-    this.onModifyStart = this.onModifyStart.bind(this);
-    this.apiChangeListener = () => this.drawRoute();
-    this.createModifyInteraction();
-  }
-  static getGraphsResolutions(graphs, map) {
-    const view = map.getView();
-    return graphs.map(([, minZoom, maxZoom]) => [
-      view.getResolutionForZoom(minZoom),
-      view.getResolutionForZoom(maxZoom || minZoom + 1)
-    ]);
-  }
-  addViaPoint(coordinatesOrString, index = -1, overwrite = 0) {
-    this.viaPoints.splice(index === -1 ? this.viaPoints.length : index, overwrite, coordinatesOrString);
-    this.drawRoute();
-    this.dispatchEvent({
-      type: "change:route",
-      target: this
-    });
-  }
-  removeViaPoint(index = this.viaPoints.length - 1) {
-    if (this.viaPoints.length && this.viaPoints[index]) {
-      this.viaPoints.splice(index, 1);
-    }
-    this.drawRoute();
-    this.dispatchEvent({
-      type: "change:route",
-      target: this
-    });
-  }
-  setViaPoints(coordinateArray) {
-    this.viaPoints = [...coordinateArray];
-    this.drawRoute();
-    this.dispatchEvent({
-      type: "change:route",
-      target: this
-    });
-  }
-  reset() {
-    this.abortRequests();
-    this.viaPoints = [];
-    this.routingLayer.olLayer.getSource().clear();
-    this.dispatchEvent({
-      type: "change:route",
-      target: this
-    });
-  }
-  abortRequests() {
-    this.graphs.forEach(([graph]) => {
-      if (this.abortControllers[graph]) {
-        this.abortControllers[graph].abort();
-      }
-      this.abortControllers[graph] = new AbortController();
-    });
-    this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY]?.abort();
-    this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY] = new AbortController();
-    this.loading = false;
-  }
-  drawRoute() {
-    this.abortRequests();
-    this.routingLayer.olLayer.getSource().clear();
-    if (!this.viaPoints.length) {
-      return null;
-    }
-    if (this.viaPoints.length === 1) {
-      return this.drawViaPoint(this.viaPoints[0], 0, this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY]);
-    }
-    const formattedViaPoints = this.viaPoints.map((viaPoint) => {
-      if (Array.isArray(viaPoint)) {
-        const projection = this.map.getView().getProjection();
-        const [lon, lat] = toLonLat(viaPoint, projection);
-        return this.snapToClosestStation ? [`@${lat}`, lon] : [lat, lon];
-      }
-      return this.useRawViaPoints ? viaPoint : `!${viaPoint}`;
-    });
-    this.loading = true;
-    this.routingLayer.olLayer.getSource().clear();
-    this.viaPoints.forEach((viaPoint, idx) => this.drawViaPoint(viaPoint, idx, this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY]));
-    return Promise.all(this.graphs.map(([graph], index) => {
-      return this.api.route({
-        graph,
-        via: `${formattedViaPoints.join("|")}`,
-        mot: `${this.mot}`,
-        "resolve-hops": false,
-        elevation: false,
-        "coord-radius": 100,
-        "coord-punish": 1e3,
-        ...this.routingApiParams
-      }, this.abortControllers[graph]).then((featureCollection) => {
-        this.segments = this.format.readFeatures(featureCollection);
-        if (this.mot === "foot") {
-          const uniqueVias = this.segments.reduce((resultVias, currentFeat) => {
-            const segTrg = currentFeat.get("trg");
-            return resultVias.find((via) => via[0] === segTrg[0] && via[1] === segTrg[1]) ? resultVias : [...resultVias, segTrg];
-          }, []);
-          this.segments = uniqueVias.map((via) => {
-            const viaSegments = this.segments.filter((seg) => {
-              const segTrg = seg.get("trg");
-              return segTrg[0] === via[0] && segTrg[1] === via[1];
-            });
-            const coords2 = getFlatCoordinatesFromSegments(viaSegments);
-            return new Feature({
-              geometry: new LineString(coords2)
-            });
-          });
-        }
-        const coords = getFlatCoordinatesFromSegments(this.segments);
-        const routeFeature = new Feature({
-          geometry: new LineString(coords)
-        });
-        routeFeature.set("graph", graph);
-        routeFeature.set("mot", this.mot);
-        routeFeature.set("minResolution", this.graphsResolutions[index][0]);
-        routeFeature.set("maxResolution", this.graphsResolutions[index][1]);
-        this.routingLayer.olLayer.getSource().addFeature(routeFeature);
-        this.loading = false;
-      }).catch((error) => {
-        if (error.name === "AbortError") {
-          return;
-        }
-        this.segments = [];
-        this.dispatchEvent({
-          type: "error",
-          target: this
-        });
-        this.onRouteError(error, this);
-        this.loading = false;
-      });
-    }));
-  }
-  drawViaPoint(viaPoint, idx, abortController) {
-    const pointFeature = new Feature();
-    pointFeature.set("viaPointIdx", idx);
-    if (Array.isArray(viaPoint)) {
-      pointFeature.setGeometry(new Point(viaPoint));
-      this.routingLayer.olLayer.getSource().addFeature(pointFeature);
-      return Promise.resolve(pointFeature);
-    }
-    if (!this.useRawViaPoints || REGEX_VIA_POINT_STATION_ID.test(viaPoint)) {
-      let stationId;
-      let track2;
-      if (this.useRawViaPoints) {
-        [, stationId, , track2] = REGEX_VIA_POINT_STATION_ID.exec(viaPoint);
-      } else {
-        [stationId, track2] = viaPoint.split("$");
-      }
-      return fetch(`${this.stopsApiUrl}lookup/${stationId}?key=${this.stopsApiKey}`, { signal: abortController.signal }).then((res) => res.json()).then((stationData) => {
-        const { coordinates } = stationData.features[0].geometry;
-        this.cacheStationData[viaPoint] = fromLonLat(coordinates);
-        pointFeature.set("viaPointTrack", track2);
-        pointFeature.setGeometry(new Point(fromLonLat(coordinates)));
-        this.routingLayer.olLayer.getSource().addFeature(pointFeature);
-        return pointFeature;
-      }).catch((error) => {
-        if (error.name === "AbortError") {
-          return;
-        }
-        this.dispatchEvent({
-          type: "error",
-          target: this
-        });
-        this.onRouteError(error, this);
-        this.loading = false;
-      });
-    }
-    if (this.useRawViaPoints && REGEX_VIA_POINT_COORD.test(viaPoint)) {
-      const [lat2, lon2] = REGEX_VIA_POINT_COORD.exec(viaPoint);
-      const coordinates = fromLonLat([parseFloat(lon2), parseFloat(lat2)], this.map.getView().getProjection());
-      pointFeature.setGeometry(new Point(coordinates));
-      this.routingLayer.olLayer.getSource().addFeature(pointFeature);
-      return Promise.resolve(pointFeature);
-    }
-    const [, stationName, , lat, lon, , track] = REGEX_VIA_POINT.exec(viaPoint);
-    if (lon && lat) {
-      const coordinates = fromLonLat([parseFloat(lon), parseFloat(lat)], this.map.getView().getProjection());
-      pointFeature.set("viaPointTrack", track);
-      pointFeature.setGeometry(new Point(coordinates));
-      this.routingLayer.olLayer.getSource().addFeature(pointFeature);
-      return Promise.resolve(pointFeature);
-    }
-    if (stationName) {
-      return fetch(`${this.stopsApiUrl}?key=${this.stopsApiKey}&q=${stationName}&limit=1`, { signal: abortController.signal }).then((res) => res.json()).then((stationData) => {
-        const { coordinates } = stationData.features[0].geometry;
-        this.cacheStationData[viaPoint] = fromLonLat(coordinates);
-        pointFeature.set("viaPointTrack", track);
-        pointFeature.setGeometry(new Point(fromLonLat(coordinates)));
-        this.routingLayer.olLayer.getSource().addFeature(pointFeature);
-        return pointFeature;
-      }).catch((error) => {
-        this.dispatchEvent({
-          type: "error",
-          target: this
-        });
-        this.onRouteError(error, this);
-        this.loading = false;
-        return null;
-      });
-    }
-    return Promise.resolve(null);
-  }
-  onMapClick(e) {
-    const feats = e.target.getFeaturesAtPixel(e.pixel);
-    const viaPoint = feats.find((feat) => feat.getGeometry()?.getType() === GeomType.POINT && feat.get("viaPointIdx") !== void 0);
-    if (viaPoint) {
-      this.removeViaPoint(viaPoint.get("viaPointIdx"));
-      return;
-    }
-    this.addViaPoint(e.coordinate);
-  }
-  onModifyStart(evt) {
-    let segmentIndex = -1;
-    const route = evt.features.getArray().find((feat) => feat.getGeometry()?.getType() === GeomType.LINE_STRING);
-    if (route) {
-      const closestExtent = buffer(new Point(route.getGeometry().getClosestPoint(evt.mapBrowserEvent.coordinate)).getExtent(), 1e-3);
-      segmentIndex = this.segments.findIndex((segment) => segment.getGeometry().intersectsExtent(closestExtent));
-    }
-    const viaPoint = (evt.features.getArray().filter((feat) => feat.getGeometry()?.getType() === GeomType.POINT) || [])[0];
-    this.initialRouteDrag = {
-      viaPoint,
-      oldRoute: route && route.clone(),
-      segmentIndex
-    };
-  }
-  onModifyEnd(evt) {
-    const coord = evt.mapBrowserEvent.coordinate;
-    const { oldRoute, viaPoint, segmentIndex } = this.initialRouteDrag;
-    if (viaPoint) {
-      return this.addViaPoint(coord, viaPoint.get("viaPointIdx"), 1);
-    }
-    if (!oldRoute) {
-      return this.addViaPoint(coord, 0, 1);
-    }
-    if (segmentIndex === -1) {
-      return Promise.reject(new Error("No segment found"));
-    }
-    return this.addViaPoint(coord, segmentIndex + 1);
-  }
-  createDefaultElement() {
-    this.element = document.createElement("button");
-    this.element.id = "ol-toggle-routing";
-    this.element.innerHTML = "Toggle Route Control";
-    this.element.onclick = () => this.active ? this.deactivate() : this.activate();
-    Object.assign(this.element.style, {
-      position: "absolute",
-      right: "10px",
-      top: "10px"
-    });
-  }
-  createModifyInteraction() {
-    this.modifyInteraction = new Modify({
-      source: this.routingLayer.olLayer.getSource(),
-      pixelTolerance: 4,
-      hitDetection: this.routingLayer.olLayer,
-      deleteCondition: (e) => {
-        const feats = e.target.getFeaturesAtPixel(e.pixel, {
-          hitTolerance: 5
-        });
-        const viaPoint = feats.find((feat) => feat.getGeometry()?.getType() === GeomType.POINT && feat.get("index"));
-        if (click(e) && viaPoint) {
-          this.removeViaPoint(viaPoint.get("index"));
-          return true;
-        }
-        return false;
-      }
-    });
-    this.modifyInteraction.on("modifystart", this.onModifyStart);
-    this.modifyInteraction.on("modifyend", this.onModifyEnd);
-    this.modifyInteraction.setActive(false);
-  }
-  addListeners() {
-    if (!this.modify) {
-      return;
-    }
-    this.removeListeners();
-    this.onMapClickKey = this.map.on("singleclick", this.onMapClick);
-  }
-  removeListeners() {
-    unByKey(this.onMapClickKey);
-  }
-  activate() {
-    super.activate();
-    if (this.map) {
-      this.format = new GeoJSON({
-        featureProjection: this.map.getView().getProjection()
-      });
-      this.graphsResolutions = RoutingControl.getGraphsResolutions(this.graphs, this.map);
-      this.map.removeInteraction(this.modifyInteraction);
-      this.routingLayer.attachToMap(this.map);
-      this.map.addInteraction(this.modifyInteraction);
-      this.modifyInteraction.setActive(this.modify);
-      this.addListeners();
-    } else {
-      this.format = new GeoJSON({ featureProjection: "EPSG:3857" });
-      this.graphsResolutions = this.graphs;
-    }
-  }
-  deactivate() {
-    if (this.map) {
-      this.routingLayer.detachFromMap(this.map);
-      this.map.removeInteraction(this.modifyInteraction);
-      this.removeListeners();
-      this.reset();
-    }
-    super.deactivate();
-  }
-}
-export default RoutingControl;

package/ol/controls/RoutingControl.test.js

@@ -1,146 +0,0 @@
-import fetch from "jest-fetch-mock";
-import View from "ol/View";
-import Map from "ol/Map";
-import RoutingControl from "./RoutingControl";
-import RoutingControlStation1 from "./snapshots/RoutingControlStation1.json";
-import RoutingControlStation2 from "./snapshots/RoutingControlStation2.json";
-import RoutingControlRouteGen5 from "./snapshots/RoutingControlRouteGen5.json";
-import RoutingControlRouteGen10 from "./snapshots/RoutingControlRouteGen10.json";
-import RoutingControlRouteGen30 from "./snapshots/RoutingControlRouteGen30.json";
-import RoutingControlRouteGen100 from "./snapshots/RoutingControlRouteGen100.json";
-import RoutingControlRouteOSM from "./snapshots/RoutingControlRouteOSM.json";
-describe("RoutingControl", () => {
-  let map;
-  beforeEach(() => {
-    const target = document.createElement("div");
-    document.body.appendChild(target);
-    map = new Map({
-      target,
-      view: new View({
-        center: [0, 0],
-        zoom: 0
-      })
-    });
-    global.fetch = fetch;
-  });
-  afterEach(() => {
-    if (map) {
-      map.setTarget(null);
-      map = null;
-    }
-    fetch.resetMocks();
-  });
-  test("should be activate by default", () => {
-    const control = new RoutingControl();
-    expect(control.active).toBe(true);
-    expect(control.snapToClosestStation).toBe(false);
-    expect(control.useRawViaPoints).toBe(false);
-  });
-  test("launch routing and add features", (done) => {
-    fetch.mockResponseOnce(JSON.stringify(global.fetchRouteResponse));
-    const control = new RoutingControl({
-      url: "https://foo.ch",
-      apiKey: "foo"
-    });
-    control.attachToMap(map);
-    expect(map.getTargetElement().querySelector("#ol-toggle-routing")).toBeDefined();
-    control.viaPoints = [
-      [950476.4055933182, 6003322253698345e-9],
-      [950389.0813034325, 6003656659274571e-9]
-    ];
-    control.drawRoute(control.viaPoints).then(() => {
-      expect(fetch.mock.calls[0][0]).toEqual("https://foo.ch/?key=foo&graph=osm&via=47.3739194713294%2C8.538274823394632%7C47.37595378493421%2C8.537490375951839&mot=bus&resolve-hops=false&elevation=false&coord-radius=100&coord-punish=1000");
-      expect(control.routingLayer.olLayer.getSource().getFeatures().length).toEqual(3);
-      done();
-    });
-  });
-  test("launch routing and add features for multiple graphs", (done) => {
-    fetch.mockResponses([JSON.stringify(RoutingControlStation1), { status: 200 }], [JSON.stringify(RoutingControlStation2), { status: 200 }], [JSON.stringify(RoutingControlRouteGen5), { status: 200 }], [JSON.stringify(RoutingControlRouteGen10), { status: 200 }], [JSON.stringify(RoutingControlRouteGen30), { status: 200 }], [JSON.stringify(RoutingControlRouteGen100), { status: 200 }], [JSON.stringify(RoutingControlRouteOSM), { status: 200 }]);
-    const control = new RoutingControl({
-      url: "https://foo.ch/",
-      stopsApiUrl: "https://foo.ch/",
-      apiKey: "foo",
-      graphs: [
-        ["gen5", 6, 7],
-        ["gen10", 8],
-        ["gen30", 9, 10],
-        ["gen100", 11, 13],
-        ["osm", 14, 99]
-      ]
-    });
-    control.attachToMap(map);
-    control.viaPoints = ["a4dca961d199ff76", "e3666f03cba06b2b"];
-    control.drawRoute(control.viaPoints).then(() => {
-      expect(fetch.mock.calls[0][0]).toEqual("https://foo.ch/lookup/a4dca961d199ff76?key=foo");
-      expect(fetch.mock.calls[1][0]).toEqual("https://foo.ch/lookup/e3666f03cba06b2b?key=foo");
-      expect(fetch.mock.calls[2][0]).toEqual("https://foo.ch/?key=foo&graph=gen5&via=%21a4dca961d199ff76%7C%21e3666f03cba06b2b&mot=bus&resolve-hops=false&elevation=false&coord-radius=100&coord-punish=1000");
-      expect(fetch.mock.calls[3][0]).toEqual("https://foo.ch/?key=foo&graph=gen10&via=%21a4dca961d199ff76%7C%21e3666f03cba06b2b&mot=bus&resolve-hops=false&elevation=false&coord-radius=100&coord-punish=1000");
-      expect(fetch.mock.calls[4][0]).toEqual("https://foo.ch/?key=foo&graph=gen30&via=%21a4dca961d199ff76%7C%21e3666f03cba06b2b&mot=bus&resolve-hops=false&elevation=false&coord-radius=100&coord-punish=1000");
-      expect(fetch.mock.calls[5][0]).toEqual("https://foo.ch/?key=foo&graph=gen100&via=%21a4dca961d199ff76%7C%21e3666f03cba06b2b&mot=bus&resolve-hops=false&elevation=false&coord-radius=100&coord-punish=1000");
-      expect(fetch.mock.calls[6][0]).toEqual("https://foo.ch/?key=foo&graph=osm&via=%21a4dca961d199ff76%7C%21e3666f03cba06b2b&mot=bus&resolve-hops=false&elevation=false&coord-radius=100&coord-punish=1000");
-      expect(control.routingLayer.olLayer.getSource().getFeatures().length).toEqual(7);
-      done();
-    });
-  });
-  test("ignores Abort Error and returns undefined", (done) => {
-    const control = new RoutingControl({
-      url: "https://foo.ch",
-      apiKey: "foo"
-    });
-    control.attachToMap(map);
-    control.viaPoints = [
-      [950476.4055933182, 6003322253698345e-9],
-      [950389.0813034325, 6003656659274571e-9]
-    ];
-    const error = new Error("Error");
-    error.name = "AbortError";
-    fetch.mockRejectOnce(error);
-    return control.drawRoute().then((data) => {
-      expect(data).toEqual([void 0]);
-      done();
-    });
-  });
-  test("calls routing api with @ before the coordinates when snapToClosestStation is true", (done) => {
-    fetch.mockResponses([JSON.stringify(RoutingControlStation1), { status: 200 }], [JSON.stringify(global.fetchRouteResponse), { status: 200 }]);
-    const control = new RoutingControl({
-      apiKey: "foo",
-      snapToClosestStation: true
-    });
-    control.attachToMap(map);
-    expect(map.getTarget().querySelector("#ol-toggle-routing")).toBeDefined();
-    control.viaPoints = [
-      [950476.4055933182, 6003322253698345e-9],
-      [950389.0813034325, 6003656659274571e-9],
-      "e3666f03cba06b2b"
-    ];
-    control.drawRoute(control.viaPoints).then(() => {
-      const { searchParams } = new URL(fetch.mock.calls[1][0]);
-      expect(searchParams.get("via")).toBe("@47.3739194713294,8.538274823394632|@47.37595378493421,8.537490375951839|!e3666f03cba06b2b");
-      done();
-    });
-  });
-  test("calls routing api with raw via points", (done) => {
-    fetch.mockResponses([JSON.stringify(RoutingControlStation1), { status: 200 }], [JSON.stringify(RoutingControlStation2), { status: 200 }], [JSON.stringify(global.fetchRouteResponse), { status: 200 }]);
-    const control = new RoutingControl({
-      apiKey: "foo",
-      useRawViaPoints: true
-    });
-    control.attachToMap(map);
-    expect(map.getTarget().querySelector("#ol-toggle-routing")).toBeDefined();
-    control.viaPoints = [
-      "46.2,7.1",
-      "@46.2,7.1",
-      "@46.2,7$1",
-      "station name$2",
-      "station name@46.2,7",
-      "stationname@46.2,7.7$3",
-      "!stationid",
-      [950389, 6003656]
-    ];
-    control.drawRoute(control.viaPoints).then(() => {
-      const params = new URL(fetch.mock.calls[2][0]).searchParams;
-      expect(params.get("via")).toBe("46.2,7.1|@46.2,7.1|@46.2,7$1|station name$2|station name@46.2,7|stationname@46.2,7.7$3|!stationid|47.375949774398805,8.537489645590679");
-      done();
-    });
-  });
-});

package/ol/controls/StopFinderControl.js

@@ -1,10 +0,0 @@
-import { fromLonLat } from "ol/proj";
-import Control from "../../common/controls/Control";
-import mixin from "../../common/mixins/StopFinderMixin";
-class StopFinderControl extends mixin(Control) {
-  onSuggestionClick({ geometry }) {
-    const coord = fromLonLat(geometry.coordinates);
-    this.map.getView().setCenter(coord);
-  }
-}
-export default StopFinderControl;

package/ol/controls/StopFinderControl.test.js

@@ -1,48 +0,0 @@
-import fetch from "jest-fetch-mock";
-import View from "ol/View";
-import Map from "ol/Map";
-import StopFinderControl from "./StopFinderControl";
-describe("StopFinderControl", () => {
-  let map;
-  beforeEach(() => {
-    const target = document.createElement("div");
-    document.body.appendChild(target);
-    map = new Map({
-      target,
-      view: new View({
-        center: [0, 0],
-        zoom: 0
-      })
-    });
-    global.fetch = fetch;
-  });
-  afterEach(() => {
-    if (map) {
-      map.setTarget(null);
-      map = null;
-    }
-    fetch.resetMocks();
-  });
-  test("should be activate by default", () => {
-    const control = new StopFinderControl();
-    expect(control.active).toBe(true);
-  });
-  test("launch a search and display results", (done) => {
-    fetch.mockResponseOnce(JSON.stringify(global.stopsSearchResponse));
-    const control = new StopFinderControl({
-      url: "https://foo.ch",
-      apiKey: "foo",
-      apiParams: {
-        limit: 10,
-        foo: "bar"
-      }
-    });
-    control.attachToMap(map);
-    expect(control.element).toBeDefined();
-    control.search("foo").then(() => {
-      expect(fetch.mock.calls[0][0]).toEqual("https://foo.ch/?key=foo&limit=10&foo=bar&q=foo");
-      expect(control.element.querySelector("div").querySelector("div").innerHTML).toBe("Bern");
-      done();
-    });
-  });
-});

package/ol/layers/Layer.js

@@ -1,83 +0,0 @@
-import { unByKey } from "ol/Observable";
-import LayerCommon from "../../common/layers/Layer";
-import userInteractionsMixin from "../../common/mixins/UserInteractionsLayerMixin";
-class Layer extends userInteractionsMixin(LayerCommon) {
-  constructor(options) {
-    super(options);
-    if (this.olLayer) {
-      this.olLayer.setVisible(this.visible);
-    }
-  }
-  defineProperties(options) {
-    super.defineProperties(options);
-    Object.defineProperties(this, {
-      olLayer: { value: options.olLayer, writable: true },
-      olListenersKeys: {
-        value: []
-      }
-    });
-  }
-  attachToMap(map) {
-    super.attachToMap(map);
-    if (!this.map) {
-      return;
-    }
-    if (this.olLayer && !this.map?.getLayers()?.getArray()?.includes(this.olLayer)) {
-      this.map.addLayer(this.olLayer);
-    }
-    this.olListenersKeys.push(this.on("change:visible", () => {
-      if (this.olLayer) {
-        this.olLayer.setVisible(this.visible);
-      }
-    }));
-    this.olListenersKeys.push(this.map.getLayers().on("remove", (evt) => {
-      if (evt.element === this.olLayer) {
-        this.detachFromMap();
-      }
-    }));
-    this.toggleVisibleListeners();
-    this.olListenersKeys.push(this.on("change:visible", this.toggleVisibleListeners));
-    if (this.copyrights && this.olLayer) {
-      const attributions = this.copyrights || [];
-      if (this.olLayer.getLayers) {
-        this.olLayer.getLayers().getArray().forEach((layer) => {
-          layer.getSource()?.setAttributions(attributions);
-        });
-      } else if (this.olLayer.getSource) {
-        this.olLayer.getSource()?.setAttributions(attributions);
-      }
-    }
-  }
-  detachFromMap() {
-    this.deactivateUserInteractions();
-    unByKey(this.olListenersKeys);
-    if (this.olLayer && this.map?.getLayers()?.getArray()?.includes(this.olLayer)) {
-      this.map.removeLayer(this.olLayer);
-    }
-    super.detachFromMap();
-  }
-  activateUserInteractions() {
-    this.deactivateUserInteractions();
-    if (this.map && this.userInteractions && this.userClickInteractions && this.userClickCallbacks.length) {
-      this.singleClickListenerKey = this.map.on("singleclick", this.onUserClickCallback);
-      this.olListenersKeys.push(this.singleClickListenerKey);
-    }
-    if (this.map && this.userInteractions && this.userHoverInteractions && this.userHoverCallbacks.length) {
-      this.pointerMoveListenerKey = this.map.on("pointermove", this.onUserMoveCallback);
-    }
-  }
-  deactivateUserInteractions() {
-    unByKey([this.pointerMoveListenerKey, this.singleClickListenerKey]);
-  }
-  toggleVisibleListeners() {
-    if (this.visible) {
-      this.activateUserInteractions();
-    } else {
-      this.deactivateUserInteractions();
-    }
-  }
-  clone(newOptions) {
-    return new Layer({ ...this.options, ...newOptions });
-  }
-}
-export default Layer;