diff --git a/plugin-designs/gospel-internet/src/components/GiBoundedSet.vue b/plugin-designs/gospel-internet/src/components/GiBoundedSet.vue index 5c622642c..5f4777e1a 100644 --- a/plugin-designs/gospel-internet/src/components/GiBoundedSet.vue +++ b/plugin-designs/gospel-internet/src/components/GiBoundedSet.vue @@ -28,7 +28,12 @@ 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() @@ -73,7 +78,7 @@ useShadowStyles( // can never push the figure out of its pane the way the legend did on the centered set. '.gbs{position:absolute;inset:0;display:flex;flex-direction:column;align-items:center;' + 'justify-content:center;padding:46px 10px 10px;box-sizing:border-box;overflow:hidden;background:#f3f3f1}' + - '.gbs svg{max-width:100%;max-height:100%}' + + '.gbs-fig{position:relative;flex:1 1 auto;align-self:stretch;min-height:0;min-width:0}' + '.gbs-ring{fill:none;stroke:#3b463d;stroke-width:1.5}' + '.gbs-in{fill:#92b195}.gbs-out{fill:#6d766e;opacity:.65}' + '.gbs-cross-halo{stroke:var(--gbs-bg,#f3f3f1);stroke-width:7;stroke-linecap:square}' + @@ -91,24 +96,11 @@ useShadowStyles( {{ failed }}
- + +
{{ T('gospelInternet.bounded.caption', 'Inside the circle: reached. Outside: unreached.') }}
{{ fmt(tally.inside) }} / {{ fmt(tally.outside) }}
diff --git a/plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue b/plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue
new file mode 100644
index 000000000..7c0369a3c
--- /dev/null
+++ b/plugin-designs/gospel-internet/src/components/GiBoundedSetMap.vue
@@ -0,0 +1,108 @@
+
+
+
+
+ {{ T('gospelInternet.bounded.failed', 'The reached/unreached table could not be loaded, so this chart is not drawn.') }}
+ {{ failed }}
+