diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/GeotiffGridCoverageFactoryImpl.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/GeotiffGridCoverageFactoryImpl.java index 1155e9dbb66..5040fc2dff0 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/GeotiffGridCoverageFactoryImpl.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/GeotiffGridCoverageFactoryImpl.java @@ -2,7 +2,7 @@ import java.io.File; import java.io.IOException; -import javax.media.jai.InterpolationBilinear; +import org.eclipse.imagen.Interpolation; import org.geotools.api.coverage.grid.GridCoverage; import org.geotools.coverage.grid.GridCoverage2D; import org.geotools.coverage.grid.Interpolator2D; @@ -44,7 +44,10 @@ public GeotiffGridCoverageFactoryImpl(File path) { @Override public GridCoverage getGridCoverage() { return NoDataGridCoverage.create( - Interpolator2D.create(getUninterpolatedGridCoverage(), new InterpolationBilinear()) + Interpolator2D.create( + getUninterpolatedGridCoverage(), + Interpolation.getInstance(Interpolation.INTERP_BILINEAR) + ) ); } diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/NoDataGridCoverage.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/NoDataGridCoverage.java index 9da8c45c348..d87823d05e3 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/NoDataGridCoverage.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/NoDataGridCoverage.java @@ -1,11 +1,11 @@ package org.opentripplanner.graph_builder.module.ned; -import it.geosolutions.jaiext.range.NoDataContainer; import java.awt.image.RenderedImage; import java.awt.image.renderable.RenderableImage; import java.util.Collection; import java.util.List; import java.util.Set; +import org.eclipse.imagen.media.range.NoDataContainer; import org.geotools.api.coverage.CannotEvaluateException; import org.geotools.api.coverage.PointOutsideCoverageException; import org.geotools.api.coverage.SampleDimension; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java index 943f1ff6031..79ea33be2e4 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/UnifiedGridCoverage.java @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import javax.media.jai.InterpolationBilinear; +import org.eclipse.imagen.Interpolation; import org.geotools.api.coverage.CannotEvaluateException; import org.geotools.api.coverage.Coverage; import org.geotools.api.coverage.PointOutsideCoverageException; @@ -53,7 +53,7 @@ protected UnifiedGridCoverage(List regionCoverages, List209 - 33.2 + 34.0 2.57.2 2.20.0 4.0.6 @@ -457,8 +457,12 @@ 3.0.3 - - + org.geotools gt-coverage