Codestin Search App

Sublimis · 2024-12-16T18:17:00Z

Adaptive hill shading (AdaptiveClasyHillShading): Hill shading can now be rendered efficiently at all zoom levels (screenshots below).
- Adaptive hill shading algorithm autonomously decides min/max zoom levels by default (others continue to work as before)
- It will dynamically decide on the resolution and quality of the output depending on the display parameters, to maximize efficiency
- Min/max zoom levels can be enforced via code
Hill shading color feature. Color for the hill shading can now be set via render theme, or overriden by the code.
New <hillshading> render theme element attribute: "color".
Deprecated the "always" attribute of the <hillshading> render theme element, it's obsolete.
Significantly improved HgtCache: It will now constraint based on memory usage and also prevent unconstrained cache hammering and resulting excessive memory usage and possible OOM exceptions in extreme situations.
HgtFileInfo class was made a standalone class.
AbsShadingAlgorithmDefaults name was simplified (renamed) to AShadingAlgorithm.
Hill shading bitmaps are now synchronized where needed (prevents various artifacts, at least on Android).
Fix (AWT): Hill shading does not use AwtLuminanceShadingComposite any more, it's obsolete. It was used in the past to reduce the effect of the "neutral hills" gray overlay, which is not present any more. This change also improves performance of the hill shading on AWT, and restores symmetry with Android.
Multithreaded indexing of DEM files

* Adaptive hill shading (AdaptiveClasyHillShading): Hill shading can now be rendered efficiently at all zoom levels (screenshots below). - Adaptive hill shading algorithm autonomously decides min/max zoom levels by default (others continue to work as before) - It will dynamically decide on the resolution and quality of the output depending on the display parameters, to maximize efficiency - Min/max zoom levels can be enforced via code * Hill shading color feature. Color for the hill shading can now be set via render theme, or overriden by the code. * New <hillshading> render theme element attribute: "color". * Deprecated the "always" attribute of the <hillshading> render theme element, it's obsolete. * Significantly improved HgtCache: It will now constraint based on memory usage and also prevent unconstrained cache hammering and resulting excessive memory usage and possible OOM exceptions in extreme situations. * HgtFileInfo class was made a standalone class. * AbsShadingAlgorithmDefaults name was simplified (renamed) to AShadingAlgorithm. * Hill shading bitmaps are now synchronized where needed (prevents various artifacts, at least on Android). * Fix (AWT): Hill shading does not use AwtLuminanceShadingComposite any more, it's obsolete. It was used in the past to reduce the effect of the "neutral hills" gray overlay, which is not present any more. This change also improves performance of the hill shading on AWT, and restores symmetry with Android. * Multithreaded indexing of DEM files

devemux86 · 2024-12-17T11:23:03Z

