-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
move relative crop creation to separate class, use 1 fraction for per…
…centage values
- Loading branch information
1 parent
7fc5e2b
commit 87a5ddf
Showing
6 changed files
with
125 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
src/main/java/io/wcm/handler/mediasource/dam/impl/weboptimized/RelativeCroppingString.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * #%L | ||
| * wcm.io | ||
| * %% | ||
| * Copyright (C) 2024 wcm.io | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
| package io.wcm.handler.mediasource.dam.impl.weboptimized; | ||
|
|
||
| import java.text.DecimalFormat; | ||
| import java.text.DecimalFormatSymbols; | ||
| import java.text.NumberFormat; | ||
| import java.util.Locale; | ||
|
|
||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import io.wcm.handler.media.CropDimension; | ||
| import io.wcm.handler.media.Dimension; | ||
|
|
||
| /** | ||
| * Creates relative crop string with percentage values as required by the Web-Optimized Image Delivery API. | ||
| * It uses one fractional digit for the percentage values. | ||
| */ | ||
| final class RelativeCroppingString { | ||
|
|
||
| private static final NumberFormat DECIMAL_FORMAT = new DecimalFormat("0.0", new DecimalFormatSymbols(Locale.US)); | ||
|
|
||
| private RelativeCroppingString() { | ||
| // static methods only | ||
| } | ||
|
|
||
| static @NotNull String createFromCropDimension( | ||
| @NotNull CropDimension cropDimension, @NotNull Dimension imageDimension) { | ||
| double x1 = cropDimension.getLeft(); | ||
| double y1 = cropDimension.getTop(); | ||
| double left = x1 / imageDimension.getWidth(); | ||
| double top = y1 / imageDimension.getHeight(); | ||
| double width = (double)cropDimension.getWidth() / imageDimension.getWidth(); | ||
| double height = (double)cropDimension.getHeight() / imageDimension.getHeight(); | ||
| return create(left, top, width, height); | ||
| } | ||
|
|
||
| static @NotNull String create(double left, double top, double width, double height) { | ||
| return String.format("%sp,%sp,%sp,%sp", | ||
| toPercentage(left), toPercentage(top), | ||
| toPercentage(width), toPercentage(height)); | ||
| } | ||
|
|
||
| private static String toPercentage(double fraction) { | ||
| return DECIMAL_FORMAT.format(Math.round(fraction * 1000d) / 10d); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...est/java/io/wcm/handler/mediasource/dam/impl/weboptimized/RelativeCroppingStringTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * #%L | ||
| * wcm.io | ||
| * %% | ||
| * Copyright (C) 2024 wcm.io | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
| package io.wcm.handler.mediasource.dam.impl.weboptimized; | ||
|
|
||
| import static io.wcm.handler.mediasource.dam.impl.weboptimized.RelativeCroppingString.create; | ||
| import static io.wcm.handler.mediasource.dam.impl.weboptimized.RelativeCroppingString.createFromCropDimension; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import io.wcm.handler.media.CropDimension; | ||
| import io.wcm.handler.media.Dimension; | ||
|
|
||
|
|
||
| class RelativeCroppingStringTest { | ||
|
|
||
| @Test | ||
| void testCreate() { | ||
| assertEquals("0.0p,0.0p,100.0p,100.0p", create(0.0, 0.0, 1.0, 1.0)); | ||
| assertEquals("15.0p,20.0p,55.0p,60.0p", create(0.15, 0.20, 0.55, 0.60)); | ||
| assertEquals("15.1p,21.3p,49.5p,59.2p", create(0.1512, 0.2131, 0.4954, 0.5915)); | ||
| } | ||
|
|
||
| @Test | ||
| void testCreateFromCropDimension() { | ||
| assertEquals("0.0p,0.0p,100.0p,100.0p", createFromCropDimension(new CropDimension(0, 0, 200, 100), new Dimension(200, 100))); | ||
| assertEquals("6.5p,55.0p,52.5p,67.0p", createFromCropDimension(new CropDimension(13, 55, 105, 67), new Dimension(200, 100))); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters