@kimap/indoor-positioning-sdk-vue2 4.1.7 → 4.2.0

package/package.json

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

package/src/core/KimapSDK.js

@@ -524,6 +524,9 @@ KimapSDK.prototype.getCoordinateSystem = function() {
 KimapSDK.prototype.getConfig = function() {
   var config = {};
   
+  console.log('[getConfig] _mapConfig:', this._mapConfig);
+  console.log('[getConfig] _borderInfo:', this._borderInfo);
+  
   // 从coordinateSystem获取scale
   if (this.core && this.core.coordinateSystem) {
     var coordSys = this.core.coordinateSystem;
@@ -553,13 +556,16 @@ KimapSDK.prototype.getConfig = function() {
     // modelToRealScale: 模型尺寸与真实尺寸的比例
     if (this._mapConfig.modelToRealScale) {
       config.modelToRealScale = this._mapConfig.modelToRealScale;
+      console.log('[getConfig] 使用_mapConfig中的modelToRealScale:', config.modelToRealScale);
     } else if (config.mapX && this._mapConfig.realWidth) {
       // 如果没有直接提供modelToRealScale,根据模型尺寸和真实尺寸计算
       // modelToRealScale = 模型宽度(米) / 真实宽度(米)
       config.modelToRealScale = config.mapX / (this._mapConfig.realWidth / 100);
+      console.log('[getConfig] 计算modelToRealScale:', config.modelToRealScale, '= mapX:', config.mapX, '/ realWidth:', this._mapConfig.realWidth / 100);
     } else {
       // 默认值
       config.modelToRealScale = 1.0;
+      console.log('[getConfig] 使用默认modelToRealScale: 1.0');
     }
     
     // 添加完整的mapConfig数据
@@ -570,6 +576,7 @@ KimapSDK.prototype.getConfig = function() {
     config.isCalibrated = false;
     // 默认modelToRealScale为1.0(模型单位=真实单位)
     config.modelToRealScale = 1.0;
+    console.log('[getConfig] 没有校准数据,使用默认modelToRealScale: 1.0');
   }
   
   return config;

package/src/core/SceneCore.js

@@ -202,8 +202,8 @@ SceneCore.prototype.addCoordinateHelper = function() {
   var origin = this.coordinateSystem.origin;
   var maxX = this.coordinateSystem.maxX;
   var maxY = this.coordinateSystem.maxY;
-  var showGrid = this.config.showGrid !== false;
-  var showAxes = this.config.showAxes !== false;
+  var showGrid = this.config.showGrid === true;
+  var showAxes = this.config.showAxes === true;
   
   if (showGrid) {
     var gridSize = Math.max(maxX, maxY) * 1.5;

package/src/core/parsers.js

@@ -40,30 +40,49 @@ function extractBorderFromOBJ(objContent) {
 /**
  * 从OBJ内容中提取地图配置信息
  * 格式示例:
+ * # KIMAP_CONFIG_IS_CALIBRATED true
+ * # KIMAP_CONFIG_CALIBRATION_SCALE 1.0
+ * # KIMAP_CONFIG_REAL_WIDTH 1000.0
+ * # KIMAP_CONFIG_REAL_HEIGHT 800.0
  * # KIMAP_CONFIG_MODEL_TO_REAL_SCALE 2.0000
  */
 function extractMapConfigFromOBJ(objContent) {
   var config = {
     isCalibrated: false,
-    modelToRealScale: 1.0,
-    realToModelScale: 1.0
+    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_IS_CALIBRATED') === 0) {
-      var value = line.split(' ')[2];
-      config.isCalibrated = (value === '1' || value.toLowerCase() === 'true');
-    } else if (line.indexOf('# KIMAP_CONFIG_MODEL_TO_REAL_SCALE') === 0) {
+    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]);
-      config.realToModelScale = 1.0 / config.modelToRealScale;
+    }
+    
+    // 只在遇到 End Config Info 时停止
+    if (line.indexOf('End Config Info') !== -1) {
+      break;
     }
   }
   
-  return config;
+  console.log('[Parsers] 提取到的地图配置:', config);
+  
+  return foundConfig ? config : null;
 }
 
 /**