Point the set charts at the promoted modules, and clear a committed conflict

The layout modules moved to library when they were promoted, and three of my
files still named the old paths: the two new whiteboard components, which were
written before the move landed, and the geometry check, which was written after
it and still copied the old import from its neighbours.

GiBoundedSet also carried an unresolved conflict — markers and all — committed by
a cherry-pick loop of mine that resolved generated output automatically and swept
the source conflict along with it. The file had both imports of the same symbol,
one of them pointing at a deleted path. It parsed, so the SFC check passed; only
the bundler would have caught it, and only at the point where it could not
resolve the file.

The lesson is about the loop, not the file: resolving one class of conflict
automatically is fine, but `git add -A` afterwards does not distinguish the
conflicts you meant to resolve from the ones you did not. A loop that stages
everything needs to refuse when a marker is still present.

internal/check-gospel-whiteboard.mjs

@@ -23,10 +23,10 @@
  * extentFraction. A consumer cannot buy headroom against the clamp by choosing a bigger extent,
  * and one assertion covers every chart.
  */
-import { layoutBoundedSet } from '../plugin-designs/gospel-internet/src/boundedSet.js'
+import { layoutBoundedSet } from '../library/components/charts/boundedSet.js'
 import { degreesToPixelRadius, dishRadiusDegrees, toFeatureCollection, centeredSetFeatures }
   from '../plugin-designs/gospel-internet/src/setChartFeatures.js'
-import { layoutCenteredSet, ringRadii } from '../plugin-designs/gospel-internet/src/centeredSet.js'
+import { layoutCenteredSet, ringRadii } from '../library/components/charts/centeredSet.js'
 import { whiteboardProjection } from '../library/maps/whiteboard-projection.js'
 
 const fail = []

plugin-designs/gospel-internet/src/components/GiBoundedSet.vue

@@ -5,7 +5,7 @@
  * The chart makes exactly one claim — which side of the line a group is on — so position
  * carries no other meaning: no gradient, no ranking, no distance. The centered-set target
  * is the chart that makes the opposite claim, and keeping them visually distinct is the
- * point of having both. Layout maths is in ../boundedSet.js, pure and testable without
+ * point of having both. Layout maths is in @map/components/charts/boundedSet.js, pure and testable without
  * mounting this.
  *
  * SVG RATHER THAN THE MAP ENGINE, which is the opposite of GiTree's call and for a reason
@@ -28,12 +28,8 @@ import { formatCount } from '@map/utils/formatCount.js'
 import { useBoardState } from '../useBoard.js'
 import { useGiT } from '../useGiT.js'
 import { loadNearRows, indexFor } from '../nearRows.js'
-<<<<<<< HEAD
 import { layoutBoundedSet, boundedSetTally } from '@map/components/charts/boundedSet.js'
-=======
-import { layoutBoundedSet, boundedSetTally } from '../boundedSet.js'
 import GiBoundedSetMap from './GiBoundedSetMap.vue'
->>>>>>> ea8dbe45 (Put the bounded set on the whiteboard too, with its boundary in map units)
 
 const T = useGiT()
 const board = useBoardState()

plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue

@@ -25,7 +25,7 @@ import { addTieredPointLayers } from '@map/charts/whiteboard/tiered-points.js'
 import { createBoardMap } from '../boardEngine.js'
 import { useBoardState } from '../useBoard.js'
 import { useGiT } from '../useGiT.js'
-import { layoutBoundedSet } from '../boundedSet.js'
+import { layoutBoundedSet } from '@map/components/charts/boundedSet.js'
 import { boundedSetFeatures, toFeatureCollection, dishRadiusDegrees, degreesToPixelRadius, TIERS } from '../setChartFeatures.js'
 
 const props = defineProps({ groups: { type: Array, default: () => [] } })

plugin-designs/gospel-internet/src/components/GiCenteredSetMap.vue

@@ -27,7 +27,7 @@ import { createBoardMap } from '../boardEngine.js'
 import { useBoardState } from '../useBoard.js'
 import { useGiT } from '../useGiT.js'
 import { ringInfo, CENTRE_COLOR } from '../ringInfo.js'
-import { layoutCenteredSet, ringRadii, RING_MAX } from '../centeredSet.js'
+import { layoutCenteredSet, ringRadii, RING_MAX } from '@map/components/charts/centeredSet.js'
 import { centeredSetFeatures, toFeatureCollection, TIERS } from '../setChartFeatures.js'
 
 const props = defineProps({