Commit 4d64260c authored by Eirik Alvær's avatar Eirik Alvær

Refs #2052 - Use id instead of label in dimensionTypes

parent f9c9ef30
...@@ -25,7 +25,6 @@ public class ETagGenerator { ...@@ -25,7 +25,6 @@ public class ETagGenerator {
public String generateETagFromData() { public String generateETagFromData() {
String input = data.getString(); String input = data.getString();
String etag = generateChecksum(input); String etag = generateChecksum(input);
return etag; return etag;
} }
...@@ -49,4 +48,4 @@ public class ETagGenerator { ...@@ -49,4 +48,4 @@ public class ETagGenerator {
protected String bytesToString(byte[] bytes) { protected String bytesToString(byte[] bytes) {
return new BigInteger(1, bytes).toString(16); return new BigInteger(1, bytes).toString(16);
} }
} }
\ No newline at end of file
...@@ -70,11 +70,11 @@ public final class DimensionMaker { ...@@ -70,11 +70,11 @@ public final class DimensionMaker {
Set<String> plainset = new LinkedHashSet<String>(); Set<String> plainset = new LinkedHashSet<String>();
for (Dimension dimension : dimensions) { for (Dimension dimension : dimensions) {
if (dimension instanceof TemporalDimension) { if (dimension instanceof TemporalDimension) {
temporalset.add(dimension.getLabel()); temporalset.add(dimension.getId());
} else if (dimension instanceof SpatialDimension) { } else if (dimension instanceof SpatialDimension) {
spatialset.add(dimension.getLabel()); spatialset.add(dimension.getId());
} else { } else {
plainset.add(dimension.getLabel()); plainset.add(dimension.getId());
} }
} }
addObject(objectmap, DIMENSION_TYPE_SPATIAL, spatialset); addObject(objectmap, DIMENSION_TYPE_SPATIAL, spatialset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment