Fix European trip return heuristic for weekend location tracking

Adjust European short trip heuristic from >3 days to >1 day to correctly
detect when user has returned home from European trips. This fixes the
April 29-30, 2023 case where the location incorrectly showed "Sankt Georg, Hamburg"
instead of "Bristol" when the user was free (no events scheduled) after
the foss-north trip ended on April 27.

The previous logic required more than 3 days to pass before assuming
return home from European countries, but for short European trips by
rail/ferry, users typically return within 1-2 days.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Edward Betts 2025-07-16 06:38:37 +02:00
parent 663dc479c2
commit ea4980a5d7
6407 changed files with 1072847 additions and 18 deletions

View file

@ -0,0 +1,31 @@
import type {CodeKeywordDefinition} from "../../types"
import type {KeywordCxt} from "../../compile/validate"
import {_, getProperty, Code} from "../../compile/codegen"
import N from "../../compile/names"
import {SchemaEnv, compileSchema} from "../../compile"
import {getValidate} from "../core/ref"
const def: CodeKeywordDefinition = {
keyword: "$dynamicAnchor",
schemaType: "string",
code: (cxt) => dynamicAnchor(cxt, cxt.schema),
}
export function dynamicAnchor(cxt: KeywordCxt, anchor: string): void {
const {gen, it} = cxt
it.schemaEnv.root.dynamicAnchors[anchor] = true
const v = _`${N.dynamicAnchors}${getProperty(anchor)}`
const validate = it.errSchemaPath === "#" ? it.validateName : _getValidate(cxt)
gen.if(_`!${v}`, () => gen.assign(v, validate))
}
function _getValidate(cxt: KeywordCxt): Code {
const {schemaEnv, schema, self} = cxt.it
const {root, baseId, localRefs, meta} = schemaEnv.root
const {schemaId} = self.opts
const sch = new SchemaEnv({schema, schemaId, root, baseId, localRefs, meta})
compileSchema.call(self, sch)
return getValidate(cxt, sch)
}
export default def

View file

@ -0,0 +1,51 @@
import type {CodeKeywordDefinition} from "../../types"
import type {KeywordCxt} from "../../compile/validate"
import {_, getProperty, Code, Name} from "../../compile/codegen"
import N from "../../compile/names"
import {callRef} from "../core/ref"
const def: CodeKeywordDefinition = {
keyword: "$dynamicRef",
schemaType: "string",
code: (cxt) => dynamicRef(cxt, cxt.schema),
}
export function dynamicRef(cxt: KeywordCxt, ref: string): void {
const {gen, keyword, it} = cxt
if (ref[0] !== "#") throw new Error(`"${keyword}" only supports hash fragment reference`)
const anchor = ref.slice(1)
if (it.allErrors) {
_dynamicRef()
} else {
const valid = gen.let("valid", false)
_dynamicRef(valid)
cxt.ok(valid)
}
function _dynamicRef(valid?: Name): void {
// TODO the assumption here is that `recursiveRef: #` always points to the root
// of the schema object, which is not correct, because there may be $id that
// makes # point to it, and the target schema may not contain dynamic/recursiveAnchor.
// Because of that 2 tests in recursiveRef.json fail.
// This is a similar problem to #815 (`$id` doesn't alter resolution scope for `{ "$ref": "#" }`).
// (This problem is not tested in JSON-Schema-Test-Suite)
if (it.schemaEnv.root.dynamicAnchors[anchor]) {
const v = gen.let("_v", _`${N.dynamicAnchors}${getProperty(anchor)}`)
gen.if(v, _callRef(v, valid), _callRef(it.validateName, valid))
} else {
_callRef(it.validateName, valid)()
}
}
function _callRef(validate: Code, valid?: Name): () => void {
return valid
? () =>
gen.block(() => {
callRef(cxt, validate)
gen.let(valid, true)
})
: () => callRef(cxt, validate)
}
}
export default def

9
node_modules/ajv/lib/vocabularies/dynamic/index.ts generated vendored Normal file
View file

@ -0,0 +1,9 @@
import type {Vocabulary} from "../../types"
import dynamicAnchor from "./dynamicAnchor"
import dynamicRef from "./dynamicRef"
import recursiveAnchor from "./recursiveAnchor"
import recursiveRef from "./recursiveRef"
const dynamic: Vocabulary = [dynamicAnchor, dynamicRef, recursiveAnchor, recursiveRef]
export default dynamic

View file

@ -0,0 +1,14 @@
import type {CodeKeywordDefinition} from "../../types"
import {dynamicAnchor} from "./dynamicAnchor"
import {checkStrictMode} from "../../compile/util"
const def: CodeKeywordDefinition = {
keyword: "$recursiveAnchor",
schemaType: "boolean",
code(cxt) {
if (cxt.schema) dynamicAnchor(cxt, "")
else checkStrictMode(cxt.it, "$recursiveAnchor: false is ignored")
},
}
export default def

View file

@ -0,0 +1,10 @@
import type {CodeKeywordDefinition} from "../../types"
import {dynamicRef} from "./dynamicRef"
const def: CodeKeywordDefinition = {
keyword: "$recursiveRef",
schemaType: "string",
code: (cxt) => dynamicRef(cxt, cxt.schema),
}
export default def