diff --git a/meta/folder.groovy b/meta/folder.groovy index 712795b..0b6128b 100644 --- a/meta/folder.groovy +++ b/meta/folder.groovy @@ -600,32 +600,26 @@ class MetaInfo extends GISJsonSerialised { abstract class RelatedMetaInfo extends GISJsonSerialised implements IRelatedMetaInfo { private String format - String offsetpath RelatedMetaInfo(script, format, offsetpath) { super(script) this.format = format this.offsetpath = offsetpath } - - abstract void deserialiseJson(rawmeta) - abstract LinkedHashMap serialisationdata() String format() { return format } - String getoffsetpath() { - return offsetpath - } - - void setoffsetoffsetpath(String offsetpath) { - this.offsetpath = offsetpath - } + abstract void deserialiseJson(rawmeta) + abstract LinkedHashMap serialisationdata() + abstract String getoffsetpath() + abstract void setoffsetpath(String offsetpath) } class RelatedMetaInfo_v0_1 extends RelatedMetaInfo { private MetaInfo meta + private String offsetpath RelatedMetaInfo_v0_1(script, offsetpath = "", MetaInfo meta = null) { super(script, '0.1', offsetpath) @@ -633,7 +627,7 @@ class MetaInfo extends GISJsonSerialised { } void deserialiseJson(rawmeta) { - setoffsetoffsetpath(rawmeta['offsetpath']) + setoffsetpath(rawmeta['offsetpath']) meta = new MetaInfo(script) meta.deserialiseJson(rawmeta['meta']) } @@ -647,11 +641,18 @@ class MetaInfo extends GISJsonSerialised { return data } - String get + String getoffsetpath() { + return offsetpath + } + + void setoffsetpath(String offsetpath) { + this.offsetpath = offsetpath + } } class RelatedMetaInfo_v0_2 extends RelatedMetaInfo { private String importpath + private String offsetpath RelatedMetaInfo_v0_2(script, importpath = "", offsetpath = "") { super(script, '0.2', offsetpath) @@ -660,7 +661,7 @@ class MetaInfo extends GISJsonSerialised { void deserialiseJson(rawmeta) { //format = rawmeta['format'] - setoffsetoffsetpath(rawmeta['offsetpath']) + setoffsetpath(rawmeta['offsetpath']) } LinkedHashMap serialisationdata() { @@ -670,6 +671,14 @@ class MetaInfo extends GISJsonSerialised { ] return data } + + String getoffsetpath() { + return offsetpath + } + + void setoffsetpath(String offsetpath) { + this.offsetpath = offsetpath + } } private ProductInfo productinfo