diff --git a/data-discovery/src/main/java/vlkb/common/Coord.java b/data-discovery/src/main/java/vlkb/common/Coord.java index 50618eb836dff7ccdaaff16b65d9490ba0057c8f..1dc0cafc08bf8d7b7943552227b5d9292ed6c727 100644 --- a/data-discovery/src/main/java/vlkb/common/Coord.java +++ b/data-discovery/src/main/java/vlkb/common/Coord.java @@ -202,6 +202,8 @@ class Coord sb.append("&specsystem=" + vel_type ); } + sb.append("&pubdid="); // FIXME id-value will be added in FormatResponseFilter + return sb.toString(); } @@ -243,6 +245,8 @@ class Coord sb.append("&specsystem=" + vel_type ); } + sb.append("&ID="); // FIXME id-value will be added in FormatResponseFilter + return sb.toString(); } diff --git a/data-discovery/src/main/java/vlkb/output/Dataset.java b/data-discovery/src/main/java/vlkb/output/Dataset.java index 033e1c3fd1eab15127e8e03e78d13da4f50018b2..f94ec448a429cf4da220eb5ff3aa8f250bfb88c2 100644 --- a/data-discovery/src/main/java/vlkb/output/Dataset.java +++ b/data-discovery/src/main/java/vlkb/output/Dataset.java @@ -69,7 +69,7 @@ class Dataset this.access = new Access(); this.access.accessFileUrl = null; this.access.accessCutoutUrl = null; - this.access.accessMosaicUrl = mergeUrlRoot + "?pubdid=" + publisherDid + "&" + mergeQueryString; + this.access.accessMosaicUrl = mergeUrlRoot + "?" + mergeQueryString + publisherDid; //this.vertices_deg = mergeVertices(datasetList, /*inputs.*/coord); } diff --git a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java index 1cbdf4f01486aa32df099193751419ce19aafb35..5b4f385acf0be1c343773799d49f37a7e1880b01 100644 --- a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java +++ b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java @@ -245,7 +245,7 @@ public class FormatResponseFilter implements Filter dataset.publisherDid = obsCore.obs_publisher_did; dataset.access.accessFileUrl = obsCore.access_url; - dataset.access.accessCutoutUrl = cutoutUrlRoot + "?ID=" + dataset.publisherDid + "&" + cutoutQueryString; + dataset.access.accessCutoutUrl = cutoutUrlRoot + "?" + cutoutQueryString + dataset.publisherDid; dataset.access.accessMosaicUrl = null; dataset.vertices_deg = convertToVertices(obsCore.vertices_str);