Merge origin/development (f8de00edf) into upg100/india-states; package.json keeps both sides' gates; rebuild my-upg-100-list from the merged source, and regenerate the tree and SRI
This commit is contained in:
Doxa Maps
commit
3f23274a30
7 changed files with 147 additions and 15 deletions
|
|
@ -345,7 +345,7 @@
|
|||
"fix:sri": "node internal/fix-sri.mjs",
|
||||
"gallery": "node internal/generate-gallery.mjs",
|
||||
"gates:post": "node internal/run-parallel.mjs --label=post -- check:capability-derived check:drop check:parse verify check:sri check:public-hygiene check:label-joins check:facet-cascade check:facet-one-field check:heartbeat check:kpi-unit check:composite-reg check:descriptions check:no-abs-paths check:no-codename check:dep-names check:composite-srcs check:embed-targets check:nested-token check:i18n-parity check:tabs-localized check:packets-all check:packet-strings-parity check:zone-census check:zoning-declared check:share-policy check:library-index check:csv-shape check:capability-citations check:catalog-identity check:no-orphan-gates check:quoted-scripts check:done-evidence check:script-flags check:backlog-status check:capability-exemplars check:packet-fixture check:packet-browser check:provider-switch check:locale-reachable check:url-resolver check:manifest-covers check:one-palette check:pin-dim-slider check:legend-source check:backlog-refs check:clustering-modes check:composite-embed-knobs check:composite-locale-leaks check:linked-vocabulary check:wp-embed check:dashboard-geocoder-provider check:leaf-engine-per-provider check:auto-engine check:engine-contract check:map-props-unit check:composites-mount check:composite-interop check:no-free-identifiers check:map-fly-reduced-motion check:mst-clustering check:list-prop-unit check:profiles-mount check:cdn-pins check:no-eval check:popup-escaping check:i18n-treeshake check:pinned-umd check:one-palette:self-test check:no-cross-plugin-imports check:no-cross-plugin-imports:self-test check:map-attribution check:studio-rail check:approx-pin-note check:embedder-keys check:provider-for check:legend-logical-insets check:legend-logical-insets:self-test check:optional-t-equivalence check:text-highlight check:religion-label-not-value check:i18n-stopped-scope check:no-silent-engine check:no-silent-engine:self-test check:regions-uses-library check:shadow-css-parses check:square-map-controls check:preset-config-merge check:instance-config-keys check:frozen-labels check:plural-forms check:region-fill-repaint check:region-paint-single-source check:poster-print-fallback check:posters-exportable check:country-names check:reduced-motion check:no-dead-library check:universal-props check:readme-size check:tree-relative check:leaf-hints check:snippet-engine check:snippet-engine:self-test check:embed-base check:link-coverage check:no-public-binds check:shared-reached check:tree-weight",
|
||||
"gates:pre": "node internal/run-parallel.mjs --label=pre -- check:template-literal check:mjs-parse check:sfc-parse check:tab-radius check:synced-css check:doc-scripts check:setup-order check:package-json-unique-keys check:no-repo-pb-hooks check:no-credentials-omit check:no-credentials-omit:self-test check:shadow-reduced-motion check:poster-action-print check:targets check:targets:self-test check:browser-gates-guarded check:pin-selection check:facet-shape check:hardcoded-english:self-test check:list-selection check:selector-fields check:upg-zone-joins check:gospel-set-charts check:gospel-set-fit check:describe-group check:one-scroll-container check:packet-charts check:composite-token-url check:language-tree-layout check:i18n-keys-exist check:i18n-never-translated check:packet-variants check:profile-table check:element-bootstrap check:embed-url-absolute check:frame-target check:language-tree-model check:map-menu-anchor check:selection-kinds check:tiered-points check:whiteboard-projection check:mercator-slice check:ring-vocabulary check:map-props-unit check:mobile-gating check:provide-shadowing check:legend-top-offset check:cdn-cache check:plural-forms check:select-zone-race check:script-registry check:map-control-overlap check:poster-attribution check:board-map-options check:gospel-whiteboard check:packet-map-missing-loud check:poster-layout-optin check:ported-globals-identical check:ring-bands check:packet-a1-structure check:india-states check:batch-selection-export check:zone-title-tier-a check:evangelical-share check:map-labels check:packet-offline check:help-reachable check:gated-not-in-tree check:window-globals-released check:legend-data-contract check:no-new-driver-references check:poster-fetch-guard check:people-group-records check:sentence-slots check:popup-href-escaped check:popup-pan-controls check:country-map-refetch check:pane-config-reforward check:viewport-meta check:viewport-meta:self-test check:label-key-coverage check:poster-browser-equiv check:poster-render-pinned check:posterverse-shelf check:host-locale-fetch check:print-frame-reclaim check:click-sheet check:coverage-consistent:chained check:coverage-consistent:poison check:dashboard-filter-a11y check:filter-multivalue check:hover-channel check:kit-options-reachable check:layout-key-namespaced check:legend-mirrors check:map-unmount-race check:no-conflict-markers check:series-isolation check:snapshot-guard check:stale-sweep-claim check:surfaces-read-the-tier check:translator-contacts check:dxlife check:wall-wysiwyg check:wall-print-watch check:wall-no-bg-photos check:template-i18n check:list-pattern-doc check:shadow-style-labels-unique check:grid-image-loading check:retry-fetch",
|
||||
"gates:pre": "node internal/run-parallel.mjs --label=pre -- check:template-literal check:mjs-parse check:sfc-parse check:tab-radius check:synced-css check:doc-scripts check:setup-order check:package-json-unique-keys check:no-repo-pb-hooks check:no-credentials-omit check:no-credentials-omit:self-test check:shadow-reduced-motion check:poster-action-print check:targets check:targets:self-test check:browser-gates-guarded check:pin-selection check:facet-shape check:hardcoded-english:self-test check:list-selection check:selector-fields check:upg-zone-joins check:gospel-set-charts check:gospel-set-fit check:describe-group check:one-scroll-container check:packet-charts check:composite-token-url check:language-tree-layout check:i18n-keys-exist check:i18n-never-translated check:packet-variants check:profile-table check:element-bootstrap check:embed-url-absolute check:frame-target check:language-tree-model check:map-menu-anchor check:selection-kinds check:tiered-points check:whiteboard-projection check:mercator-slice check:ring-vocabulary check:map-props-unit check:mobile-gating check:provide-shadowing check:legend-top-offset check:cdn-cache check:plural-forms check:select-zone-race check:script-registry check:map-control-overlap check:poster-attribution check:board-map-options check:gospel-whiteboard check:packet-map-missing-loud check:poster-layout-optin check:ported-globals-identical check:ring-bands check:packet-a1-structure check:india-states check:batch-selection-export check:zone-title-tier-a check:evangelical-share check:map-labels check:packet-offline check:help-reachable check:gated-not-in-tree check:window-globals-released check:legend-data-contract check:no-new-driver-references check:poster-fetch-guard check:people-group-records check:sentence-slots check:popup-href-escaped check:popup-pan-controls check:country-map-refetch check:pane-config-reforward check:viewport-meta check:viewport-meta:self-test check:label-key-coverage check:poster-browser-equiv check:poster-render-pinned check:posterverse-shelf check:host-locale-fetch check:print-frame-reclaim check:click-sheet check:coverage-consistent:chained check:coverage-consistent:poison check:dashboard-filter-a11y check:filter-multivalue check:hover-channel check:kit-options-reachable check:layout-key-namespaced check:legend-mirrors check:map-unmount-race check:no-conflict-markers check:series-isolation check:snapshot-guard check:stale-sweep-claim check:surfaces-read-the-tier check:translator-contacts check:dxlife check:wall-wysiwyg check:wall-print-watch check:wall-no-bg-photos check:wall-pan check:template-i18n check:list-pattern-doc check:shadow-style-labels-unique check:grid-image-loading check:retry-fetch",
|
||||
"gen:iso3-to-alpha2": "node library/scripts/generate-iso3-to-alpha2.mjs",
|
||||
"internet:adm1": "node plugin-designs/cities-internet/scripts/build-adm1-internet.mjs",
|
||||
"library-index": "node internal/generate-library-index.mjs",
|
||||
|
|
@ -399,6 +399,7 @@
|
|||
"check:wall-wysiwyg": "node plugin-designs/wall-of-people-groups/scripts/check-wall-wysiwyg.mjs",
|
||||
"check:wall-print-watch": "node plugin-designs/wall-of-people-groups/scripts/check-wall-print-watch.mjs",
|
||||
"check:wall-no-bg-photos": "node plugin-designs/wall-of-people-groups/scripts/check-wall-no-bg-photos.mjs",
|
||||
"check:wall-pan": "node plugin-designs/wall-of-people-groups/scripts/check-wall-pan.mjs",
|
||||
"check:template-i18n": "node plugin-designs/template-bundle/scripts/check-template-i18n.mjs",
|
||||
"check:snippets-draw": "node internal/check-snippets-draw.mjs",
|
||||
"check:snippets-draw:mapbox": "node internal/check-snippets-draw.mjs --mapbox",
|
||||
|
|
@ -421,6 +422,7 @@
|
|||
"check:wall-wysiwyg": "the Wall's screen IS its poster: the Bless view's on-screen poster and its print come from one layout, so for every preset (3x4ft, 2x3ft, 5x8ft) the sheets, the 2,107 card rects, the card text, the verse reference and the chrome agree. Two-sided on planted layout defects. Headless.",
|
||||
"check:wall-print-watch": "the Wall's HD poster print never prints silently incomplete: with fake timers and a fake frame, the watch counts photos as they load, counts the ones that could not, and reports both. Two-sided on planted printWatch copies. Headless.",
|
||||
"check:wall-no-bg-photos": "the Wall's store downloads no photos on its own (it used to test all 932, 132 MB, on every visit): the REAL store runs through Vite against the committed fixtures/pray-list-sample.json with fetch stubbed and every Image request counted. Two-sided with the old background test planted. Headless, no network.",
|
||||
"check:wall-pan": "the Wall pans and zooms with the pointer 1:1: the REAL WallCanvas methods (through Vite) with d3-zoom's transform arithmetic, over 12 fits and zooms: a pan moves every card exactly as far as the pointer, a zoom keeps the point under the pointer, toWorld inverts toScreen, and a fling never loses the wall. Two-sided: the old transform-inside-the-fit formulas are planted and caught. Headless.",
|
||||
"check:template-i18n": "the starter template every new plugin copies renders its text from the catalogue: profile B, server-rendered with the REAL template.json in en, ar and zh, takes its heading, note and sentence from the page's language. Two-sided with the English catalogue served as Arabic. Headless (SSR).",
|
||||
"check:coverage-consistent:chained": "every clause of check:coverage-consistent EXCEPT the link-verification age (VERIFY_MAX_AGE_DAYS set out of reach): the chains run what depends on the code and data, and leave what depends on the calendar to the on-demand run, so the gates cannot turn red on a date with no change.",
|
||||
"check:viewport-meta": "every generated page declares <meta name=\"viewport\"> with width=device-width. Without it a browser lays the page out at the 980px desktop fallback even when the viewport is set to 390, so a mobile probe silently measures a viewport no phone has and still passes (measured: innerWidth 980 without the tag, 390 with it). width=device-width is required specifically, because a meta carrying only initial-scale still lays out at 980. Checked on the BUILT tree, not the generator template. Fixed-size print sheets are exempt by their stated shape (a .stage with a three-digit px width), and a page that must render at a fixed desktop width carries a viewport-meta-ok: reason. 8 self-tests. Source-only, headless.",
|
||||
|
|
|
|||
103
plugin-designs/wall-of-people-groups/scripts/check-wall-pan.mjs
Normal file
103
plugin-designs/wall-of-people-groups/scripts/check-wall-pan.mjs
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
#!/usr/bin/env node
|
||||
/**
|
||||
* check-wall-pan — the Wall pans and zooms with the pointer, 1 : 1. Headless.
|
||||
*
|
||||
* d3-zoom on a <canvas> reports its transform in the canvas's own CSS px, and wallCanvas.js applies it AFTER
|
||||
* the "meet" fit of the world into the canvas. It used to apply it inside the fit, so every pan moved the wall
|
||||
* by only the fit scale k0 of the pointer (measured on development 6e1a33534: a 200 px mouse drag panned 34 px
|
||||
* at 1440; a 120 × 200 px finger drag 14 × 23 px on a phone) and a wheel zoom drifted off the pointer.
|
||||
* This runs the REAL WallCanvas methods (through Vite, so @map resolves) with d3's own transform arithmetic
|
||||
* and asserts, over several fits and zooms:
|
||||
* - a pan of d px in d3's space moves every card d px on screen;
|
||||
* - a zoom about a pointer keeps the world point under that pointer;
|
||||
* - toWorld inverts toScreen;
|
||||
* - constrain() keeps the wall over the centre of the view after a fling, and leaves a resting view alone.
|
||||
* Two-sided: the old formulas (transform inside the fit) are planted and must fail the pan and zoom arms.
|
||||
* EXIT 0 pass · 1 fail
|
||||
*/
|
||||
import { resolve, dirname, join } from 'node:path'
|
||||
import { fileURLToPath } from 'node:url'
|
||||
import { createServer } from 'vite'
|
||||
|
||||
const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '../../..')
|
||||
const server = await createServer({ root: ROOT, configFile: join(ROOT, 'vite.config.js'), server: { middlewareMode: true, hmr: false, ws: false }, appType: 'custom', logLevel: 'error', optimizeDeps: { noDiscovery: true, include: [] } })
|
||||
|
||||
// d3-zoom's ZoomTransform arithmetic (d3-zoom/src/transform.js): translate() works in pre-scale units.
|
||||
class T {
|
||||
constructor(k, x, y) { this.k = k; this.x = x; this.y = y }
|
||||
translate(x, y) { return new T(this.k, this.x + this.k * x, this.y + this.k * y) }
|
||||
invert(p) { return [(p[0] - this.x) / this.k, (p[1] - this.y) / this.k] }
|
||||
}
|
||||
// d3's zoom about a pointer p: the point under p (in d3's space) stays under p.
|
||||
const zoomAbout = (t, k, p) => { const q = t.invert(p); return new T(k, p[0] - q[0] * k, p[1] - q[1] * k) }
|
||||
|
||||
/** A WallCanvas with no DOM: the prototype's own methods, over a fitted world. */
|
||||
function wall(W, cssW, cssH, worldW, worldH) {
|
||||
const w = Object.create(W.prototype)
|
||||
w.mode = 'social'; w.sp = null; w.o = { worldW, worldH }; w.cssW = cssW; w.cssH = cssH
|
||||
w.k0 = Math.min(cssW / worldW, cssH / worldH); w.ox = (cssW - worldW * w.k0) / 2; w.oy = (cssH - worldH * w.k0) / 2
|
||||
w.t = new T(1, 0, 0)
|
||||
return w
|
||||
}
|
||||
|
||||
function run(W, plant = false) {
|
||||
const errs = []
|
||||
if (plant) { // the formulas before the fix: d3's transform applied inside the fit
|
||||
Object.defineProperty(W.prototype, 'tx', { configurable: true, get() { return this.ox + this.t.x * this.k0 } })
|
||||
Object.defineProperty(W.prototype, 'ty', { configurable: true, get() { return this.oy + this.t.y * this.k0 } })
|
||||
}
|
||||
const cases = [[1440, 793, 3456, 4608], [390, 696, 5760, 9216], [1184, 791, 4000, 3000], [390, 696, 3000, 4000]]
|
||||
let checked = 0
|
||||
for (const [cssW, cssH, worldW, worldH] of cases) {
|
||||
for (const k of [1, 2.5, 9]) {
|
||||
const w = wall(W, cssW, cssH, worldW, worldH)
|
||||
w.t = zoomAbout(w.t, k, [cssW * 0.3, cssH * 0.6])
|
||||
const pt = [worldW * 0.37, worldH * 0.61], s0 = w.toScreen(...pt)
|
||||
// pan: a drag of (120, -200) px is t.translate(120 / k, -200 / k) in d3
|
||||
w.t = w.t.translate(120 / k, -200 / k)
|
||||
const s1 = w.toScreen(...pt)
|
||||
const ratio = [(s1[0] - s0[0]) / 120, (s1[1] - s0[1]) / -200]
|
||||
if (Math.abs(ratio[0] - 1) > 1e-9 || Math.abs(ratio[1] - 1) > 1e-9) errs.push(`pan ${cssW}×${cssH} world ${worldW}×${worldH} zoom ${k}: the wall moved ${ratio.map((r) => r.toFixed(3)).join(' × ')} of the pointer, not 1`)
|
||||
// zoom about a pointer: the world point under it stays
|
||||
const p = [cssW * 0.71, cssH * 0.23], before = w.toWorld(...p)
|
||||
w.t = zoomAbout(w.t, k * 1.4, p)
|
||||
const after = w.toScreen(...before)
|
||||
if (Math.hypot(after[0] - p[0], after[1] - p[1]) > 1e-6) errs.push(`zoom ${cssW}×${cssH} zoom ${k}: the point under the pointer drifted ${Math.hypot(after[0] - p[0], after[1] - p[1]).toFixed(1)} px`)
|
||||
const back = w.toScreen(...w.toWorld(...p))
|
||||
if (Math.hypot(back[0] - p[0], back[1] - p[1]) > 1e-6) errs.push('toWorld does not invert toScreen')
|
||||
// constrain: a fling five views away still leaves the wall over the centre; a resting view is untouched
|
||||
const rest = w.t
|
||||
if (w.constrain(rest) !== rest) errs.push(`constrain moved a view that already covers the centre (${cssW}×${cssH}, zoom ${k})`)
|
||||
for (const [fx, fy] of [[5, 0], [-5, 0], [0, 5], [0, -5]]) {
|
||||
w.t = w.constrain(rest.translate(fx * cssW / rest.k, fy * cssH / rest.k))
|
||||
const [x0, y0] = w.toScreen(0, 0), [x1, y1] = w.toScreen(worldW, worldH)
|
||||
if (!(x0 <= cssW / 2 + 1e-6 && x1 >= cssW / 2 - 1e-6 && y0 <= cssH / 2 + 1e-6 && y1 >= cssH / 2 - 1e-6)) errs.push(`a fling (${fx}, ${fy}) views away lost the wall (${cssW}×${cssH}, zoom ${k})`)
|
||||
}
|
||||
checked++
|
||||
}
|
||||
}
|
||||
if (plant) { delete W.prototype.tx; delete W.prototype.ty }
|
||||
return { errs, checked }
|
||||
}
|
||||
|
||||
const fails = []
|
||||
let real = null
|
||||
try {
|
||||
const { WallCanvas } = await server.ssrLoadModule('/plugin-designs/wall-of-people-groups/src/wallCanvas.js')
|
||||
const own = { tx: Object.getOwnPropertyDescriptor(WallCanvas.prototype, 'tx'), ty: Object.getOwnPropertyDescriptor(WallCanvas.prototype, 'ty') }
|
||||
if (!own.tx || !own.ty) fails.push('WallCanvas has no tx/ty getters: this check reads the wrong file or the renderer changed shape')
|
||||
else {
|
||||
real = run(WallCanvas)
|
||||
fails.push(...real.errs)
|
||||
if (real.checked < 12) fails.push(`only ${real.checked} of 12 cases ran`)
|
||||
const planted = run(WallCanvas, true)
|
||||
Object.defineProperty(WallCanvas.prototype, 'tx', own.tx); Object.defineProperty(WallCanvas.prototype, 'ty', own.ty)
|
||||
if (!planted.errs.some((e) => /^pan /.test(e))) fails.push('SELF-TEST: the old in-fit transform was not caught by the pan arm')
|
||||
if (!planted.errs.some((e) => /^zoom /.test(e))) fails.push('SELF-TEST: the old in-fit transform was not caught by the zoom arm')
|
||||
}
|
||||
} catch (e) { fails.push('could not run WallCanvas: ' + e.message) }
|
||||
await server.close()
|
||||
|
||||
if (fails.length) { console.log('WALL-PAN: FAIL'); for (const f of fails) console.log(' - ' + f); process.exit(1) }
|
||||
console.log(`WALL-PAN: PASS — ${real.checked} fits × zooms: a pan moves the wall 1:1 with the pointer, a zoom keeps the point under the pointer, toWorld inverts toScreen, and a fling never loses the wall; the old in-fit transform is caught.`)
|
||||
process.exit(0)
|
||||
|
|
@ -75,7 +75,20 @@ export class WallCanvas {
|
|||
this.ctx = this.canvas.getContext('2d')
|
||||
this.icons = Object.fromEntries(Object.entries(ICON).map(([k, d]) => [k, new Path2D(d)]))
|
||||
const d3 = wallD3()
|
||||
this.zoom = d3.zoom().scaleExtent([0.1, 20]).filter((e) => !e.ctrlKey && !e.button)
|
||||
// d3's transform lives in the canvas's own CSS px (d3.pointer on a <canvas> is element px, unlike the old
|
||||
// SVG, whose viewBox made it world units), so it is applied AFTER the "meet" fit: screen = t(fit(world)).
|
||||
// Multiplying it by the fit scale instead moved the wall by only k0 of the pointer (measured on
|
||||
// development 6e1a33534: a 200 px drag panned 34 px at 1440, a 120 × 200 px finger drag 14 × 23 px on a
|
||||
// phone), so the wall could barely be panned.
|
||||
// A ctrl-wheel is a trackpad pinch (or ctrl + mouse wheel): it zooms the wall. Filtering it out let the
|
||||
// browser zoom the whole page instead. Its step is capped, so one mouse notch is at most ~1.4×.
|
||||
this.zoom = d3.zoom().scaleExtent([0.1, 20])
|
||||
.filter((e) => (!e.ctrlKey || e.type === 'wheel') && !e.button)
|
||||
.wheelDelta((e) => {
|
||||
const d = -e.deltaY * (e.deltaMode === 1 ? 0.05 : e.deltaMode ? 1 : 0.002)
|
||||
return e.ctrlKey ? Math.max(-0.5, Math.min(0.5, d * 5)) : d
|
||||
})
|
||||
.constrain((t) => this.constrain(t))
|
||||
.on('zoom', (e) => { this.t = e.transform; this.request() })
|
||||
this.sel = d3.select(this.canvas).call(this.zoom).on('dblclick.zoom', null)
|
||||
this._click = (e) => this.onClick(e)
|
||||
|
|
@ -140,17 +153,31 @@ export class WallCanvas {
|
|||
this.request()
|
||||
}
|
||||
|
||||
/** Screen px of one world unit, and world → screen. */
|
||||
/** Screen px of one world unit, and world → screen: the "meet" fit first, then d3's transform (CSS px). */
|
||||
get scale() { return this.k0 * this.t.k }
|
||||
toScreen(x, y) { return [this.ox + (x * this.t.k + this.t.x) * this.k0, this.oy + (y * this.t.k + this.t.y) * this.k0] }
|
||||
toWorld(px, py) { return [((px - this.ox) / this.k0 - this.t.x) / this.t.k, ((py - this.oy) / this.k0 - this.t.y) / this.t.k] }
|
||||
get tx() { return this.t.x + this.t.k * this.ox }
|
||||
get ty() { return this.t.y + this.t.k * this.oy }
|
||||
toScreen(x, y) { return [this.tx + x * this.scale, this.ty + y * this.scale] }
|
||||
toWorld(px, py) { return [(px - this.tx) / this.scale, (py - this.ty) / this.scale] }
|
||||
|
||||
/** Open at a zoom where one card is `cardPx` wide (the old wall opened at ~96 px). */
|
||||
/**
|
||||
* Keep the wall findable: however far it is panned, it still covers the middle of the view (a zoomed-out
|
||||
* wall smaller than the view may move, but never off it). Without this a fast fling left an empty grey table.
|
||||
*/
|
||||
constrain(t) {
|
||||
const W = this.worldW * this.k0, H = this.worldH * this.k0, cx = this.cssW / 2, cy = this.cssH / 2
|
||||
const x0 = t.x + t.k * this.ox, y0 = t.y + t.k * this.oy
|
||||
const dx = x0 > cx ? cx - x0 : x0 + t.k * W < cx ? cx - x0 - t.k * W : 0
|
||||
const dy = y0 > cy ? cy - y0 : y0 + t.k * H < cy ? cy - y0 - t.k * H : 0
|
||||
return dx || dy ? t.translate(dx / t.k, dy / t.k) : t // d3's translate() is in pre-scale units
|
||||
}
|
||||
|
||||
/** Open at a zoom where one card is `cardPx` wide (the old wall opened at ~96 px), world top-left in place. */
|
||||
startView(cardPx = 96) {
|
||||
if (this.posterOn) return this.fitAll() // the poster opens whole: what you see is what prints
|
||||
if (!this.grid) return
|
||||
const k = Math.max(1, Math.min(20, cardPx / (this.grid.cw * this.k0)))
|
||||
this.sel.call(this.zoom.transform, wallD3().zoomIdentity.scale(k))
|
||||
this.sel.call(this.zoom.transform, wallD3().zoomIdentity.translate(this.ox * (1 - k), this.oy * (1 - k)).scale(k))
|
||||
}
|
||||
resetZoom() { this.sel.transition().duration(750).call(this.zoom.transform, wallD3().zoomIdentity) }
|
||||
|
||||
|
|
@ -177,7 +204,7 @@ export class WallCanvas {
|
|||
ctx.setTransform(1, 0, 0, 1, 0, 0)
|
||||
ctx.clearRect(0, 0, this.canvas.width, this.canvas.height)
|
||||
if (!this.grid) return
|
||||
const s = this.scale, tx = this.ox + this.t.x * this.k0, ty = this.oy + this.t.y * this.k0
|
||||
const s = this.scale, tx = this.tx, ty = this.ty
|
||||
ctx.setTransform(this.dpr * s, 0, 0, this.dpr * s, this.dpr * tx, this.dpr * ty)
|
||||
if (this.posterOn) return this.drawPoster(ctx, s, tx, ty)
|
||||
const cardPx = this.grid.cw * s
|
||||
|
|
|
|||
|
|
@ -1473,7 +1473,7 @@
|
|||
"bundle": "wall-of-people-groups",
|
||||
"scriptUrl": "./wall-of-people-groups/wall-of-people-groups.js",
|
||||
"output": "dx-maps/wall-of-people-groups/wall-of-people-groups.js",
|
||||
"integrity": "sha384-jXcu2Fpvms5zKTuyxRQ1oZG7jciYNwC1+KOpUYXMlm5u59l3SGJOLxN3vbXvt5c1",
|
||||
"integrity": "sha384-S2g83dVn7Vb2ynBlin0ySD8rO/cFEdA60yPYJ+04ObqzXmiojWOZ5ufGPj4URG9t",
|
||||
"elements": [
|
||||
"wall-of-people-groups"
|
||||
],
|
||||
|
|
@ -1492,7 +1492,7 @@
|
|||
"scriptUrl": "./wall-of-people-groups/wall-of-people-groups.js",
|
||||
"embed": {
|
||||
"iframe": "<iframe src=\"./wall-of-people-groups/wall-of-people-groups/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
|
||||
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./wall-of-people-groups/wall-of-people-groups.js\" integrity=\"sha384-jXcu2Fpvms5zKTuyxRQ1oZG7jciYNwC1+KOpUYXMlm5u59l3SGJOLxN3vbXvt5c1\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<wall-of-people-groups profile-config='{\"profile\":\"wall-of-people-groups\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></wall-of-people-groups>"
|
||||
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./wall-of-people-groups/wall-of-people-groups.js\" integrity=\"sha384-S2g83dVn7Vb2ynBlin0ySD8rO/cFEdA60yPYJ+04ObqzXmiojWOZ5ufGPj4URG9t\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<wall-of-people-groups profile-config='{\"profile\":\"wall-of-people-groups\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></wall-of-people-groups>"
|
||||
},
|
||||
"bundle": "wall-of-people-groups"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1473,7 +1473,7 @@
|
|||
"bundle": "wall-of-people-groups",
|
||||
"scriptUrl": "./wall-of-people-groups/wall-of-people-groups.js",
|
||||
"output": "dx-maps/wall-of-people-groups/wall-of-people-groups.js",
|
||||
"integrity": "sha384-jXcu2Fpvms5zKTuyxRQ1oZG7jciYNwC1+KOpUYXMlm5u59l3SGJOLxN3vbXvt5c1",
|
||||
"integrity": "sha384-S2g83dVn7Vb2ynBlin0ySD8rO/cFEdA60yPYJ+04ObqzXmiojWOZ5ufGPj4URG9t",
|
||||
"elements": [
|
||||
"wall-of-people-groups"
|
||||
],
|
||||
|
|
@ -1492,7 +1492,7 @@
|
|||
"scriptUrl": "./wall-of-people-groups/wall-of-people-groups.js",
|
||||
"embed": {
|
||||
"iframe": "<iframe src=\"./wall-of-people-groups/wall-of-people-groups/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
|
||||
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./wall-of-people-groups/wall-of-people-groups.js\" integrity=\"sha384-jXcu2Fpvms5zKTuyxRQ1oZG7jciYNwC1+KOpUYXMlm5u59l3SGJOLxN3vbXvt5c1\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<wall-of-people-groups profile-config='{\"profile\":\"wall-of-people-groups\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></wall-of-people-groups>"
|
||||
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./wall-of-people-groups/wall-of-people-groups.js\" integrity=\"sha384-S2g83dVn7Vb2ynBlin0ySD8rO/cFEdA60yPYJ+04ObqzXmiojWOZ5ufGPj4URG9t\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<wall-of-people-groups profile-config='{\"profile\":\"wall-of-people-groups\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></wall-of-people-groups>"
|
||||
},
|
||||
"bundle": "wall-of-people-groups"
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -67,7 +67,7 @@
|
|||
|
||||
<script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
|
||||
<!-- Bundle IIFE — registers the <wall-of-people-groups> custom element. -->
|
||||
<script src="../wall-of-people-groups.js" integrity="sha384-jXcu2Fpvms5zKTuyxRQ1oZG7jciYNwC1+KOpUYXMlm5u59l3SGJOLxN3vbXvt5c1" crossorigin="anonymous"></script>
|
||||
<script src="../wall-of-people-groups.js" integrity="sha384-S2g83dVn7Vb2ynBlin0ySD8rO/cFEdA60yPYJ+04ObqzXmiojWOZ5ufGPj4URG9t" crossorigin="anonymous"></script>
|
||||
|
||||
<script>
|
||||
// Mapbox token resolution — the A3 ladder, in precedence order:
|
||||
|
|
|
|||
Loading…
Reference in a new issue