Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
)
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -53,7 +53,7 @@ protected UnifiedGridCoverage(List<GridCoverage2D> regionCoverages, List<Vertica
// TODO might bicubic interpolation give better results?
GridCoverage2D regionCoverageInterpolator = Interpolator2D.create(
regionCoverage,
new InterpolationBilinear()
Interpolation.getInstance(Interpolation.INTERP_BILINEAR)
);

// Iterate over datums to find intersection envelope with each region and add to spatial index.
Expand Down
10 changes: 7 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<otp.serialization.version.id>209</otp.serialization.version.id>

<!-- Lib versions - keep list sorted on property name -->
<geotools.version>33.2</geotools.version>
<geotools.version>34.0</geotools.version>
<google.dagger.version>2.57.2</google.dagger.version>
<jackson.version>2.20.0</jackson.version>
<jaxb-runtime.version>4.0.6</jaxb-runtime.version>
Expand Down Expand Up @@ -457,8 +457,12 @@
<version>3.0.3</version>
</dependency>

<!-- GEOTOOLS AND JTS TOPOLOGY: geometry, rasters and projections. -->
<!-- GEOTOOLS includes JTS as a transitive dependency. -->
<!--
GEOTOOLS AND JTS TOPOLOGY: geometry, rasters and projections.
GEOTOOLS includes JTS as a transitive dependency. It also includes Eclipse ImageN as a
transitive dependency, but its use should be limited to input/output for geotools
usage.
-->
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-coverage</artifactId>
Expand Down
Loading