Skip to content

fix(hierarchy_fix): deduplicate hierarchies, misc sanity checks #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
missinglink merged 1 commit into from
Jul 9, 2020
Merged

fix(hierarchy_fix): deduplicate hierarchies, misc sanity checks #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 41 additions & 3 deletions sqlite/fix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,19 @@ function findSuperseded (db) {

const superseded = new Map()
for (const row of stmt.iterate()) {
// ensure the ID is a number greater than 1
const id = parseInt(row.id, 10)
if (_.isNaN(id) || id <= 1) { continue }

// parse supersedes array
const supersedes = JSON.parse(row.supersedes)
if (!_.isArray(supersedes) || _.isEmpty(supersedes)) { continue }
const identity = { id: row.id, placetype: row.placetype }
supersedes.forEach(id => superseded.set(id, identity))

// populate map
const identity = { id: id, placetype: row.placetype }
supersedes.map(id => parseInt(id, 10))
.filter(id => !_.isNaN(id) && id > 1)
.forEach(id => superseded.set(id, identity))
}

return superseded
Expand Down Expand Up @@ -66,7 +75,12 @@ function findIdsToFix (db, superseded) {
// create a Set containing the IDs of all records which need to be fixed
const idsToFix = new Set()
for (const row of stmt.iterate()) {
idsToFix.add(row.id)
// ensure the ID is a number greater than 1
const id = parseInt(row.id, 10)
if (_.isNaN(id) || id <= 1) { return }

// populate set
idsToFix.add(id)
}

// clean up temp table
Expand Down Expand Up @@ -96,6 +110,9 @@ module.exports.hierarchies = (db, options) => {
// skip non-current records
if (!feature.isCurrent(feat)) { return }

// skip alt geometries
if (feature.isAltGeometry(feat)) { return }

// fix parent id
const parentID = feature.getParentId(feat)
if (superseded.has(parentID)) {
Expand All @@ -111,6 +128,7 @@ module.exports.hierarchies = (db, options) => {
_.forEach(hierarchies, (hierarchy, branch) => {
_.forEach(hierarchy, (hierarchyId, key) => {
if (hierarchyId === id) { return } // do not update self-references
if (key === `${placetype}_id`) { return } // do not update references to same placetype
if (superseded.has(hierarchyId)) {
const replacement = superseded.get(hierarchyId)
const replacementKey = `${replacement.placetype}_id`
Expand All @@ -132,6 +150,26 @@ module.exports.hierarchies = (db, options) => {
})
})

// ensure that self-references are correctly set in all hierarchies
_.forEach(hierarchies, (hierarchy, branch) => {
if (_.get(hierarchy, `${placetype}_id`) !== id) {
console.error(`${id} missing self-reference for ${placetype}_id on branch ${branch}`)
_.set(feat, `properties.wof:hierarchy[${branch}][${placetype}_id]`, id)
reindex = true
}
})

// deduplicate hierarchies
// remove any hierarchies which are duplicates of, or a subset of another hierarchy
const deduplicatedHierarchies = hierarchies.filter((h1, b1) => {
return !hierarchies.some((h2, b2) => (b1 !== b2) && _.isMatch(h2, h1))
})
if (deduplicatedHierarchies.length < hierarchies.length) {
console.error(`${id} contains duplicate hierarchies, removing ${hierarchies.length - deduplicatedHierarchies.length} branch(es)`)
_.set(feat, 'properties.wof:hierarchy', deduplicatedHierarchies)
reindex = true
}

// delete record and reimport it
if (reindex) {
// honour the 'dryrun' flag (disables saving to the db)
Expand Down