xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiaoyan 2023-09-21 15:50:50 +08:00
commit 0c416fec0d
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
View File

@ -65,7 +65,7 @@ class RealmOperateHelper() {
val realm = getSelectTaskRealmInstance() val realm = getSelectTaskRealmInstance()
val realmList = val realmList =
getSelectTaskRealmTools(RenderEntity::class.java, false) getSelectTaskRealmTools(RenderEntity::class.java, false)
.equalTo("table", "OMDB_RD_LINK_KIND") .equalTo("table", DataCodeEnum.OMDB_LINK_DIRECT.name)
.greaterThanOrEqualTo("tileX", xStart) .greaterThanOrEqualTo("tileX", xStart)
.lessThanOrEqualTo("tileX", xEnd) .lessThanOrEqualTo("tileX", xEnd)
.greaterThanOrEqualTo("tileY", yStart) .greaterThanOrEqualTo("tileY", yStart)

11
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
View File

@ -743,6 +743,7 @@ class MainViewModel @Inject constructor(
if (linkList.isNotEmpty()) { if (linkList.isNotEmpty()) {
val link = linkList[0] val link = linkList[0]
val linkId = link.properties[RenderEntity.Companion.LinkTable.linkPid] val linkId = link.properties[RenderEntity.Companion.LinkTable.linkPid]
//看板数据 //看板数据
val signList = mutableListOf<SignBean>() val signList = mutableListOf<SignBean>()
@ -752,9 +753,14 @@ class MainViewModel @Inject constructor(
if (bSelectRoad) if (bSelectRoad)
mapController.markerHandle.addMarker(point, "selectLink") mapController.markerHandle.addMarker(point, "selectLink")
mapController.lineHandler.showLine(link.geometry) mapController.lineHandler.showLine(link.geometry)
val lineString: Geometry = GeometryTools.createGeometry(link.geometry)
val footAndDistance = GeometryTools.pointToLineDistance(point, lineString)
val linePoints = GeometryTools.getGeoPoints(link.geometry) val linePoints = GeometryTools.getGeoPoints(link.geometry)
val direct = link.properties["direct"]
if(direct == "3"){
linePoints.reverse()
}
val footAndDistance = GeometryTools.pointToLineDistance(point, GeometryTools.createLineString(linePoints))
linePoints.add( linePoints.add(
footAndDistance.footIndex + 1, footAndDistance.footIndex + 1,
GeoPoint( GeoPoint(
@ -762,6 +768,7 @@ class MainViewModel @Inject constructor(
footAndDistance.getCoordinate(0).x footAndDistance.getCoordinate(0).x
) )
) )
val newLineString = GeometryTools.createLineString(linePoints) val newLineString = GeometryTools.createLineString(linePoints)
linkId?.let { linkId?.let {
var elementList = realmOperateHelper.queryLinkByLinkPid(it) var elementList = realmOperateHelper.queryLinkByLinkPid(it)

4
app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
View File

@ -1631,8 +1631,8 @@ class SignUtil {
} else if (itemGeometry is LineString) { } else if (itemGeometry is LineString) {
val itemFoot = GeometryTools.pointToLineDistance( val itemFoot = GeometryTools.pointToLineDistance(
GeoPoint( GeoPoint(
lineString.coordinates[0].y, lineString.coordinates[lineString.coordinates.size-1].y,
lineString.coordinates[0].x lineString.coordinates[lineString.coordinates.size-1].x
), lineString ), lineString
) )
var dis = GeometryTools.getDistance( var dis = GeometryTools.getDistance(