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

merge code

Browse Source
This commit is contained in:
qiji4215 2023-09-28 10:16:00 +08:00
parent 37de10fe89
commit c101490242
6 changed files with 7 additions and 9 deletions
app/src/main
assets
omdb_config.json
java/com/navinfo/omqs/db
ImportPreProcess.kt
res/menu
personal_center_menu.xml
collect-library/src/main
assets
editormarker.xml
java/com/navinfo/collect/library/utils
GeometryTools.java
vtm

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

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

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

@ -582,7 +582,7 @@ class ImportPreProcess {
angleReference.renderEntityId = renderEntity.id angleReference.renderEntityId = renderEntity.id
angleReference.name = "${renderEntity.name}车道中线面" angleReference.name = "${renderEntity.name}车道中线面"
angleReference.table = renderEntity.table 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["qi_table"] = renderEntity.table
angleReference.properties["widthProperties"] = "3" angleReference.properties["widthProperties"] = "3"
angleReference.zoomMin = renderEntity.zoomMin angleReference.zoomMin = renderEntity.zoomMin

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

@ -59,7 +59,7 @@
<item <item
android:id="@+id/personal_center_menu_version" android:id="@+id/personal_center_menu_version"
android:icon="@drawable/ic_baseline_layers_24" 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>
<group android:checkableBehavior="single"> <group android:checkableBehavior="single">
<item android:title="小标题"> <item android:title="小标题">

3
collect-library/src/main/assets/editormarker.xml

@ -1587,9 +1587,6 @@
<!--车道中心线--> <!--车道中心线-->
<m v="OMDB_LANE_LINK_LG"> <m v="OMDB_LANE_LINK_LG">
<!--
<line stroke="#7A88A0" width="2.5" />
-->
<m k="widthProperties"> <m k="widthProperties">
<area use="obj-area" stroke="#7A88A0" repeat="true" src="assets:omdb/icon_5001_0.png" longEdge="t"></area> <area use="obj-area" stroke="#7A88A0" repeat="true" src="assets:omdb/icon_5001_0.png" longEdge="t"></area>
</m> </m>

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

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

2
vtm

@ -1 +1 @@
Subproject commit 271e7b22785b0570a34c50476e17a98dfcca7e71 Subproject commit c31554d80a4e8a16e90dfc00911478ab5897e674