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

fix: 合并代码

Browse Source
This commit is contained in:
xiaoyan 2023-11-27 15:11:57 +08:00
commit fa4cf3d251
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,7 +362,7 @@
"zoomMax": 20, "zoomMax": 20,
"is3D": true, "is3D": true,
"catch": true, "catch": true,
"checkLinkId": false, "checkLinkId": true,
"transformer": [ "transformer": [
{ {
"k": "geometry", "k": "geometry",
@ -712,7 +712,7 @@
"name": "车信", "name": "车信",
"catch": true, "catch": true,
"isDependOnOtherTable": false, "isDependOnOtherTable": false,
"checkLinkId": false, "checkLinkId": true,
"zoomMin": 15, "zoomMin": 15,
"zoomMax": 17, "zoomMax": 17,
"transformer": [ "transformer": [

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

@ -837,15 +837,13 @@ class ImportPreProcess {
0,1,2->{ 0,1,2->{
if (medianWidth != null) { if (medianWidth != null) {
angleReference.geometry = angleReference.geometry =
GeometryTools.computeLine(medianWidth/100000000, 0.0, renderEntity.geometry) GeometryTools.computeLine(0.000012, 0.0, renderEntity.geometry)
Log.e("qj","width==${medianWidth/100000000}")
} }
} }
3->{ 3->{
if (medianWidth != null) { if (medianWidth != null) {
angleReference.geometry = angleReference.geometry =
GeometryTools.computeLine(0.0, medianWidth/100000000, renderEntity.geometry) GeometryTools.computeLine(0.0, 0.000012, renderEntity.geometry)
Log.e("qj","width==${medianWidth/100000000}")
} }
} }
} }

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

@ -1653,7 +1653,7 @@
</m> </m>
<!--墙--> <!--墙-->
<m k="boundaryType" v="5"> <m k="boundaryType" v="5">
<line stroke="#495462" use="boundaryType" width="0.2"/> <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
</m> </m>
<!--铺设路面边缘--> <!--铺设路面边缘-->
<m k="boundaryType" v="6"> <m k="boundaryType" v="6">
@ -1680,7 +1680,7 @@
</m> </m>
<!--墙--> <!--墙-->
<m k="boundaryType" v="5"> <m k="boundaryType" v="5">
<line stroke="#495462" use="boundaryType" width="0.2"/> <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
</m> </m>
<!--铺设路面边缘--> <!--铺设路面边缘-->
<m k="boundaryType" v="6"> <m k="boundaryType" v="6">
@ -1939,12 +1939,12 @@
<m k="speedFlag" v="0"> <m k="speedFlag" v="0">
<!-- <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"--> <!-- <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"-->
<!-- stroke-width="1.0"></caption>--> <!-- stroke-width="1.0"></caption>-->
<symbol background="assets:omdb/icon_4002_0.png" symbol-width="24" content-rect="20,80,20,60" src="@text-src"></symbol> <symbol background="assets:omdb/icon_4002_0.png" symbol-width="24" content-rect="20,80,32,80" src="@text-src"></symbol>
</m> </m>
<m k="speedFlag" v="1"> <m k="speedFlag" v="1">
<!-- <caption fill="#000000" k="maxSpeed" priority="0" size="10" stroke="#ffffff"--> <!-- <caption fill="#000000" k="maxSpeed" priority="0" size="10" stroke="#ffffff"-->
<!-- stroke-width="1.0"></caption>--> <!-- stroke-width="1.0"></caption>-->
<symbol background="assets:omdb/icon_4002_1.png" symbol-width="24" content-rect="20,80,20,60" src="@text-src"></symbol> <symbol background="assets:omdb/icon_4002_1.png" symbol-width="24" content-rect="20,80,32,80" src="@text-src"></symbol>
</m> </m>
<m k="type" v="angle"> <m k="type" v="angle">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="24" <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="24"

2
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java
View File

@ -91,7 +91,7 @@ public class OMDBDataDecoder extends TileDecoder {
} }
}); });
//增加交通标牌聚合显示 //增加交通标牌聚合显示
List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 3.0); List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 5.0);
if (list1 != null && list1.size() > 0) { if (list1 != null && list1.size() > 0) {
Log.e("qj", "聚合交通标牌转换开始" + list.size()); Log.e("qj", "聚合交通标牌转换开始" + list.size());
list1.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() { list1.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {