Optimise reading in of meta from files
This commit is contained in:
parent
cfa543970d
commit
d7965ea280
1 changed files with 5 additions and 5 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue