removing unused import and method

GIScience · Sep 17, 2020 · 03a1755 · 03a1755
1 parent 1ad4075
commit 03a1755
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/src/main/java/org/heigit/ohsome/ohsomeapi/executor/DataRequestExecutor.java b/src/main/java/org/heigit/ohsome/ohsomeapi/executor/DataRequestExecutor.java
@@ -92,7 +92,6 @@ public static void extract(RequestResource requestResource, ElementsGeometry ele
         keysInt[i] = tt.getOSHDBTagKeyOf(keys[i]).toInt();
       }
     }
-    MapReducer<Feature> contributionPreResult = null;
     ExecutionUtils exeUtils = new ExecutionUtils(processingData);
     inputProcessor.processPropertiesParam();
     inputProcessor.processIsUnclippedParam();
@@ -116,7 +115,7 @@ public static void extract(RequestResource requestResource, ElementsGeometry ele
     String endTimestamp = ISODateTimeParser.parseISODateTime(requestParameters.getTime()[1])
         .format(DateTimeFormatter.ISO_DATE_TIME);
     MapReducer<List<OSMContribution>> mapRedContributions = mapRedContribution.groupByEntity();
-    contributionPreResult = mapRedContributions.flatMap(contributions -> {
+    MapReducer<Feature> contributionPreResult = mapRedContributions.flatMap(contributions -> {
       List<Feature> output = new LinkedList<>();
       Map<String, Object> properties;
       Geometry currentGeom = null;
@@ -185,8 +184,6 @@ public static void extract(RequestResource requestResource, ElementsGeometry ele
           validTo = TimestampFormatter.getInstance().isoDateTime(contribution.getTimestamp());
           if (!skipNext) {
             properties = new TreeMap<>();
-            // deactivating the adding of the contrib type as it could deliver false results
-            // properties = exeUtils.addContribType(contribution, properties, includeOSMMetadata);
             if (!isContributionsEndpoint) {
               properties.put("@validFrom", validFrom);
               properties.put("@validTo", validTo);

diff --git a/src/main/java/org/heigit/ohsome/ohsomeapi/executor/ExecutionUtils.java b/src/main/java/org/heigit/ohsome/ohsomeapi/executor/ExecutionUtils.java
@@ -707,15 +707,6 @@ public Response createRatioGroupByBoundaryResponse(Object[] boundaryIds, String[
         groupByResultSet);
   }
 
-  /** Adds the respective contribution type(s) to the properties if includeMetadata=true. */
-  public Map<String, Object> addContribType(OSMContribution contribution,
-      Map<String, Object> properties, boolean includeMetadata) {
-    if (includeMetadata) {
-      properties.put("@contributionTypes", contribution.getContributionTypes());
-    }
-    return properties;
-  }
-
   /**
    * Extracts and returns a geometry out of the given contribution. The boolean values specify if it
    * should be clipped/unclipped and if the geometry before/after a contribution should be taken.