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

Conflicts: app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt vtm
2023-11-10 15:17:37 +08:00
parent bd024342d2 b123fa543f
commit eaeef833ae
14 changed files with 161 additions and 70 deletions
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -633,7 +633,7 @@
        "table": "OMDB_LANE_LINK_LG",
        "code": 5001,
        "name": "车道中心线",
-        "catch": true,
+        "catch": false,
        "isDependOnOtherTable": false,
        "checkLinkId": false,
        "zoomMin": 18,
--- a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt
+++ b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt
@@ -3,6 +3,7 @@ package com.navinfo.omqs.bean
 import android.util.Log
 import com.google.gson.annotations.Expose
 import com.navinfo.collect.library.data.entity.RenderEntity
+import com.navinfo.collect.library.enums.DataCodeEnum
 import com.navinfo.omqs.db.ImportPreProcess
 import io.realm.Realm
 import kotlin.reflect.KFunction
@@ -26,6 +27,10 @@ class ImportConfig {
        if (transformList.isNullOrEmpty()) {
            return renderEntity
        }
+        if(renderEntity.code==DataCodeEnum.OMDB_LANEINFO.code){
+            Log.e("车信","====车信")
+        }
+
        for (transform in transformList) {
            // 开始执行转换
            val key: String = transform.k
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -125,8 +125,7 @@ class ImportPreProcess {
        ) * Math.sin(radian)

        // 计算偏移后的点
-        val coord =
-            Coordinate(point.getX() + dy, point.getY() - dx)
+        val coord = Coordinate(point.getX() + dy, point.getY() - dx)

        // 记录偏移后的点位或线数据，如果数据为线时，记录的偏移后数据为最后一个点右移后，方向与线的最后两个点平行同向的单位向量
        if (Geometry.TYPENAME_POINT == geometry?.geometryType) {
@@ -193,12 +192,11 @@ class ImportPreProcess {
        ) * Math.sin(radian)

        // 计算偏移后的点
-        val coord =
-            Coordinate(point.getX() - dx, point.getY() - dy)
+        val coord = Coordinate(point.getX() - dx, point.getY() - dy)

        // 将这个点记录在数据中
-        val geometryTranslate: Geometry =
-            GeometryTools.createGeometry(doubleArrayOf(coord.x, coord.y))
+        val geometryTranslate: Geometry = GeometryTools.createGeometry(doubleArrayOf(coord.x, coord.y))
+
        renderEntity.geometry = geometryTranslate.toString()
    }

@@ -655,10 +653,20 @@ class ImportPreProcess {
                    Log.d("unpackingLaneInfo", referenceEntity.properties["symbol"].toString())
                    referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
                    renderEntity.referenceEntitys?.add(referenceEntity)
-                   //listResult.add(referenceEntity)
+                    Log.e("qj", "车信===插入车信箭头")
+                    //listResult.add(referenceEntity)
                }
                //insertData(listResult)
            }
+            //将主表线转化为单个点，按点要素实现捕捉
+            if (Geometry.TYPENAME_LINESTRING == renderEntity.wkt?.geometryType) {
+                var coordinates = renderEntity.wkt?.coordinates
+                if(coordinates!=null){
+                    val p1: Coordinate = coordinates[0]
+                    renderEntity.geometry = GeometryTools.createGeometry(GeoPoint(p1.y,p1.x)).toString()
+                }
+            }
+
        }
    }

@@ -1219,6 +1227,7 @@ class ImportPreProcess {
    private fun createZLevelReference(renderEntity: RenderEntity): ReferenceEntity {
        val zLevelReference = ReferenceEntity()
 //        zLevelReference.renderEntityId = renderEntity.id
+        //zLevelReference.renderEntityId = renderEntity.id
        zLevelReference.name = "${renderEntity.name}参考点"
        zLevelReference.code = renderEntity.code
        zLevelReference.table = renderEntity.table
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
@@ -16,8 +16,6 @@ import androidx.activity.viewModels
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.viewModelScope
-import androidx.navigation.Navigation
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -25,6 +23,7 @@ import com.blankj.utilcode.util.ClipboardUtils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.tabs.TabLayout
 import com.navinfo.collect.library.data.entity.RenderEntity
+import com.navinfo.collect.library.enums.DataCodeEnum
 import com.navinfo.collect.library.map.NIMapController
 import com.navinfo.collect.library.map.handler.MeasureLayerHandler
 import com.navinfo.collect.library.utils.DeflaterUtil
@@ -48,17 +47,13 @@ import com.navinfo.omqs.ui.other.BaseToast
 import com.navinfo.omqs.ui.widget.RecyclerViewSpacesItemDecoration
 import com.navinfo.omqs.util.FlowEventBus
 import com.navinfo.omqs.util.NaviStatus
-import com.navinfo.omqs.util.SignUtil
 import com.navinfo.omqs.util.SpeakMode
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.oscim.core.GeoPoint
 import org.oscim.renderer.GLViewport
 import org.videolan.vlc.Util
-import sun.misc.BASE64Decoder
-import sun.misc.BASE64Encoder
 import java.math.BigDecimal
 import java.math.RoundingMode
 import javax.inject.Inject
@@ -824,6 +819,25 @@ class MainActivity : BaseActivity() {
     * zoomOut
     */
    fun zoomOutOnclick(view: View) {
+        val result = mutableListOf<RenderEntity>()
+        for (i in 0 until 10) {
+            var renderEntity: RenderEntity = RenderEntity()
+            renderEntity.geometry = "POINT(116.2694${i}13016946 40.0844${i}5791644373 0)"
+            result.add(renderEntity)
+        }
+        //计算后
+        var index = 0
+        Log.e("qj","====计算开始")
+        var lastRender:RenderEntity = RenderEntity()
+        GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.code,result, 5.0)?.forEach {
+            if(lastRender!=null&&lastRender.geometry!=null&& lastRender.geometry != ""){
+                if(it.geometry!=lastRender.geometry){
+                    Log.e("qj","${index++}====计算后"+it.geometry)
+                }
+            }
+            lastRender = it
+        }
+        Log.e("qj","====计算结束")
        mapController.animationHandler.zoomOut()
    }

--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -64,7 +64,7 @@
        <item
            android:id="@+id/personal_center_menu_version"
            android:icon="@drawable/ic_baseline_layers_24"
-            android:title="版本：23QE4_V1.5.7_20231011_A" />
+            android:title="版本：23QE4_V1.5.8_20231103_A" />
    </group>
    <group android:checkableBehavior="single">
        <item android:title="小标题">