From d7965ea280c368a8cdb4de816f97ce2cb03c84d0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 21 Dec 2021 18:39:13 +0000 Subject: [PATCH] Optimise reading in of meta from files --- meta/folder.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 1816835..e28d28c 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -607,7 +607,7 @@ class MetaInfo extends GISJsonSerialised { abstract void deserialiseJson(rawmeta) abstract LinkedHashMap serialisationdata() - abstract String getuniqueid() + abstract String getrelatedid() } class RelatedMetaInfo_v0_1 extends RelatedMetaInfo { @@ -639,7 +639,7 @@ class MetaInfo extends GISJsonSerialised { return data } - String getuniqueid() { + String getrelatedid() { return uniqueid } } @@ -671,7 +671,7 @@ class MetaInfo extends GISJsonSerialised { return data } - String getuniqueid() { + String getrelatedid() { return uniqueid } } @@ -983,8 +983,8 @@ class MetaInfo extends GISJsonSerialised { def importedmetafile = "${nextgatheredmetapath}/${METAFILENAME}" def boolean imported // If this has already been read in from a file - if (relatedmetainfo.uniqueid() in ii.metamap) { - mi = metamap[relatedmetainfo.uniqueid()].metainfo + if (relatedmetainfo.getrelatedid() in ii.metamap) { + mi = metamap[relatedmetainfo.getrelatedid()].metainfo imported = true } else if (script.fileExists(importedmetafile)) { mi.deserialiseJson(importedmetafile)