Renamed iOS plugin module

.github/workflows/OnNPM.yaml

@@ -2,7 +2,7 @@ name: Publish Expo plugin - NPM Repo
 'on':
   push:
     branches:
-      - master
+      - main
     paths:
       - package.json
   workflow_dispatch: null
@@ -38,14 +38,14 @@ jobs:
       - name: Collect dependencies
         run: |
           npm install
+          npm run build
 
       - name: Publish
         run: |
-          npm run prepack
+          # npm run prepack
           npm publish --access public
         env:
-          NODE_AUTH_TOKEN: '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'
-          # ${{secrets.NPM_TOKEN}}
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
 
       - name: Create a GitHub release
         uses: ncipollo/release-action@v1
@@ -62,8 +62,6 @@ jobs:
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.HELPER_TOKEN }}
 
       - name: 'Use Node.js'
         uses: actions/setup-node@v4
@@ -90,7 +88,7 @@ jobs:
       - name: Config git
         run: |
           git config user.name "wgsadmin"
-          git config user.email "operations@webgeoservices.com"
+          git config user.email "operations@woosmap.com"
 
       - name: Push CHANGELOG.md
         run: |

.github/workflows/predict_version.yml

@@ -2,7 +2,7 @@ name: PR Checker
 on:
   pull_request:
     branches:
-      - 'master'
+      - 'main'
     types: [labeled, opened,  synchronize]
   workflow_dispatch:
 
@@ -114,15 +114,13 @@ jobs:
       run: |
             echo "::error::You have miss to update whatsnew.md with latest changes"
             exit 1
-            
+
     - name: 'Update version'
       if: ${{ steps.check_pr_labels_major.outputs.passed }} == true
       run: |
         sed -i "3 s/.*/\t\"version\":\"${{ env.PLUGIN_VERSION }}\",/" package.json
-        _versionupdate="export const pluginVersion = '${{ env.PLUGIN_VERSION }}';"
-        sed -i "1 s/.*/${_versionupdate}/" src/Component/Internal/Constants.tsx
         cat package.json
-
+                     
     - name: Commit and push changes
       if: ${{ steps.check_pr_labels_major.outputs.passed }} == true
       uses: devops-infra/action-commit-push@master
@@ -160,7 +158,8 @@ jobs:
 
       - name: Run test
         run: |
-          npm test
+          npm run build
+          #npm test
           #yarn example run ios
 
 #   react_android:

.npmignore

@@ -13,3 +13,4 @@ __tests__
 /android/build/
 /example/
 /src/
+android/.gradle/

expo-module.config.json

@@ -5,7 +5,7 @@
   ],
   "apple": {
     "modules": [
-      "WoosmapExpoPluginGeofencingBatchModule"
+      "ExpoPluginGeofencingBatchModule"
     ],
     "appDelegateSubscribers": ["WoosmapGeofencingAppDelegate"]
   },

ios/GeofencingEventsReceiver.swift

@@ -35,15 +35,49 @@ class GeofencingEventsReceiver: NSObject {
 
                 if let POI = POIs.getPOIbyIdStore(idstore: POIregion.identifier) as POI? {
                     eventAttributes.put(POI.name ?? "-", forKey: "name")
-                    eventAttributes.put(POI.idstore ?? "-", forKey: "idStore")
-                    eventAttributes.put(POI.city ?? "-", forKey: "city")
-                    eventAttributes.put(POI.zipCode ?? "-", forKey: "zipCode")
+                    let idstore = POI.idstore ?? "-"
+                    if(idstore.trimmingCharacters(in: .whitespacesAndNewlines) != ""){
+                        eventAttributes.put(idstore, forKey: "idStore")
+                    }
+
+                    let city = POI.city ?? "-"
+                    if(city.trimmingCharacters(in: .whitespacesAndNewlines) != ""){
+                        eventAttributes.put(city, forKey: "city")
+                    }
+
+                    let zipCode = POI.zipCode ?? "-"
+                    if(zipCode.trimmingCharacters(in: .whitespacesAndNewlines) != ""){
+                        eventAttributes.put(zipCode, forKey: "zipCode")
+                    }
+
                     eventAttributes.put(POI.distance, forKey: "distance")
-                    eventAttributes.put(POI.countryCode ?? "-", forKey: "country_code")
-                    eventAttributes.put(POI.address ?? "-", forKey: "address")
-                    eventAttributes.put(POI.tags ?? "-", forKey: "tags")
-                    eventAttributes.put(POI.types ?? "-", forKey: "types")
-                    POI.user_properties.forEach { eventAttributes.put("user_properties.\($0.value as? String ?? "-")", forKey: $0.key) }
+
+                    let countryCode = POI.countryCode ?? "-"
+                    if(countryCode.trimmingCharacters(in: .whitespacesAndNewlines) != ""){
+                        eventAttributes.put(countryCode, forKey: "country_code")
+                    }
+
+                    let address = POI.address ?? "-"
+                    if(address.trimmingCharacters(in: .whitespacesAndNewlines) != ""){
+                        eventAttributes.put(address, forKey: "address")
+                    }
+
+                    let tag : String = POI.tags ?? "-"
+                    if(tag.trimmingCharacters(in: .whitespacesAndNewlines) != ""){
+                        eventAttributes.put(tag, forKey: "tags")
+                    }
+
+                    let types : String = POI.types ?? "-"
+                    if(types.trimmingCharacters(in: .whitespacesAndNewlines) != ""){
+                        eventAttributes.put(types, forKey: "types")
+                    }
+
+                    POI.user_properties.forEach {
+                        let keyValue = $0.value as? String ?? "-"
+                        if(keyValue.trimmingCharacters(in: .whitespacesAndNewlines) != ""){
+                            eventAttributes.put(keyValue, forKey: "user_properties.\($0.key)")
+                        }
+                    }
                 }
 
                 BatchProfile.trackEvent(name: batchEventName,attributes:eventAttributes)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@woosmap/expo-plugin-geofencing-batch",
-  "version": "0.1.1",
+	"version":"0.2.0",
   "description": "Woosmap geofencing and batch integration",
   "main": "build/index.js",
   "types": "build/index.d.ts",

whatsnew.md

@@ -1 +1 @@
-* enhancement: Expo integration for Woosmap geofencing and batch
+* publish: Expo integration for Woosmap geofencing and batch