@kimap/indoor-positioning-sdk-vue2 3.2.0 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kimap/indoor-positioning-sdk-vue2",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Vue2自包含室内定位SDK - 完全兼容Webpack3+Babel6 | Vue2 Self-Contained Indoor Positioning SDK",
   "main": "index.js",
   "files": [

package/src/KimapCore.browser.js

@@ -93,6 +93,78 @@
     }
   }
 
+  // 从OBJ内容中提取边界信息
+  function extractBorderFromOBJ(objContent) {
+    var border = {
+      min: { x: null, y: null, z: null },
+      max: { x: null, y: null, z: null }
+    };
+    
+    var lines = objContent.split('\n');
+    var foundBorder = false;
+    
+    for (var i = 0; i < lines.length; i++) {
+      var line = lines[i].trim();
+      
+      if (line.indexOf('End Border Info') !== -1) break;
+      
+      if (line.indexOf('KIMAP_BORDER_MIN_X') !== -1) {
+        border.min.x = parseFloat(line.split(' ')[2]);
+        foundBorder = true;
+      } else if (line.indexOf('KIMAP_BORDER_MIN_Y') !== -1) {
+        border.min.y = parseFloat(line.split(' ')[2]);
+      } else if (line.indexOf('KIMAP_BORDER_MIN_Z') !== -1) {
+        border.min.z = parseFloat(line.split(' ')[2]);
+      } else if (line.indexOf('KIMAP_BORDER_MAX_X') !== -1) {
+        border.max.x = parseFloat(line.split(' ')[2]);
+      } else if (line.indexOf('KIMAP_BORDER_MAX_Y') !== -1) {
+        border.max.y = parseFloat(line.split(' ')[2]);
+      } else if (line.indexOf('KIMAP_BORDER_MAX_Z') !== -1) {
+        border.max.z = parseFloat(line.split(' ')[2]);
+      }
+    }
+    
+    if (foundBorder && border.min.x !== null && border.max.x !== null) {
+      return border;
+    }
+    return null;
+  }
+
+  // 从OBJ内容中提取地图配置信息（校准数据）
+  function extractMapConfigFromOBJ(objContent) {
+    var config = {
+      isCalibrated: false,
+      calibrationScale: null,
+      realWidth: null,
+      realHeight: null,
+      modelToRealScale: null
+    };
+    
+    var lines = objContent.split('\n');
+    var foundConfig = false;
+    
+    for (var i = 0; i < lines.length; i++) {
+      var line = lines[i].trim();
+      
+      if (line.indexOf('KIMAP_CONFIG_CALIBRATED') !== -1) {
+        config.isCalibrated = line.split(' ')[2] === 'true';
+        foundConfig = true;
+      } else if (line.indexOf('KIMAP_CONFIG_CALIBRATION_SCALE') !== -1) {
+        config.calibrationScale = parseFloat(line.split(' ')[2]);
+      } else if (line.indexOf('KIMAP_CONFIG_REAL_WIDTH') !== -1) {
+        config.realWidth = parseFloat(line.split(' ')[2]);
+      } else if (line.indexOf('KIMAP_CONFIG_REAL_HEIGHT') !== -1) {
+        config.realHeight = parseFloat(line.split(' ')[2]);
+      } else if (line.indexOf('KIMAP_CONFIG_MODEL_TO_REAL_SCALE') !== -1) {
+        config.modelToRealScale = parseFloat(line.split(' ')[2]);
+      }
+      
+      if (line.indexOf('End Config Info') !== -1) break;
+    }
+    
+    return foundConfig ? config : null;
+  }
+
   // 从OBJ内容中提取颜色信息
   function extractColorsFromOBJ(objContent) {
     var colorMap = {};
@@ -449,6 +521,20 @@
                 console.log('📄 OBJ内容预览（前500字符）:');
                 console.log(objContent.substring(0, 500));
                 
+                // 提取边界信息
+                var borderInfo = extractBorderFromOBJ(objContent);
+                if (borderInfo) {
+                  console.log('✅ 提取到边界信息:', borderInfo);
+                  self._borderInfo = borderInfo;
+                }
+                
+                // 提取地图配置信息（校准数据）
+                var mapConfig = extractMapConfigFromOBJ(objContent);
+                if (mapConfig && mapConfig.isCalibrated) {
+                  console.log('✅ 提取到校准数据:', mapConfig);
+                  self._mapConfig = mapConfig;
+                }
+                
                 // 提取颜色信息（作为备用，如果没有MTL的话）
                 var colorMap = materials ? {} : extractColorsFromOBJ(objContent);
                 if (!materials) {
@@ -767,6 +853,15 @@
     
     return self.core.init().then(function() {
       self.info = self.core.getMapInfo();
+      
+      // 从SceneCore传递边界和配置信息
+      if (self.core._borderInfo) {
+        self._borderInfo = self.core._borderInfo;
+      }
+      if (self.core._mapConfig) {
+        self._mapConfig = self.core._mapConfig;
+      }
+      
       self.addEventListeners();
       self.startRenderLoop();
       return self;
@@ -1286,21 +1381,22 @@
    * 获取地图配置信息（包含校准数据）
    */
   KimapSDK.prototype.getConfig = function() {
-    var config = {
-      maxX: this.config.maxX,
-      maxY: this.config.maxY,
-      origin: this.config.origin
-    };
+    var config = {};
+    
+    // 模型尺寸（从边界信息获取，单位：米）
+    if (this._borderInfo) {
+      var border = this._borderInfo;
+      config.mapX = border.max.x - border.min.x;
+      config.mapY = border.max.y - border.min.y;
+      config.mapZ = border.max.z - border.min.z;
+    }
     
-    // 如果有校准数据，一并返回
-    if (this._mapConfig) {
-      config.calibrationData = {
-        isCalibrated: this._mapConfig.isCalibrated || false,
-        calibrationScale: this._mapConfig.calibrationScale,
-        realWidth: this._mapConfig.realWidth,
-        realHeight: this._mapConfig.realHeight,
-        modelToRealScale: this._mapConfig.modelToRealScale
-      };
+    // 如果有校准数据，返回底图真实世界尺寸（单位：米）
+    if (this._mapConfig && this._mapConfig.isCalibrated) {
+      config.isCalibrated = true;
+      config.baseMapWidth = this._mapConfig.realWidth / 100;   // 底图真实宽度（米）
+      config.baseMapHeight = this._mapConfig.realHeight / 100; // 底图真实高度（米）
+      config.modelToRealScale = this._mapConfig.modelToRealScale;
     }
     
     return config;

package/src/KimapCore.js

@@ -1203,25 +1203,22 @@ KimapSDK.prototype.getCoordinateSystem = function() {
  * 获取地图配置信息（包含校准数据）
  */
 KimapSDK.prototype.getConfig = function() {
-  var config = {
-    maxX: this.core.coordinateSystem.maxX,
-    maxY: this.core.coordinateSystem.maxY,
-    origin: {
-      x: this.core.coordinateSystem.origin.x,
-      y: this.core.coordinateSystem.origin.y,
-      z: this.core.coordinateSystem.origin.z
-    }
-  };
+  var config = {};
+  
+  // 模型尺寸（从边界信息获取，单位：米）
+  if (this._borderInfo) {
+    var border = this._borderInfo;
+    config.mapX = border.max.x - border.min.x;
+    config.mapY = border.max.y - border.min.y;
+    config.mapZ = border.max.z - border.min.z;
+  }
   
-  // 如果有校准数据，一并返回
-  if (this._mapConfig) {
-    config.calibrationData = {
-      isCalibrated: this._mapConfig.isCalibrated || false,
-      calibrationScale: this._mapConfig.calibrationScale,
-      realWidth: this._mapConfig.realWidth,
-      realHeight: this._mapConfig.realHeight,
-      modelToRealScale: this._mapConfig.modelToRealScale
-    };
+  // 如果有校准数据，返回底图真实世界尺寸（单位：米）
+  if (this._mapConfig && this._mapConfig.isCalibrated) {
+    config.isCalibrated = true;
+    config.baseMapWidth = this._mapConfig.realWidth / 100;   // 底图真实宽度（米）
+    config.baseMapHeight = this._mapConfig.realHeight / 100; // 底图真实高度（米）
+    config.modelToRealScale = this._mapConfig.modelToRealScale;
   }
   
   return config;