From 46f2fa12480fcf79a976cea758b2cc9aac29e6ec Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Fri, 14 Jun 2024 14:53:22 +0200 Subject: [PATCH] Rename layer id annotations (#2505) --- .../android/constants/MapLibreConstants.java | 80 +++++++++---------- platform/macos/src/MLNMapView.mm | 2 +- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java index c6a09edcc..1b3778989 100644 --- a/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java +++ b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java @@ -197,46 +197,46 @@ public class MapLibreConstants { /** * Layer Id of annotations layer */ - public static final String LAYER_ID_ANNOTATIONS = "com.mapbox.annotations.points"; + public static final String LAYER_ID_ANNOTATIONS = "org.maplibre.annotations.points"; // Save instance state keys - public static final String STATE_HAS_SAVED_STATE = "mapbox_savedState"; - public static final String STATE_CAMERA_POSITION = "mapbox_cameraPosition"; - public static final String STATE_ZOOM_ENABLED = "mapbox_zoomEnabled"; - public static final String STATE_SCROLL_ENABLED = "mapbox_scrollEnabled"; - public static final String STATE_HORIZONAL_SCROLL_ENABLED = "mapbox_horizontalScrollEnabled"; - public static final String STATE_ROTATE_ENABLED = "mapbox_rotateEnabled"; - public static final String STATE_TILT_ENABLED = "mapbox_tiltEnabled"; - public static final String STATE_DOUBLE_TAP_ENABLED = "mapbox_doubleTapEnabled"; - public static final String STATE_QUICK_ZOOM_ENABLED = "mapbox_quickZoom"; - public static final String STATE_ZOOM_RATE = "mapbox_zoomRate"; - public static final String STATE_DEBUG_ACTIVE = "mapbox_debugActive"; - public static final String STATE_COMPASS_ENABLED = "mapbox_compassEnabled"; - public static final String STATE_COMPASS_GRAVITY = "mapbox_compassGravity"; - public static final String STATE_COMPASS_MARGIN_LEFT = "mapbox_compassMarginLeft"; - public static final String STATE_COMPASS_MARGIN_TOP = "mapbox_compassMarginTop"; - public static final String STATE_COMPASS_MARGIN_RIGHT = "mapbox_compassMarginRight"; - public static final String STATE_COMPASS_MARGIN_BOTTOM = "mapbox_compassMarginBottom"; - public static final String STATE_COMPASS_FADE_WHEN_FACING_NORTH = "mapbox_compassFade"; - public static final String STATE_COMPASS_IMAGE_BITMAP = "mapbox_compassImage"; - public static final String STATE_LOGO_GRAVITY = "mapbox_logoGravity"; - public static final String STATE_LOGO_MARGIN_LEFT = "mapbox_logoMarginLeft"; - public static final String STATE_LOGO_MARGIN_TOP = "mapbox_logoMarginTop"; - public static final String STATE_LOGO_MARGIN_RIGHT = "mapbox_logoMarginRight"; - public static final String STATE_LOGO_MARGIN_BOTTOM = "mapbox_logoMarginBottom"; - public static final String STATE_LOGO_ENABLED = "mapbox_logoEnabled"; - public static final String STATE_ATTRIBUTION_GRAVITY = "mapbox_attrGravity"; - public static final String STATE_ATTRIBUTION_MARGIN_LEFT = "mapbox_attrMarginLeft"; - public static final String STATE_ATTRIBUTION_MARGIN_TOP = "mapbox_attrMarginTop"; - public static final String STATE_ATTRIBUTION_MARGIN_RIGHT = "mapbox_attrMarginRight"; - public static final String STATE_ATTRIBUTION_MARGIN_BOTTOM = "mapbox_atrrMarginBottom"; - public static final String STATE_ATTRIBUTION_ENABLED = "mapbox_atrrEnabled"; - public static final String STATE_DESELECT_MARKER_ON_TAP = "mapbox_deselectMarkerOnTap"; - public static final String STATE_USER_FOCAL_POINT = "mapbox_userFocalPoint"; - public static final String STATE_SCALE_ANIMATION_ENABLED = "mapbox_scaleAnimationEnabled"; - public static final String STATE_ROTATE_ANIMATION_ENABLED = "mapbox_rotateAnimationEnabled"; - public static final String STATE_FLING_ANIMATION_ENABLED = "mapbox_flingAnimationEnabled"; - public static final String STATE_INCREASE_ROTATE_THRESHOLD = "mapbox_increaseRotateThreshold"; - public static final String STATE_DISABLE_ROTATE_WHEN_SCALING = "mapbox_disableRotateWhenScaling"; - public static final String STATE_INCREASE_SCALE_THRESHOLD = "mapbox_increaseScaleThreshold"; + public static final String STATE_HAS_SAVED_STATE = "maplibre_savedState"; + public static final String STATE_CAMERA_POSITION = "maplibre_cameraPosition"; + public static final String STATE_ZOOM_ENABLED = "maplibre_zoomEnabled"; + public static final String STATE_SCROLL_ENABLED = "maplibre_scrollEnabled"; + public static final String STATE_HORIZONAL_SCROLL_ENABLED = "maplibre_horizontalScrollEnabled"; + public static final String STATE_ROTATE_ENABLED = "maplibre_rotateEnabled"; + public static final String STATE_TILT_ENABLED = "maplibre_tiltEnabled"; + public static final String STATE_DOUBLE_TAP_ENABLED = "maplibre_doubleTapEnabled"; + public static final String STATE_QUICK_ZOOM_ENABLED = "maplibre_quickZoom"; + public static final String STATE_ZOOM_RATE = "maplibre_zoomRate"; + public static final String STATE_DEBUG_ACTIVE = "maplibre_debugActive"; + public static final String STATE_COMPASS_ENABLED = "maplibre_compassEnabled"; + public static final String STATE_COMPASS_GRAVITY = "maplibre_compassGravity"; + public static final String STATE_COMPASS_MARGIN_LEFT = "maplibre_compassMarginLeft"; + public static final String STATE_COMPASS_MARGIN_TOP = "maplibre_compassMarginTop"; + public static final String STATE_COMPASS_MARGIN_RIGHT = "maplibre_compassMarginRight"; + public static final String STATE_COMPASS_MARGIN_BOTTOM = "maplibre_compassMarginBottom"; + public static final String STATE_COMPASS_FADE_WHEN_FACING_NORTH = "maplibre_compassFade"; + public static final String STATE_COMPASS_IMAGE_BITMAP = "maplibre_compassImage"; + public static final String STATE_LOGO_GRAVITY = "maplibre_logoGravity"; + public static final String STATE_LOGO_MARGIN_LEFT = "maplibre_logoMarginLeft"; + public static final String STATE_LOGO_MARGIN_TOP = "maplibre_logoMarginTop"; + public static final String STATE_LOGO_MARGIN_RIGHT = "maplibre_logoMarginRight"; + public static final String STATE_LOGO_MARGIN_BOTTOM = "maplibre_logoMarginBottom"; + public static final String STATE_LOGO_ENABLED = "maplibre_logoEnabled"; + public static final String STATE_ATTRIBUTION_GRAVITY = "maplibre_attrGravity"; + public static final String STATE_ATTRIBUTION_MARGIN_LEFT = "maplibre_attrMarginLeft"; + public static final String STATE_ATTRIBUTION_MARGIN_TOP = "maplibre_attrMarginTop"; + public static final String STATE_ATTRIBUTION_MARGIN_RIGHT = "maplibre_attrMarginRight"; + public static final String STATE_ATTRIBUTION_MARGIN_BOTTOM = "maplibre_atrrMarginBottom"; + public static final String STATE_ATTRIBUTION_ENABLED = "maplibre_atrrEnabled"; + public static final String STATE_DESELECT_MARKER_ON_TAP = "maplibre_deselectMarkerOnTap"; + public static final String STATE_USER_FOCAL_POINT = "maplibre_userFocalPoint"; + public static final String STATE_SCALE_ANIMATION_ENABLED = "maplibre_scaleAnimationEnabled"; + public static final String STATE_ROTATE_ANIMATION_ENABLED = "maplibre_rotateAnimationEnabled"; + public static final String STATE_FLING_ANIMATION_ENABLED = "maplibre_flingAnimationEnabled"; + public static final String STATE_INCREASE_ROTATE_THRESHOLD = "maplibre_increaseRotateThreshold"; + public static final String STATE_DISABLE_ROTATE_WHEN_SCALING = "maplibre_disableRotateWhenScaling"; + public static final String STATE_INCREASE_SCALE_THRESHOLD = "maplibre_increaseScaleThreshold"; } diff --git a/platform/macos/src/MLNMapView.mm b/platform/macos/src/MLNMapView.mm index a271eb8d0..8e94c04d8 100644 --- a/platform/macos/src/MLNMapView.mm +++ b/platform/macos/src/MLNMapView.mm @@ -88,7 +88,7 @@ static NSString * const MLNDefaultStyleMarkerSymbolName = @"default_marker"; /// Prefix that denotes a sprite installed by MLNMapView, to avoid collisions /// with style-defined sprites. -static NSString * const MLNAnnotationSpritePrefix = @"com.mapbox.sprites."; +static NSString * const MLNAnnotationSpritePrefix = @"org.maplibre.sprites."; /// Slop area around the hit testing point, allowing for imprecise annotation selection. const CGFloat MLNAnnotationImagePaddingForHitTest = 4;