update

update

update dependencies

Author: inker

src/Metro/PositioningEngine.ts

@@ -23,7 +23,6 @@ import Network, {
 import initSlots from './utils/initSlots'
 import getPositions from './utils/getPositions'
 import {
-  SourceOrTarget,
   SlotPoints,
 } from './utils/types'
 
@@ -33,7 +32,7 @@ import costFunction from './optimization/costFunction'
 
 const GAP_BETWEEN_PARALLEL = 0 // 0 - none, 1 - line width
 
-const SOURCE_TARGET = Object.freeze(['source', 'target'] as SourceOrTarget[])
+const SOURCE_TARGET = ['source', 'target'] as const
 
 interface ChildrenFuncParams {
   getSpanSlotsScaled: PositioningEngine['getSpanSlotsScaled'],
@@ -66,13 +65,9 @@ class PositioningEngine extends PureComponent<Props> {
     this.optimize()
   }
 
-  private getPlatformSlot(platform: Platform) {
-    return this.platformSlots.get(platform) || null
-  }
-
   // center is 0, (-1, 0, 1 or -0.5, 0.5 ...)
   private getPlatformSlotPosition(platform: Platform, route: Route) {
-    const map = this.getPlatformSlot(platform)
+    const map = this.platformSlots.get(platform)
     if (!map) {
       return 0
     }
@@ -132,9 +127,6 @@ class PositioningEngine extends PureComponent<Props> {
     }
   }
 
-  private getFirstWhisker = (platform: Platform) =>
-    this.props.getPlatformWhiskers(platform).values().next().value
-
   private updateBatches = () => {
     // console.time('batches')
 
@@ -287,13 +279,14 @@ class PositioningEngine extends PureComponent<Props> {
 
   private getPlatformSlotPoints = (platform: Platform) => {
     const pos = this.props.getPlatformPosition(platform)
-    const value = this.getFirstWhisker(platform)
+    // get first whisker
+    const value = this.props.getPlatformWhiskers(platform).values().next().value
     if (pos.equals(value)) {
       // TODO WTF
       return pos
     }
 
-    const slots = this.getPlatformSlot(platform)
+    const slots = this.platformSlots.get(platform)
     if (!slots) {
       return pos
     }

src/Metro/Spans.tsx

@@ -1,6 +1,5 @@
 import React, {
   useState,
-  useCallback,
   memo,
 } from 'react'
 import styled from 'styled-components'
@@ -79,7 +78,7 @@ const Spans = ({
 }: Props) => {
   const [pathsInner, setPathsInner] = useState<SVGGElement | null>(null)
 
-  const getControlPoints = useCallback((span: Span) => {
+  const getControlPoints = (span: Span) => {
     const { source, target } = span
     const sourcePos = getPlatformPosition(source)
     const targetPos = getPlatformPosition(target)
@@ -129,9 +128,9 @@ const Spans = ({
     const curves = math.split(controlPoints, CURVE_SPLIT_NUM)
     const [head, ...tail] = curves.map(pa => math.offsetPath(pa, offset))
     return [head, ...tail.map(arr => arr.slice(1))]
-  }, [getPlatformPosition, getPlatformWhiskers, getSpanSlotsScaled, getSpanOffset])
+  }
 
-  const makePath = useCallback((span: Span) => {
+  const makePath = (span: Span) => {
     const {
       routes,
       source,
@@ -191,7 +190,7 @@ const Spans = ({
     // }
     // pool.outerEdgeBindings.set(span, bezier)
     return [bezier]
-  }, [detailedE, lineRules, getControlPoints])
+  }
 
   const outerStrokeWidth = lineWidth
   const innerStrokeWidth = lineWidth / 2

src/Metro/Transfers.tsx

@@ -75,7 +75,7 @@ function getBestTriplet(sourcePositionArr: Point[], targetPositionArr: Point[],
 
 function getBestCombo(sourcePos: Point | Point[], targetPos: Point | Point[], thirdPos: Point | null) {
   if (!Array.isArray(sourcePos) && !Array.isArray(targetPos)) {
-    return [sourcePos, targetPos, thirdPos] as Pair<Point> | Triple<Point>
+    return [sourcePos, targetPos, thirdPos] as const
   }
 
   const sourcePositionArr = castArray(sourcePos)
@@ -127,7 +127,7 @@ const Transfers = ({
 }: Props) => {
   const [transfersInner, setTransfersInner] = useState<SVGGElement | null>(null)
 
-  const getThirdPosition = useCallback((transfer: Transfer) => {
+  const getThirdPosition = (transfer: Transfer) => {
     const { source, target } = transfer
     const scp = stationCircumpoints.get(source.station)
     const includes = scp && scp.includes(source) && scp.includes(target)
@@ -136,15 +136,15 @@ const Transfers = ({
     }
     const third = difference(scp, [source, target])[0] || undefined
     return getPlatformPosition(third)
-  }, [stationCircumpoints, getPlatformPosition])
+  }
 
-  const getPositions = useCallback((transfer: Transfer) => {
+  const getPositions = (transfer: Transfer) => {
     const { source, target } = transfer
     const sourcePos = getPlatformSlotPoints(source)
     const targetPos = getPlatformSlotPoints(target)
     const thirdPos = getThirdPosition(transfer)
     return getBestCombo(sourcePos, targetPos, thirdPos)
-  }, [getPlatformSlotPoints, getThirdPosition])
+  }
 
   const setFeaturedPlatformsMem = useCallback((transfer: Transfer) => {
     const feat = getFeaturedPlatforms(transfer)

src/Metro/optimization/costFunction.ts

@@ -72,7 +72,7 @@ export default ({
 
     distances[span.id] = sourcePoint.distanceTo(targetPoint)
 
-    const arr = [sourcePoint, targetPoint] as [Point, Point]
+    const arr = [sourcePoint, targetPoint] as const
 
     for (let j = i + 1; j < numSpans; ++j) {
       const otherSpan = spans[j]

src/Metro/utils/makeWhiskers.ts

@@ -17,7 +17,7 @@ import {
 } from '../../network'
 
 type Bound = 'inbound' | 'outbound'
-const SPAN_PROPS = Object.freeze(['inbound', 'outbound'] as Bound[])
+const SPAN_PROPS = ['inbound', 'outbound'] as const
 
 type Positions = {
   [P in Bound]: Point

src/utils/math/vector.ts

@@ -1,8 +1,8 @@
 import { Point, point } from 'leaflet'
 import { isArbitrarilySmall as isNumberSmall } from '.'
 
-export type Ray = [Point, Point]
-type Segment = [Point, Point]
+export type Ray = Readonly<[Point, Point]>
+type Segment = Readonly<[Point, Point]>
 
 enum Orientation {
     COLLINEAR,

webpack/rules.js

@@ -16,6 +16,7 @@ const getCssLoader = global => global ? 'css-loader' : {
       localIdentName: '[path]___[name]__[local]___[hash:base64:5]',
     },
     importLoaders: 1,
+    localsConvention: 'asIs',
   },
 }