Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

2023-08-22 10:09:42 +08:00
parent 06f77dd1cd 7abb32610a
commit 13c2d55159
17 changed files with 77 additions and 11 deletions
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -347,6 +347,7 @@ class ImportOMDBHelper @AssistedInject constructor(
                                            }
                                        }
                                    }else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM2.code){
+                                        Log.e("qj","道路形态2${renderEntity.properties["formOfWay"]}")
                                        /*道路形态2*/
                                        var formWay = renderEntity.properties["formOfWay"]
                                        if(formWay!=null){
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -567,6 +567,7 @@ class ImportPreProcess {
                val intersectionReference = ReferenceEntity()
                intersectionReference.renderEntityId = renderEntity.id
                intersectionReference.name = "${renderEntity.name}参考点"
+                intersectionReference.code = renderEntity.code
                intersectionReference.table = renderEntity.table
                intersectionReference.zoomMin = renderEntity.zoomMin
                intersectionReference.zoomMax = renderEntity.zoomMax