Browse Source

兼容国际瓦片图

tianboguang 2 years ago
parent
commit
13e6117331

+ 31 - 0
4dkankan-utils-model/src/main/java/com/fdkankan/model/enums/ModelTypeEnums.java

@@ -0,0 +1,31 @@
+package com.fdkankan.model.enums;
+
+public enum ModelTypeEnums {
+
+    TILE( "tile","瓦片图", 3);
+
+    public static final String TILE_CODE = "tile";
+
+
+    private String desc;
+    private String code;
+    private int sceneSchema;
+
+    ModelTypeEnums(String code, String desc, int sceneSchema) {
+        this.code = code;
+        this.desc = desc;
+        this.sceneSchema = sceneSchema;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public int getSceneSchema() {
+        return sceneSchema;
+    }
+}

+ 11 - 1
4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/ComputerUtil.java

@@ -10,6 +10,7 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
+import com.fdkankan.model.enums.ModelTypeEnums;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,7 +18,6 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 /**
  * 生成场景和计算场景
@@ -291,6 +291,16 @@ public class ComputerUtil {
                 dataDescribe = "old slam";
             }
         }
+        if (!ObjectUtils.isEmpty(fdageData) && !ObjectUtils.isEmpty(fdageData.getString("modelType"))) {
+            switch (fdageData.getString("modelType")){
+                case ModelTypeEnums.TILE_CODE:
+                    if(skyboxType.equals("SKYBOX_V6")){
+                        skyboxType = "SKYBOX_V14";
+                    }else{
+                        skyboxType = "SKYBOX_V13";
+                    }
+            }
+        }
         map.put("splitType", splitType);
         map.put("skyboxType", skyboxType);
         map.put("dataDescribe", dataDescribe);