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

fix: 合并代码

Browse Source
This commit is contained in:
xiaoyan
2023-09-28 14:32:03 +08:00
parent fb789814d3 0627f1917f
commit b04142fd5d
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/assets/omdb_config.json
View File

@@ -49,7 +49,7 @@
"code": 2008,
"name": "道路种别",
"zoomMin": 15,
"zoomMax": 20,
"zoomMax": 17,
"catch":false,
"checkLinkId": false
},

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

@@ -346,7 +346,7 @@ class ImportOMDBHelper @AssistedInject constructor(
renderEntity.properties["boundaryType"]
if (boundaryType != null) {
when (boundaryType.toInt()) {
0, 1, 5, 7, 9 -> {
0, 1,3,4, 5, 7, 9 -> {
renderEntity.enable = 0
Log.e(
"qj",

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

@@ -582,7 +582,7 @@ class ImportPreProcess {
angleReference.renderEntityId = renderEntity.id
angleReference.name = "${renderEntity.name}车道中线面"
angleReference.table = renderEntity.table
angleReference.geometry = GeometryTools.computeLine(0.00003,0.00003,renderEntity.geometry)
angleReference.geometry = GeometryTools.createGeometry(renderEntity.geometry).buffer(0.000035).toString()//GeometryTools.computeLine(0.000035,0.000035,renderEntity.geometry)
angleReference.properties["qi_table"] = renderEntity.table
angleReference.properties["widthProperties"] = "3"
angleReference.zoomMin = renderEntity.zoomMin

2
app/src/main/res/menu/personal_center_menu.xml
View File

@@ -59,7 +59,7 @@
<item
android:id="@+id/personal_center_menu_version"
android:icon="@drawable/ic_baseline_layers_24"
android:title="版本：23QE4_V1.5.4_20230926_A" />
android:title="版本：23QE4_V1.5.5_20230927_A" />
</group>
<group android:checkableBehavior="single">
<item android:title="小标题">

5
collect-library/src/main/assets/editormarker.xml
View File

@@ -1587,9 +1587,6 @@
<!--车道中心线-->
<m v="OMDB_LANE_LINK_LG">
<!--
<line stroke="#7A88A0" width="2.5" />
-->
<m k="widthProperties">
<area use="obj-area" stroke="#7A88A0" repeat="true" src="assets:omdb/icon_5001_0.png" longEdge="t"></area>
</m>
@@ -2023,7 +2020,7 @@
<!-- 箭头 -->
<m v="OMDB_OBJECT_ARROW">
<area use="obj-area" stroke="#00000000" repeat="false" src="@src" longEdge="n" hasDirect="true"></area>
<area use="obj-area" stroke="#ffffff" repeat="false" src="@src" longEdge="n" hasDirect="true"></area>
</m>
<!-- 道路施工 -->

5
collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java
View File

@@ -1509,7 +1509,7 @@ public class GeometryTools {
/**
* @param distLeft 单位km
* @param distLeft 0.00001为一米
* @param distRight 单位km
* @param wkt 几何
* @return
@@ -1518,7 +1518,8 @@ public class GeometryTools {
if(!TextUtils.isEmpty(wkt)){
Geometry lineString1 = GeometryTools.createGeometry(wkt);
BufferParameters parameters1 = new BufferParameters();
parameters1.setEndCapStyle(BufferParameters.CAP_FLAT);
parameters1.setJoinStyle(BufferParameters.DEFAULT_QUADRANT_SEGMENTS);
parameters1.setEndCapStyle(BufferParameters.DEFAULT_QUADRANT_SEGMENTS);
parameters1.setSingleSided(true);
Geometry buffer = BufferOp.bufferOp(lineString1, distLeft, parameters1);