refactor: align casing on MapLibre and MapLibreRN usages

.gitignore

@@ -63,8 +63,6 @@ package.tgz
 .vs
 
 # project specific
-ios/Mapbox.framework
-ios/Maplibre.framework
 ios/temp.zip
 ios/.framework_version
 ios/Pods/

__tests__/interface.test.js

@@ -1,6 +1,6 @@
 import MapLibreGL from "../src";
 
-// Assert that all required Maplibre modules are accessible and exported
+// Assert that all required MapLibre modules are accessible and exported
 describe("Public Interface", () => {
   it("should contain all expected components and utils", () => {
     const actualKeys = Object.keys(MapLibreGL);

docs/Style.md

@@ -6,6 +6,6 @@ Style is a component that automatically adds sources / layers to the map using M
 ## Props
 | Prop | Type | Default | Required | Description |
 | ---- | :--: | :-----: | :------: | :----------: |
-| json | `MaplibreJSON \| URL` | `none` | `false` | A JSON object conforming to the schema described in the MapLibre Style Specification, or a URL to such JSON. |
+| json | `MapLibreJSON \| URL` | `none` | `false` | A JSON object conforming to the schema described in the MapLibre Style Specification, or a URL to such JSON. |
 
 

docs/docs.json

@@ -3356,7 +3356,7 @@
       {
         "name": "json",
         "required": false,
-        "type": "MaplibreJSON \\| URL",
+        "type": "MapLibreJSON \\| URL",
         "default": "none",
         "description": "A JSON object conforming to the schema described in the MapLibre Style Specification, or a URL to such JSON."
       }

scripts/codegen.ts

@@ -40,8 +40,8 @@ const TEMPLATE_MAPPINGS = [
     output: path.join(IOS_OUTPUT_PATH, "RCTMLNStyle.h"),
   },
   {
-    input: path.join(TMPL_PATH, "MaplibreStyles.ts.ejs"),
-    output: path.join(JS_OUTPUT_PATH, "MaplibreStyles.d.ts"),
+    input: path.join(TMPL_PATH, "MapLibreRNStyles.ts.ejs"),
+    output: path.join(JS_OUTPUT_PATH, "MapLibreRNStyles.d.ts"),
   },
   {
     input: path.join(TMPL_PATH, "RCTMLNStyle.m.ejs"),

src/MapLibreRN.ts

@@ -64,7 +64,7 @@ export type {
   HillshadeLayerStyleProps as HillshadeLayerStyle,
   BackgroundLayerStyleProps as BackgroundLayerStyle,
   LightLayerStyleProps as LightLayerStyle,
-} from "./utils/MaplibreStyles";
+} from "./utils/MapLibreRNStyles";
 
 /** @deprecated UserTrackingModes is deprecated use UserTrackingMode */
 export const UserTrackingModes = UserTrackingMode;

src/components/Annotation.tsx

@@ -10,7 +10,7 @@ import { Animated as RNAnimated, Easing } from "react-native";
 
 import SymbolLayer from "./SymbolLayer";
 import { type OnPressEvent } from "../types/OnPressEvent";
-import { type SymbolLayerStyleProps } from "../utils/MaplibreStyles";
+import { type SymbolLayerStyleProps } from "../utils/MapLibreRNStyles";
 import { AnimatedShapeSource } from "../utils/animated/Animated";
 import AnimatedMapPoint from "../utils/animated/AnimatedPoint";
 

src/components/BackgroundLayer.tsx

@@ -6,7 +6,7 @@ import useAbstractLayer, {
   type NativeBaseProps,
 } from "../hooks/useAbstractLayer";
 import { type BaseProps } from "../types/BaseProps";
-import { type BackgroundLayerStyleProps } from "../utils/MaplibreStyles";
+import { type BackgroundLayerStyleProps } from "../utils/MapLibreRNStyles";
 
 const MapLibreGL = NativeModules.MLNModule;
 

src/components/CircleLayer.tsx

@@ -6,7 +6,7 @@ import useAbstractLayer, {
   type NativeBaseProps,
 } from "../hooks/useAbstractLayer";
 import { type BaseProps } from "../types/BaseProps";
-import { type CircleLayerStyleProps } from "../utils/MaplibreStyles";
+import { type CircleLayerStyleProps } from "../utils/MapLibreRNStyles";
 
 const MapLibreGL = NativeModules.MLNModule;
 

src/components/FillExtrusionLayer.tsx

@@ -6,7 +6,7 @@ import useAbstractLayer, {
   type NativeBaseProps,
 } from "../hooks/useAbstractLayer";
 import { type BaseProps } from "../types/BaseProps";
-import { type FillExtrusionLayerStyleProps } from "../utils/MaplibreStyles";
+import { type FillExtrusionLayerStyleProps } from "../utils/MapLibreRNStyles";
 
 const MapLibreGL = NativeModules.MLNModule;
 

src/components/FillLayer.tsx

@@ -6,7 +6,7 @@ import useAbstractLayer, {
   type NativeBaseProps,
 } from "../hooks/useAbstractLayer";
 import { type BaseProps } from "../types/BaseProps";
-import { type FillLayerStyleProps } from "../utils/MaplibreStyles";
+import { type FillLayerStyleProps } from "../utils/MapLibreRNStyles";
 
 const MapLibreGL = NativeModules.MLNModule;
 

src/components/HeatmapLayer.tsx

@@ -6,7 +6,7 @@ import useAbstractLayer, {
   type NativeBaseProps,
 } from "../hooks/useAbstractLayer";
 import { type BaseProps } from "../types/BaseProps";
-import { type HeatmapLayerStyleProps } from "../utils/MaplibreStyles";
+import { type HeatmapLayerStyleProps } from "../utils/MapLibreRNStyles";
 
 const MapLibreGL = NativeModules.MLNModule;
 

src/components/Light.tsx

@@ -5,7 +5,7 @@ import useAbstractLayer, {
   type BaseLayerProps,
 } from "../hooks/useAbstractLayer";
 import { type BaseProps } from "../types/BaseProps";
-import { type LightLayerStyleProps } from "../utils/MaplibreStyles";
+import { type LightLayerStyleProps } from "../utils/MapLibreRNStyles";
 import { type StyleValue } from "../utils/StyleValue";
 
 export const NATIVE_MODULE_NAME = "RCTMLNLight";

src/components/LineLayer.tsx

@@ -6,7 +6,7 @@ import useAbstractLayer, {
   type NativeBaseProps,
 } from "../hooks/useAbstractLayer";
 import { type BaseProps } from "../types/BaseProps";
-import { type LineLayerStyleProps } from "../utils/MaplibreStyles";
+import { type LineLayerStyleProps } from "../utils/MapLibreRNStyles";
 
 const MapLibreGL = NativeModules.MLNModule;
 

src/components/MapView.tsx

@@ -28,7 +28,7 @@ import { type Location } from "../modules/location/locationManager";
 import { type BaseProps } from "../types/BaseProps";
 import { isFunction, isAndroid } from "../utils";
 import Logger from "../utils/Logger";
-import { type FilterExpression } from "../utils/MaplibreStyles";
+import { type FilterExpression } from "../utils/MapLibreRNStyles";
 import { getFilter } from "../utils/filterUtils";
 
 const MapLibreGL = NativeModules.MLNModule;

src/components/RasterLayer.tsx

@@ -6,7 +6,7 @@ import useAbstractLayer, {
   type NativeBaseProps,
 } from "../hooks/useAbstractLayer";
 import { type BaseProps } from "../types/BaseProps";
-import { type RasterLayerStyleProps } from "../utils/MaplibreStyles";
+import { type RasterLayerStyleProps } from "../utils/MapLibreRNStyles";
 
 const MapLibreGL = NativeModules.MLNModule;
 

src/components/ShapeSource.tsx

@@ -25,7 +25,7 @@ import {
 import {
   type ExpressionField,
   type FilterExpression,
-} from "../utils/MaplibreStyles";
+} from "../utils/MapLibreRNStyles";
 import { copyPropertiesAsDeprecated } from "../utils/deprecation";
 import { getFilter } from "../utils/filterUtils";
 

src/components/Style.tsx

@@ -23,7 +23,7 @@ import VectorSource from "./VectorSource";
 import {
   type ExpressionField,
   type FilterExpression,
-} from "../utils/MaplibreStyles";
+} from "../utils/MapLibreRNStyles";
 
 function toCamelCase(s: string): string {
   return s.replace(/([-_][a-z])/gi, ($1) => {
@@ -62,7 +62,7 @@ type LayerProps =
   | HeatmapLayerProps;
 
 function getLayerComponentType(
-  layer: MaplibreJSONLayer,
+  layer: MapLibreJSONLayer,
 ): ComponentType<LayerProps> | null {
   const { type } = layer;
 
@@ -90,7 +90,7 @@ function getLayerComponentType(
   return null;
 }
 
-interface MaplibreJSONLayer {
+interface MapLibreJSONLayer {
   type: string;
   paint: { [k: string]: unknown };
   layout: { [k: string]: unknown };
@@ -103,7 +103,7 @@ interface MaplibreJSONLayer {
 }
 
 function asLayerComponent(
-  layer: MaplibreJSONLayer,
+  layer: MapLibreJSONLayer,
 ): ReactElement<LayerProps> | null {
   const LayerComponent = getLayerComponentType(layer);
 
@@ -140,7 +140,7 @@ function asLayerComponent(
   return <LayerComponent key={layer.id} id={layer.id} {...layerProps} />;
 }
 
-interface MaplibreJSONSource {
+interface MapLibreJSONSource {
   type: string;
   url?: string;
   tiles?: string[];
@@ -178,7 +178,7 @@ type SourceProps = {
   tms?: boolean;
 };
 
-function getTileSourceProps(source: MaplibreJSONSource): SourceProps {
+function getTileSourceProps(source: MapLibreJSONSource): SourceProps {
   const sourceProps: Partial<SourceProps> = {};
   if (source.url) {
     sourceProps.url = source.url;
@@ -201,12 +201,12 @@ function getTileSourceProps(source: MaplibreJSONSource): SourceProps {
   return sourceProps;
 }
 
-function getVectorSource(id: string, source: MaplibreJSONSource): ReactElement {
+function getVectorSource(id: string, source: MapLibreJSONSource): ReactElement {
   const sourceProps = { ...getTileSourceProps(source) };
   return <VectorSource key={id} id={id} {...sourceProps} />;
 }
 
-function getRasterSource(id: string, source: MaplibreJSONSource): ReactElement {
+function getRasterSource(id: string, source: MapLibreJSONSource): ReactElement {
   const sourceProps: SourceProps & { tileSize?: number } = {
     ...getTileSourceProps(source),
   };
@@ -216,7 +216,7 @@ function getRasterSource(id: string, source: MaplibreJSONSource): ReactElement {
   return <RasterSource key={id} id={id} {...sourceProps} />;
 }
 
-function getImageSource(id: string, source: MaplibreJSONSource): ReactElement {
+function getImageSource(id: string, source: MapLibreJSONSource): ReactElement {
   const sourceProps = {
     url: source.url,
     coordinates: source.coordinates,
@@ -226,7 +226,7 @@ function getImageSource(id: string, source: MaplibreJSONSource): ReactElement {
 
 type ShapeSourceShape = (typeof ShapeSource.prototype.props)["shape"];
 
-function getShapeSource(id: string, source: MaplibreJSONSource): ReactElement {
+function getShapeSource(id: string, source: MapLibreJSONSource): ReactElement {
   const sourceProps: SourceProps & {
     shape?: ShapeSourceShape;
     cluster?: boolean;
@@ -271,7 +271,7 @@ function getShapeSource(id: string, source: MaplibreJSONSource): ReactElement {
 
 function asSourceComponent(
   id: string,
-  source: MaplibreJSONSource,
+  source: MapLibreJSONSource,
 ): ReactElement | null {
   switch (source.type) {
     case "vector":
@@ -289,16 +289,16 @@ function asSourceComponent(
   return null;
 }
 
-interface MaplibreJSON {
-  layers?: MaplibreJSONLayer[];
-  sources?: { [key: string]: MaplibreJSONSource };
+interface MapLibreJSON {
+  layers?: MapLibreJSONLayer[];
+  sources?: { [key: string]: MapLibreJSONSource };
 }
 
 interface StyleProps {
   /**
    * A JSON object conforming to the schema described in the MapLibre Style Specification, or a URL to such JSON.
    */
-  json?: MaplibreJSON | URL;
+  json?: MapLibreJSON | URL;
 }
 
 /**
@@ -310,7 +310,7 @@ interface StyleProps {
  */
 const Style = (props: StyleProps): ReactElement => {
   const [fetchedJson, setFetchedJson] = useState({});
-  const json: MaplibreJSON =
+  const json: MapLibreJSON =
     typeof props.json === "object" ? props.json : fetchedJson;
 
   // Fetch style when props.json is a URL

src/components/SymbolLayer.tsx

@@ -6,7 +6,7 @@ import useAbstractLayer, {
   type NativeBaseProps,
 } from "../hooks/useAbstractLayer";
 import { type BaseProps } from "../types/BaseProps";
-import { type SymbolLayerStyleProps } from "../utils/MaplibreStyles";
+import { type SymbolLayerStyleProps } from "../utils/MapLibreRNStyles";
 
 const MapLibreGL = NativeModules.MLNModule;
 

src/components/UserLocation.tsx

@@ -15,7 +15,7 @@ import NativeUserLocation from "./NativeUserLocation";
 import locationManager, {
   type Location,
 } from "../modules/location/locationManager";
-import { type CircleLayerStyleProps } from "../utils/MaplibreStyles";
+import { type CircleLayerStyleProps } from "../utils/MapLibreRNStyles";
 
 const mapboxBlue = "rgba(51, 181, 229, 100)";
 

src/components/VectorSource.tsx

@@ -11,7 +11,7 @@ import useNativeBridge from "../hooks/useNativeBridge";
 import { type BaseProps } from "../types/BaseProps";
 import { type OnPressEvent } from "../types/OnPressEvent";
 import { cloneReactChildrenWithProps, isFunction, isAndroid } from "../utils";
-import { type FilterExpression } from "../utils/MaplibreStyles";
+import { type FilterExpression } from "../utils/MapLibreRNStyles";
 import { copyPropertiesAsDeprecated } from "../utils/deprecation";
 import { getFilter } from "../utils/filterUtils";
 

src/hooks/useAbstractLayer.ts

@@ -7,7 +7,7 @@ import {
   type ExpressionField,
   type ExpressionName,
   type FilterExpression,
-} from "../utils/MaplibreStyles";
+} from "../utils/MapLibreRNStyles";
 import { type StyleValue, transformStyle } from "../utils/StyleValue";
 import { getFilter } from "../utils/filterUtils";
 

src/utils/StyleValue.ts

@@ -4,7 +4,7 @@ import BridgeValue, {
   type RawValueType,
   type StyleValueJSON,
 } from "./BridgeValue";
-import { type AllLayerStyleProps } from "./MaplibreStyles";
+import { type AllLayerStyleProps } from "./MapLibreRNStyles";
 import { getStyleType } from "./styleMap";
 
 export type StyleValue = {

src/utils/filterUtils.ts

@@ -1,4 +1,4 @@
-import { type FilterExpression } from "./MaplibreStyles";
+import { type FilterExpression } from "./MapLibreRNStyles";
 
 export function getFilter(filter: FilterExpression | undefined): string[] {
   if (!Array.isArray(filter) || filter.length === 0) {