Skip to content

Simplify Constants #1614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devemux86 merged 1 commit into from
Jan 6, 2025
Merged

Simplify Constants #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions mapsforge-core/src/main/java/org/mapsforge/core/util/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@

public final class Constants {

public static final int HILLSHADING_COLOR_DEFAULT = 0xff000000;
public static final int HILLSHADING_MAGNITUDE_DEFAULT = 128;

public static final long MAX_MEMORY_MB = Runtime.getRuntime().maxMemory() / 1000 / 1000;

private Constants() {
Expand Down
4 changes: 2 additions & 2 deletions mapsforge-map-awt/src/test/java/org/mapsforge/map/layer/hills/HgtCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public void testMerge() {
13, 13, 15, 17, 17,
0, 13, 15, 17, 0
};
AwtHillshadingBitmap evens = factory.createMonoBitmap(3, 3, even, 1, new BoundingBox(0, 1, 0, 1), Constants.HILLSHADING_COLOR_DEFAULT);
AwtHillshadingBitmap odds = factory.createMonoBitmap(3, 3, odd, 1, new BoundingBox(0, 1, 0, 1), Constants.HILLSHADING_COLOR_DEFAULT);
AwtHillshadingBitmap evens = factory.createMonoBitmap(3, 3, even, 1, new BoundingBox(0, 1, 0, 1), 0xff000000);
AwtHillshadingBitmap odds = factory.createMonoBitmap(3, 3, odd, 1, new BoundingBox(0, 1, 0, 1), 0xff000000);
Canvas canvas = factory.createCanvas();

HgtCache.mergeSameSized(evens, odds, HillshadingBitmap.Border.EAST, 1, canvas);
Expand Down
3 changes: 1 addition & 2 deletions mapsforge-map/src/main/java/org/mapsforge/map/layer/renderer/HillshadingContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.mapsforge.core.graphics.Bitmap;
import org.mapsforge.core.graphics.HillshadingBitmap;
import org.mapsforge.core.model.Rectangle;
import org.mapsforge.core.util.Constants;

public class HillshadingContainer implements ShapeContainer {

Expand All @@ -37,7 +36,7 @@ public HillshadingContainer(HillshadingBitmap bitmap, float magnitude, int color
}

public HillshadingContainer(HillshadingBitmap bitmap, float magnitude, Rectangle hillsRect, Rectangle tileRect) {
this(bitmap, magnitude, Constants.HILLSHADING_COLOR_DEFAULT, hillsRect, tileRect);
this(bitmap, magnitude, 0xff000000, hillsRect, tileRect);
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions mapsforge-map/src/main/java/org/mapsforge/map/rendertheme/rule/RenderThemeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
package org.mapsforge.map.rendertheme.rule;

import org.mapsforge.core.graphics.GraphicFactory;
import org.mapsforge.core.util.Constants;
import org.mapsforge.core.util.IOUtils;
import org.mapsforge.map.model.DisplayModel;
import org.mapsforge.map.rendertheme.XmlRenderTheme;
Expand Down Expand Up @@ -284,8 +283,8 @@ else if ("overlay".equals(qName)) {
byte minZoom = 9;
byte maxZoom = 17;
byte layer = 5;
int magnitude = Constants.HILLSHADING_MAGNITUDE_DEFAULT;
int color = Constants.HILLSHADING_COLOR_DEFAULT;
int magnitude = 128;
int color = 0xff000000;

for (int i = 0; i < pullParser.getAttributeCount(); ++i) {
String name = pullParser.getAttributeName(i);
Expand Down
Loading