From c76a1d68e51ad427a8f55871f93d50a2f299656e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 18 Dec 2021 18:51:19 +0000 Subject: [PATCH] Handle v0.1 imported associated meta --- meta/folder.groovy | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/meta/folder.groovy b/meta/folder.groovy index 7016b0b..1919d1b 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -620,7 +620,7 @@ class MetaInfo extends GISJsonSerialised { } void deserialiseJson(rawmeta) { - setoffsetpath(rawmeta['offsetpath']) + offsetpath = rawmeta['offsetpath'] meta = new MetaInfo(script) meta.deserialiseJson(rawmeta['meta']) } @@ -628,19 +628,11 @@ class MetaInfo extends GISJsonSerialised { LinkedHashMap serialisationdata() { def data = [ 'format' : format, - 'offsetpath' : getoffsetpath(), + 'offsetpath' : offsetpath, 'meta' : meta.serialisationdata(), ] return data } - - String getoffsetpath() { - return offsetpath - } - - void setoffsetpath(String offsetpath) { - this.offsetpath = offsetpath - } } class RelatedMetaInfo_v0_2 extends RelatedMetaInfo { @@ -655,24 +647,16 @@ class MetaInfo extends GISJsonSerialised { void deserialiseJson(rawmeta) { //format = rawmeta['format'] - setoffsetpath(rawmeta['offsetpath']) + offsetpath = rawmeta['offsetpath'] } LinkedHashMap serialisationdata() { def data = [ 'format' : format, - 'offsetpath' : getoffsetpath(), + 'offsetpath' : offsetpath, ] return data } - - String getoffsetpath() { - return offsetpath - } - - void setoffsetpath(String offsetpath) { - this.offsetpath = offsetpath - } } private ProductInfo productinfo