+ */
+package org.mapsforge.core.graphics;
+
+public abstract class ABitmap implements Bitmap {


@Sublimis Let's use a better name, like BaseBitmap.

devemux86 · 2024-12-17T11:24:26Z

+
+public abstract class ABitmap implements Bitmap {
+
+   protected final Object Mutex = new Object();


@Sublimis Name should start in lower case.

devemux86 · 2024-12-17T11:26:23Z

-    private Point origin;
+    private volatile BoundingBox boundingBox;
+    private volatile Point origin;
+    private transient final Object mSync = new Object();


@Sublimis We do not use the prefix m in names in Mapsforge.

devemux86 · 2024-12-17T11:28:22Z

+        double sinLatitude = Math.sin(Math.toRadians(latitude));
        // FIXME improve this formula so that it works correctly without the clipping
        double pixelY = (0.5 - Math.log((1 + sinLatitude) / (1 - sinLatitude)) / (4 * Math.PI)) * mapSize;
+//        double pixelY = (0.5 - Math.log(Math.tan(Math.toRadians(45 + latitude / 2))) / (2 * Math.PI)) * mapSize;


@Sublimis What is this commented code?

Some leftover, sorry, while trying to fix something. It is just another way of doing the exact same calculation in the line above.

devemux86 · 2024-12-17T11:29:54Z

+     * (2024: Deprecated, should not be used)
     */
-    public static boolean LUMINANCE_COMPOSITE = true;
+    public static final boolean LUMINANCE_COMPOSITE = false;


@Sublimis Parameters cannot be final. Either keep it non final or remove the LUMINANCE_COMPOSITE.

devemux86 · 2024-12-17T11:30:56Z

+    public static final boolean LUMINANCE_COMPOSITE = false;
+
+    public static final int HILLSHADING_MAGNITUDE_DEFAULT = 128;
+    public static final int HILLSHADING_COLOR_DEFAULT = 0xff000000;


@Sublimis These are not parameters, but constants. They should be moved to the class that uses them.

devemux86 · 2024-12-17T11:33:08Z

     */
    public static int NUMBER_OF_THREADS = Runtime.getRuntime().availableProcessors() + 1;

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


@Sublimis This is not a parameter, but a calculated constant. It should be moved to the class that uses it.

Also, shouldn't the calculation be done with `1024'?

What if more than one class wants to use a constant, shouldn't there be some class holding constants?
Can we create it?
https://en.wikipedia.org/wiki/Megabyte

@Sublimis Parameters is not the class to hold constants.
We can create a Constants class for such purpose.

devemux86 · 2024-12-17T11:34:07Z

+
+    // One 1" HGT file converted to a same-sized bitmap is about 13 MB, for high-quality this is 52 MB.
+    // For ultra-low-quality while rendering wide zoom in adaptive mode, bitmap size per 1" HGT file can be as low as a few hundred bytes.
+    protected final long CacheMaxBytes = Parameters.MAX_MEMORY_MB * 1000 * 1000 / 10;


@Sublimis Shouldn't the calculation be done with `1024'?

https://en.wikipedia.org/wiki/Megabyte
It also doesn't matter what is the exact constant, as those are all just rules of thumbs.

devemux86 · 2024-12-17T11:44:48Z

                byte layer = 5;
-                short magnitude = 128;
-                boolean always = false;
+                int magnitude = Parameters.HILLSHADING_MAGNITUDE_DEFAULT;


@Sublimis RenderThemeHandler.HILLSHADING_MAGNITUDE should also become int.

It is an int, public static final int HILLSHADING_MAGNITUDE_DEFAULT = 128; ?

@Sublimis I wrote about the RenderThemeHandler.HILLSHADING_MAGNITUDE to become an int:

public static short HILLSHADING_MAGNITUDE = -1;

devemux86 · 2024-12-17T11:48:30Z

    private static final String demUseFiles = "demFolderFiles";
    private static final int SELECT_DEM_FOLDER = 0;

-    @SuppressWarnings("deprecation")


@Sublimis This is still needed.

devemux86 · 2024-12-17T11:49:23Z

    }

    private void customizeConfig(MemoryCachingHgtReaderTileSource hillTileSource) {
-        hillTileSource.setEnableInterpolationOverlap(true);


@Sublimis This empty method should be removed.

devemux86 · 2024-12-17T11:54:05Z

        </xs:attribute>
        <!-- customization unlikely to make any sense -->
        <xs:attribute name="layer" default="5" type="xs:unsignedByte" use="optional" />
+        <xs:attribute name="always" default="false" type="xs:boolean" use="optional">


@Sublimis Let's remove this non working attribute.
XML Schema Definition should only contain the working attributes.

This would immediately break the validity of all render themes that already use the "always" attribute, wouldn't it? That's why there should be some grace period...

@Sublimis It doesn't matter, as render themes should still work.
XML validation can be checked at any time by the theme authors.

devemux86 · 2024-12-17T15:48:55Z

        POLYGON_EXCEPTIONS.add(new Tag("freizeitkarte", "land"));
    }

+    public static final class Constants {


@Sublimis Let's make Constants a separate class.

devemux86 · 2024-12-17T15:51:13Z

+         * Use AwtLuminanceShadingComposite or AlphaComposite.
+         * (2024: Deprecated, should not be used)
+         */
+        public static final boolean LUMINANCE_COMPOSITE = false;


@Sublimis As it cannot be used anymore, we can remove it.
And also remove the AwtLuminanceShadingComposite class.

devemux86 · 2024-12-18T10:42:51Z

@Sublimis Thanks, very nice work!

Sublimis · 2024-12-18T10:48:07Z

Should we do another PR for those final details about constants etc. or do you think it's fine the way it is now?
Thanks!

devemux86 · 2024-12-18T11:02:16Z

@Sublimis I separated the Constants class in #1593.

Sublimis · 2024-12-18T13:29:56Z

Screenshots update

devemux86 · 2024-12-18T15:40:26Z

Screenshots update

@Sublimis Thanks, very nice! 👍

devemux86 · 2024-12-22T09:19:38Z

@Sublimis

There are reports for ANR or crash with the hillshading lately.

Although we have not seen anything strange in Cruiser so far.

ztNFny · 2024-12-22T11:26:04Z

[Unified Mapsforge] ANR toggling hillshading [Unified Mapsforge] ANR toggling hillshading cgeo/cgeo#16429

fyi, at least that one is from before Adaptive hillshading was merged

@Sublimis however I found some other issues with adaptive hillshading, documented in cgeo/cgeo#16438 (comment), maybe you could take a look / make a statement on that?

Sublimis added 2 commits December 16, 2024 19:13

Update Tile.java

0eaf7e2

Sublimis marked this pull request as ready for review December 16, 2024 18:37

devemux86 reviewed Dec 17, 2024

View reviewed changes

Adaptive hill shading

54e50fd

devemux86 reviewed Dec 17, 2024

View reviewed changes

devemux86 added the enhancement label Dec 18, 2024

devemux86 added this to the 0.23.0 milestone Dec 18, 2024

devemux86 merged commit 890d2b4 into mapsforge:master Dec 18, 2024

devemux86 mentioned this pull request Dec 18, 2024

Hillshading new algorithms and improvements #1551

Closed

devemux86 mentioned this pull request Dec 19, 2024

Adaptive hill shading cgeo/cgeo#16438

Closed


		public abstract class ABitmap implements Bitmap {

		protected final Object Mutex = new Object();

Conversation

Sublimis commented Dec 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devemux86 Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sublimis Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devemux86 Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devemux86 Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devemux86 commented Dec 18, 2024

Uh oh!

Sublimis commented Dec 18, 2024

Uh oh!

devemux86 commented Dec 18, 2024

Uh oh!

Sublimis commented Dec 18, 2024

Uh oh!

devemux86 commented Dec 18, 2024

Uh oh!

devemux86 commented Dec 22, 2024

Uh oh!

ztNFny commented Dec 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Sublimis commented Dec 16, 2024 •

edited

Loading

devemux86 Dec 17, 2024 •

edited

Loading

Sublimis Dec 17, 2024 •

edited

Loading

devemux86 Dec 17, 2024 •

edited

Loading

devemux86 Dec 17, 2024 •

edited

Loading