@maplibre/maplibre-react-native 10.0.0-alpha.1 → 10.0.0-alpha.11

package/javascript/utils/styleMap.ts

@@ -2,16 +2,16 @@
 // DO NOT MODIFY
 // THIS FILE IS AUTOGENERATED
 
-import {isAndroid} from './index';
+import { isAndroid } from "./index";
 
 export const StyleTypes = {
-  Constant: 'constant',
-  Color: 'color',
-  Transition: 'transition',
-  Translation: 'translation',
-  Function: 'function',
-  Image: 'image',
-  Enum: 'enum',
+  Constant: "constant",
+  Color: "color",
+  Transition: "transition",
+  Translation: "translation",
+  Function: "function",
+  Image: "image",
+  Enum: "enum",
 };
 
 export function getStyleType(styleProp: keyof typeof styleExtras): string {
@@ -226,38 +226,38 @@ const styleMap = {
 export const styleExtras = {
   // padding
   iconTextFitPadding: {
-    iosType: 'edgeinsets',
+    iosType: "edgeinsets",
   },
 
   // offsets
   iconOffset: {
-    iosType: 'vector',
+    iosType: "vector",
   },
   textOffset: {
-    iosType: 'vector',
+    iosType: "vector",
   },
   lineOffset: {
-    iosType: 'vector',
+    iosType: "vector",
   },
 
   // translates
   fillTranslate: {
-    iosType: 'vector',
+    iosType: "vector",
   },
   lineTranslate: {
-    iosType: 'vector',
+    iosType: "vector",
   },
   iconTranslate: {
-    iosType: 'vector',
+    iosType: "vector",
   },
   textTranslate: {
-    iosType: 'vector',
+    iosType: "vector",
   },
   circleTranslate: {
-    iosType: 'vector',
+    iosType: "vector",
   },
   fillExtrusionTranslate: {
-    iosType: 'vector',
+    iosType: "vector",
   },
 };
 

package/maplibre-react-native.podspec

@@ -2,9 +2,9 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
-$RNMBGL = Object.new
+$RCTMLN = Object.new
 
-def $RNMBGL._add_spm_to_target(project, target, url, requirement, product_name)
+def $RCTMLN._add_spm_to_target(project, target, url, requirement, product_name)
   pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
   ref_class = Xcodeproj::Project::Object::XCSwiftPackageProductDependency
   pkg = project.root_object.package_references.find { |p| p.class == pkg_class && p.repositoryURL == url }
@@ -23,18 +23,18 @@ def $RNMBGL._add_spm_to_target(project, target, url, requirement, product_name)
   end
 end
 
-def $RNMBGL.post_install(installer)
+def $RCTMLN.post_install(installer)
   spm_spec = {
     url: "https://github.com/maplibre/maplibre-gl-native-distribution",
     requirement: {
       kind: "exactVersion",
-      version: "5.13.0"
+      version: "6.5.4"
     },
-    product_name: "Mapbox"
+    product_name: "MapLibre"
   }
 
-  if $RNMBGL_SPM_Spec.is_a?(Hash)
-    spm_spec = $RNMBGL_SPM_Spec
+  if $RCTMLN_SPM_Spec.is_a?(Hash)
+    spm_spec = $RCTMLN_SPM_Spec
   end
   project = installer.pods_project
   self._add_spm_to_target(
@@ -74,6 +74,6 @@ Pod::Spec.new do |s|
   s.dependency 'React'
 
   s.subspec 'DynamicLibrary' do |sp|
-    sp.source_files	= "ios/RCTMGL/**/*.{h,m}"
+    sp.source_files	= "ios/RCTMLN/**/*.{h,m}"
   end
 end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "A MapLibre GL Native plugin for creating maps in React Native",
-  "version": "10.0.0-alpha.1",
+  "version": "10.0.0-alpha.11",
   "publishConfig": {
     "access": "public"
   },
@@ -28,12 +28,13 @@
     "unittest:single": "jest --testNamePattern",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
+    "lint:single": "eslint",
     "prepack": "pinst --disable && yarn build:plugin",
     "test:plugin": "jest plugin",
     "build:plugin": "tsc --build plugin",
     "lint:plugin": "eslint plugin/src/*",
-    "_postinstall": "husky install",
-    "postpack": "pinst --enable"
+    "postpack": "pinst --enable",
+    "typescript:check": "tsc -p ./tsconfig.json --noEmit"
   },
   "peerDependenciesMeta": {
     "@expo/config-plugins": {
@@ -52,60 +53,52 @@
     "@turf/helpers": "6.5.0",
     "@turf/length": "6.5.0",
     "@turf/nearest-point-on-line": "6.5.0",
+    "@types/debounce": "^1.2.1",
     "@types/geojson": "^7946.0.10",
+    "@types/jest": "^29.5.12",
+    "@types/mapbox__geo-viewport": "^0.4.1",
+    "@types/node": "^18.11.18",
+    "@types/react": "^18.2.15",
     "@types/react-native": "0.67.8",
-    "debounce": "^1.2.0"
+    "debounce": "^2.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.5",
     "@babel/eslint-parser": "^7.22.9",
-    "@babel/plugin-proposal-class-properties": "7.16.7",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/runtime": "7.17.2",
     "@expo/config-plugins": "^7.2.5",
-    "@react-native-community/eslint-config": "^3.0.1",
-    "@react-native-community/eslint-plugin": "^1.3.0",
+    "@react-native/eslint-config": "^0.73.2",
+    "@react-native/eslint-plugin": "^0.74.0",
     "@react-native/metro-config": "^0.72.7",
-    "@sinonjs/fake-timers": "^11.1.0",
-    "@testing-library/react-native": "^8.0.0",
-    "@tsconfig/node14": "14.1.0",
-    "@types/debounce": "^1.2.1",
-    "@types/jest": "^27.4.1",
-    "@types/mapbox__geo-viewport": "^0.4.1",
-    "@types/node": "^18.11.18",
-    "@types/react": "^18.2.15",
-    "@typescript-eslint/eslint-plugin": "^5.2.0",
-    "@typescript-eslint/parser": "^6.7.4",
+    "@sinonjs/fake-timers": "^11.2.2",
+    "@testing-library/react-native": "^12.4.3",
+    "@tsconfig/node14": "^14.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.16.0",
+    "@typescript-eslint/parser": "^7.16.0",
     "babel-jest": "^29.6.0",
     "documentation": "^14.0.0",
     "ejs": "^3.1.3",
     "ejs-lint": "^2.0.0",
-    "eslint": "^8.45.0",
-    "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-fp": "^2.3.0",
-    "eslint-plugin-ft-flow": "^2.0.3",
-    "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-jest": "^27.1.7",
-    "eslint-plugin-prettier": "^5.0.1",
-    "eslint-plugin-react": "^7.31.11",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-native": "^4.0.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-universe": "13.0.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-prettier": "^5.1.3",
     "expo-module-scripts": "^3.1.0",
-    "husky": "^8.0.3",
-    "jest": "^29.6.0",
-    "jest-cli": "^29.6.0",
-    "lint-staged": "^14.0.1",
+    "husky": "^9.0.10",
+    "jest": "^29.7.0",
+    "jest-cli": "^29.7.0",
+    "lint-staged": "^15.2.2",
     "metro-react-native-babel-preset": "^0.76.7",
     "node-dir": "0.1.17",
     "pinst": "^3.0.0",
-    "prettier": "^3.0.3",
-    "prop-types": "^15.8.1",
+    "prettier": "^3.3.3",
     "react": "^18.2.0",
     "react-docgen": "rnmapbox/react-docgen#rnmapbox-dist",
     "react-native": "0.72.1",
     "react-test-renderer": "^18.2.0",
-    "standard": "*",
-    "typescript": "^4.4.3"
+    "typescript": "^5.3.3"
   },
   "jest": {
     "preset": "react-native",
@@ -125,5 +118,24 @@
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": "yarn lint"
   },
-  "packageManager": "yarn@3.6.1"
+  "eslintConfig": {
+    "root": true,
+    "extends": [
+      "prettier",
+      "universe/native"
+    ],
+    "ignorePatterns": [
+      "node_modules/*",
+      "*.js",
+      "**/dist/*.js",
+      "/plugin/build"
+    ],
+    "plugins": [
+      "prettier"
+    ],
+    "rules": {
+      "prettier/prettier": "error"
+    }
+  },
+  "packageManager": "yarn@4.1.0"
 }

package/plugin/build/withMapLibre.d.ts

@@ -1,5 +1,5 @@
-import { ConfigPlugin, XcodeProject } from '@expo/config-plugins';
-type InstallerBlockName = 'pre' | 'post';
+import { ConfigPlugin, XcodeProject } from "@expo/config-plugins";
+type InstallerBlockName = "pre" | "post";
 export declare function applyCocoaPodsModifications(contents: string): string;
 export declare function addInstallerBlock(src: string, blockName: InstallerBlockName): string;
 export declare function addMapLibreInstallerBlock(src: string, blockName: InstallerBlockName): string;

package/plugin/build/withMapLibre.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setExcludedArchitectures = exports.addMapLibreInstallerBlock = exports.addInstallerBlock = exports.applyCocoaPodsModifications = void 0;
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
 const config_plugins_1 = require("@expo/config-plugins");
 const generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
 let pkg = {
-    name: '@maplibre/maplibre-react-native',
+    name: "@maplibre/maplibre-react-native",
 };
 try {
-    pkg = require('@maplibre/maplibre-react-native/package.json');
+    pkg = require("@maplibre/maplibre-react-native/package.json");
 }
 catch {
     // empty catch block
@@ -25,14 +25,14 @@ catch {
  * @param config
  * @returns
  */
-const withCocoaPodsInstallerBlocks = c => {
+const withCocoaPodsInstallerBlocks = (c) => {
     return (0, config_plugins_1.withDangerousMod)(c, [
-        'ios',
+        "ios",
         // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
         async (config) => {
-            const file = path_1.default.join(config.modRequest.platformProjectRoot, 'Podfile');
-            const contents = await fs_1.promises.readFile(file, 'utf8');
-            await fs_1.promises.writeFile(file, applyCocoaPodsModifications(contents), 'utf-8');
+            const file = path_1.default.join(config.modRequest.platformProjectRoot, "Podfile");
+            const contents = await fs_1.promises.readFile(file, "utf8");
+            await fs_1.promises.writeFile(file, applyCocoaPodsModifications(contents), "utf-8");
             return config;
         },
     ]);
@@ -42,19 +42,19 @@ const withCocoaPodsInstallerBlocks = c => {
 function applyCocoaPodsModifications(contents) {
     // Ensure installer blocks exist
     // let src = addInstallerBlock(contents, 'pre');
-    let src = addInstallerBlock(contents, 'post');
+    let src = addInstallerBlock(contents, "post");
     // src = addMapLibreInstallerBlock(src, 'pre');
-    src = addMapLibreInstallerBlock(src, 'post');
+    src = addMapLibreInstallerBlock(src, "post");
     return src;
 }
 exports.applyCocoaPodsModifications = applyCocoaPodsModifications;
 function addInstallerBlock(src, blockName) {
     const matchBlock = new RegExp(`${blockName}_install do \\|installer\\|`);
     const tag = `${blockName}_installer`;
-    for (const line of src.split('\n')) {
+    for (const line of src.split("\n")) {
         const contents = line.trim();
         // Ignore comments
-        if (!contents.startsWith('#')) {
+        if (!contents.startsWith("#")) {
             // Prevent adding the block if it exists outside of comments.
             if (contents.match(matchBlock)) {
                 // This helps to still allow revisions, since we enabled the block previously.
@@ -69,11 +69,11 @@ function addInstallerBlock(src, blockName) {
     return (0, generateCode_1.mergeContents)({
         tag,
         src,
-        newSrc: [`  ${blockName}_install do |installer|`, '  end'].join('\n'),
+        newSrc: [`  ${blockName}_install do |installer|`, "  end"].join("\n"),
         anchor: /use_react_native/,
         // We can't go after the use_react_native block because it might have parameters, causing it to be multi-line (see react-native template).
         offset: 0,
-        comment: '#',
+        comment: "#",
     }).contents;
 }
 exports.addInstallerBlock = addInstallerBlock;
@@ -81,10 +81,10 @@ function addMapLibreInstallerBlock(src, blockName) {
     return (0, generateCode_1.mergeContents)({
         tag: `@maplibre/maplibre-react-native-${blockName}_installer`,
         src,
-        newSrc: `    $RNMBGL.${blockName}_install(installer)`,
+        newSrc: `    $RCTMLN.${blockName}_install(installer)`,
         anchor: new RegExp(`${blockName}_install do \\|installer\\|`),
         offset: 1,
-        comment: '#',
+        comment: "#",
     }).contents;
 }
 exports.addMapLibreInstallerBlock = addMapLibreInstallerBlock;
@@ -99,22 +99,36 @@ function setExcludedArchitectures(project) {
     for (const { name, buildSettings } of Object.values(configurations || {})) {
         // Guessing that this is the best way to emulate Xcode.
         // Using `project.addToBuildSettings` modifies too many targets.
-        if (name === 'Release' &&
-            typeof buildSettings?.PRODUCT_NAME !== 'undefined') {
+        if (name === "Release" &&
+            typeof buildSettings?.PRODUCT_NAME !== "undefined") {
             buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
         }
     }
     return project;
 }
 exports.setExcludedArchitectures = setExcludedArchitectures;
-const withExcludedSimulatorArchitectures = c => {
-    return (0, config_plugins_1.withXcodeProject)(c, config => {
+const withoutSignatures = (config) => {
+    const shellScript = `if [ "$XCODE_VERSION_MAJOR" = "1500" ]; then
+    echo "Remove signature files (Xcode 15 workaround)";
+    rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
+  fi`;
+    return (0, config_plugins_1.withXcodeProject)(config, async (config) => {
+        const xcodeProject = config.modResults;
+        xcodeProject.addBuildPhase([], "PBXShellScriptBuildPhase", "Remove signature files (Xcode 15 workaround)", null, {
+            shellPath: "/bin/sh",
+            shellScript,
+        });
+        return config;
+    });
+};
+const withExcludedSimulatorArchitectures = (c) => {
+    return (0, config_plugins_1.withXcodeProject)(c, (config) => {
         config.modResults = setExcludedArchitectures(config.modResults);
         return config;
     });
 };
-const withMapLibre = config => {
-    config = withExcludedSimulatorArchitectures(config);
+const withMapLibre = (config) => {
+    config = withoutSignatures(withExcludedSimulatorArchitectures(config));
     return withCocoaPodsInstallerBlocks(config);
 };
 exports.default = (0, config_plugins_1.createRunOncePlugin)(withMapLibre, pkg.name, pkg.version);

package/react-native.config.js

@@ -3,7 +3,7 @@ module.exports = {
     platforms: {
       ios: {},
       android: {
-        sourceDir: './android/rctmgl',
+        sourceDir: './android/rctmln',
       },
     },
   },

package/scripts/autogenHelpers/globals.js

@@ -84,25 +84,25 @@ global.getLayerType = function (layer, platform) {
 
   switch (layer.name) {
     case 'fill':
-      return isIOS ? 'MGLFillStyleLayer' : 'FillLayer';
+      return isIOS ? 'MLNFillStyleLayer' : 'FillLayer';
     case 'fill-extrusion':
-      return isIOS ? 'MGLFillExtrusionStyleLayer' : 'FillExtrusionLayer';
+      return isIOS ? 'MLNFillExtrusionStyleLayer' : 'FillExtrusionLayer';
     case 'line':
-      return isIOS ? 'MGLLineStyleLayer' : 'LineLayer';
+      return isIOS ? 'MLNLineStyleLayer' : 'LineLayer';
     case 'symbol':
-      return isIOS ? 'MGLSymbolStyleLayer' : 'SymbolLayer';
+      return isIOS ? 'MLNSymbolStyleLayer' : 'SymbolLayer';
     case 'circle':
-      return isIOS ? 'MGLCircleStyleLayer' : 'CircleLayer';
+      return isIOS ? 'MLNCircleStyleLayer' : 'CircleLayer';
     case 'background':
-      return isIOS ? 'MGLBackgroundStyleLayer' : 'BackgroundLayer';
+      return isIOS ? 'MLNBackgroundStyleLayer' : 'BackgroundLayer';
     case 'raster':
-      return isIOS ? 'MGLRasterStyleLayer' : 'RasterLayer';
+      return isIOS ? 'MLNRasterStyleLayer' : 'RasterLayer';
     case 'heatmap':
-      return isIOS ? 'MGLHeatmapStyleLayer' : 'HeatmapLayer';
+      return isIOS ? 'MLNHeatmapStyleLayer' : 'HeatmapLayer';
     case 'hillshade':
-      return isIOS ? 'MGLHillshadeStyleLayer' : 'HillshadeLayer';
+      return isIOS ? 'MLNHillshadeStyleLayer' : 'HillshadeLayer';
     case 'light':
-      return isIOS ? 'MGLLight' : 'Light';
+      return isIOS ? 'MLNLight' : 'Light';
     default:
       throw new Error(
         `Is ${layer.name} a new layer? We should add support for it!`,

package/scripts/autogenerate.js

@@ -8,7 +8,7 @@ const ejs = require('ejs');
 const {execSync} = require('child_process');
 
 const prettier = require('prettier');
-const prettierrc = require('../.prettierrc.js');
+const prettierrc = require('eslint-config-universe');
 
 const styleSpecJSON = require('../style-spec/v8.json');
 
@@ -32,7 +32,7 @@ function readAndroidVersion() {
     __dirname,
     '..',
     'android',
-    'rctmgl',
+    'rctmln',
     'build.gradle',
   );
   const lines = fs.readFileSync(buildGradlePath, 'utf8').split('\n');
@@ -64,18 +64,18 @@ const OUTPUT_EXAMPLE_PREFIX = [
 ];
 const OUTPUT_PREFIX = outputToExample ? OUTPUT_EXAMPLE_PREFIX : ['..'];
 
-const IOS_OUTPUT_PATH = path.join(__dirname, ...OUTPUT_PREFIX, 'ios', 'RCTMGL');
+const IOS_OUTPUT_PATH = path.join(__dirname, ...OUTPUT_PREFIX, 'ios', 'RCTMLN');
 const ANDROID_OUTPUT_PATH = path.join(
   __dirname,
   ...OUTPUT_PREFIX,
   'android',
-  'rctmgl',
+  'rctmln',
   'src',
   'main',
   'java',
   'com',
-  'mapbox',
-  'rctmgl',
+  'maplibre',
+  'rctmln',
   'components',
   'styles',
 );
@@ -322,8 +322,8 @@ function getAllowedFunctionTypes(paintAttr) {
 async function generate() {
   const templateMappings = [
     {
-      input: path.join(TMPL_PATH, 'RCTMGLStyle.h.ejs'),
-      output: path.join(IOS_OUTPUT_PATH, 'RCTMGLStyle.h'),
+      input: path.join(TMPL_PATH, 'RCTMLNStyle.h.ejs'),
+      output: path.join(IOS_OUTPUT_PATH, 'RCTMLNStyle.h'),
     },
     /*{
       input: path.join(TMPL_PATH, 'index.d.ts.ejs'),
@@ -334,12 +334,12 @@ async function generate() {
       output: path.join(JS_OUTPUT_PATH, 'MaplibreStyles.d.ts'), 
     },
     {
-      input: path.join(TMPL_PATH, 'RCTMGLStyle.m.ejs'),
-      output: path.join(IOS_OUTPUT_PATH, 'RCTMGLStyle.m'),
+      input: path.join(TMPL_PATH, 'RCTMLNStyle.m.ejs'),
+      output: path.join(IOS_OUTPUT_PATH, 'RCTMLNStyle.m'),
     },
     {
-      input: path.join(TMPL_PATH, 'RCTMGLStyleFactory.java.ejs'),
-      output: path.join(ANDROID_OUTPUT_PATH, 'RCTMGLStyleFactory.java'),
+      input: path.join(TMPL_PATH, 'RCTMLNStyleFactory.java.ejs'),
+      output: path.join(ANDROID_OUTPUT_PATH, 'RCTMLNStyleFactory.java'),
     },
     {
       input: path.join(TMPL_PATH, 'styleMap.ts.ejs'),

package/scripts/download-style-spec.sh

@@ -11,5 +11,5 @@ if [ -e "./${FILENAME}" ]; then
 fi
 
 echo "Fetching new style spec ${FILENAME}"
-curl -sS https://raw.githubusercontent.com/maplibre/maplibre-gl-js/master/src/style-spec/reference/${FILENAME} -o ${FILENAME}
+curl -sS https://raw.githubusercontent.com/maplibre/maplibre-style-spec/main/src/reference/${FILENAME} -o ${FILENAME}
 cd ..

package/scripts/templates/{RCTMGLStyle.h.ejs → RCTMLNStyle.h.ejs}

@@ -4,18 +4,18 @@
 // DO NOT MODIFY
 // THIS FILE IS AUTOGENERATED
 
-#import "RCTMGLStyle.h"
-#import "RCTMGLStyleValue.h"
+#import "RCTMLNStyle.h"
+#import "RCTMLNStyleValue.h"
 #import <React/RCTBridge.h>
 
-@import Mapbox;
+@import MapLibre;
 
-@interface RCTMGLStyle : NSObject
+@interface RCTMLNStyle : NSObject
 
 @property (nonatomic, weak) RCTBridge *bridge;
-@property (nonatomic, strong) MGLStyle *style;
+@property (nonatomic, strong) MLNStyle *style;
 
-- (id)initWithMGLStyle:(MGLStyle*)mglStyle;
+- (id)initWithMLNStyle:(MLNStyle*)mlnStyle;
 
 <%_ for (const layer of layers) { _%>
 - (void)<%- setLayerMethodName(layer, 'ios') -%>:(<%- getLayerType(layer, 'ios') -%> *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid;
@@ -23,9 +23,9 @@
 
 <%_ for (const layer of layers) { _%>
 <%_ for (const prop of layer.properties) { _%>
-- (void)set<%- iosPropMethodName(layer, pascelCase(prop.name)) -%>:(<%- getLayerType(layer, 'ios') -%> *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
+- (void)set<%- iosPropMethodName(layer, pascelCase(prop.name)) -%>:(<%- getLayerType(layer, 'ios') -%> *)layer withReactStyleValue:(RCTMLNStyleValue *)styleValue;
 <%_ if (prop.transition) { _%>
-- (void)set<%- iosPropMethodName(layer, pascelCase(prop.name)) -%>Transition:(<%- getLayerType(layer, 'ios') -%> *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue;
+- (void)set<%- iosPropMethodName(layer, pascelCase(prop.name)) -%>Transition:(<%- getLayerType(layer, 'ios') -%> *)layer withReactStyleValue:(RCTMLNStyleValue *)styleValue;
 <%_ } _%>
 <%_ } _%>
 <% } %>

package/scripts/templates/{RCTMGLStyle.m.ejs → RCTMLNStyle.m.ejs}

@@ -4,15 +4,15 @@
 // DO NOT MODIFY
 // THIS FILE IS AUTOGENERATED
 
-#import "RCTMGLStyle.h"
-#import "RCTMGLUtils.h"
+#import "RCTMLNStyle.h"
+#import "RCTMLNUtils.h"
 
-@implementation RCTMGLStyle
+@implementation RCTMLNStyle
 
-- (id)initWithMGLStyle:(MGLStyle*)mglStyle
+- (id)initWithMLNStyle:(MLNStyle*)mlnStyle
 {
     if (self = [super init]) {
-        _style = mglStyle;
+        _style = mlnStyle;
     }
     return self;
 }
@@ -31,7 +31,7 @@
       continue;
     }
 
-    RCTMGLStyleValue *styleValue = [RCTMGLStyleValue make:reactStyle[prop]];
+    RCTMLNStyleValue *styleValue = [RCTMLNStyleValue make:reactStyle[prop]];
 
   <% for (let i = 0; i < layer.properties.length; i++) { -%>
   <%- ifOrElseIf(i) -%> ([prop isEqualToString:@"<%= layer.properties[i].name %>"]) {
@@ -41,7 +41,7 @@
       } else {
         NSString *imageURI = [styleValue getImageURI];
 
-        [RCTMGLUtils fetchImage:_bridge url:imageURI scale:[styleValue getImageScale] callback:^(NSError *error, UIImage *image) {
+        [RCTMLNUtils fetchImage:_bridge url:imageURI scale:[styleValue getImageScale] callback:^(NSError *error, UIImage *image) {
           if (image != nil) {
             dispatch_async(dispatch_get_main_queue(), ^{
               if (isValid()) {
@@ -69,19 +69,19 @@
 
 <% for (const layer of layers) {%>
 <% for (const prop of layer.properties) {%>
-- (void)set<%- iosPropMethodName(layer, pascelCase(prop.name)) -%>:(<%- getLayerType(layer, 'ios') -%> *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
+- (void)set<%- iosPropMethodName(layer, pascelCase(prop.name)) -%>:(<%- getLayerType(layer, 'ios') -%> *)layer withReactStyleValue:(RCTMLNStyleValue *)styleValue
 {
     <%_ if (layer.name === 'light' && prop.name === 'position') { _%>
     layer.position = [styleValue getSphericalPosition];
     <%_ } else if (prop.name === 'visibility') { _%>
     layer.visible = [styleValue isVisible];
     <%_ } else { _%>
-    layer.<%- iosPropName(prop.name) -%> = styleValue.mglStyleValue;
+    layer.<%- iosPropName(prop.name) -%> = styleValue.mlnStyleValue;
     <%_ } _%>
 }
 <%_ if (prop.transition) { _%>
 
-- (void)set<%- iosPropMethodName(layer, pascelCase(prop.name)) -%>Transition:(<%- getLayerType(layer, 'ios') -%> *)layer withReactStyleValue:(RCTMGLStyleValue *)styleValue
+- (void)set<%- iosPropMethodName(layer, pascelCase(prop.name)) -%>Transition:(<%- getLayerType(layer, 'ios') -%> *)layer withReactStyleValue:(RCTMLNStyleValue *)styleValue
 {
     layer.<%- iosPropName(prop.name) -%>Transition = [styleValue getTransition];
 }