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

2023-05-06 18:25:05 +08:00 · 2023-05-06 18:25:05 +08:00 · 4a9174e8dd
commit 4a9174e8dd
parent 07e9309951 e87897c3ba
105 changed files with 154 additions and 10 deletions
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@ -1617,20 +1617,164 @@
        <m v="OMDB_SPEEDLIMIT">
            <m k="speedFlag">
                <m v="0">
-                    <circle fill="#ffffff" radius="28" scale-radius="true" stroke="#ff0000" stroke-width="4"/>
-                    <m select="any">
-                        <text k="maxSpeed" use="max-speed-limit"></text>
-                        <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="14" stroke="#ffffff"
-                            stroke-width="1.0"></caption>
+<!--                    <circle fill="#ffffff" radius="30" scale-radius="true" stroke="#ff0000" stroke-width="4"/>-->
+<!--                    <text k="maxSpeed" use="max-speed-limit" priority="0"></text>-->
+                    <m k="maxSpeed">
+                        <m v="5">
+                            <symbol src="assets:omdb/1101/1101_5_0.png"></symbol>
+                        </m>
+                        <m v="10">
+                            <symbol src="assets:omdb/1101/1101_10_0.png"></symbol>
+                        </m>
+                        <m v="15">
+                            <symbol src="assets:omdb/1101/1101_15_0.png"></symbol>
+                        </m>
+                        <m v="20">
+                            <symbol src="assets:omdb/1101/1101_20_0.png"></symbol>
+                        </m>
+                        <m v="25">
+                            <symbol src="assets:omdb/1101/1101_25_0.png"></symbol>
+                        </m>
+                        <m v="30">
+                            <symbol src="assets:omdb/1101/1101_30_0.png"></symbol>
+                        </m>
+                        <m v="35">
+                            <symbol src="assets:omdb/1101/1101_35_0.png"></symbol>
+                        </m>
+                        <m v="40">
+                            <symbol src="assets:omdb/1101/1101_40_0.png"></symbol>
+                        </m>
+                        <m v="45">
+                            <symbol src="assets:omdb/1101/1101_45_0.png"></symbol>
+                        </m>
+                        <m v="50">
+                            <symbol src="assets:omdb/1101/1101_50_0.png"></symbol>
+                        </m>
+                        <m v="55">
+                            <symbol src="assets:omdb/1101/1101_55_0.png"></symbol>
+                        </m>
+                        <m v="60">
+                            <symbol src="assets:omdb/1101/1101_60_0.png"></symbol>
+                        </m>
+                        <m v="65">
+                            <symbol src="assets:omdb/1101/1101_65_0.png"></symbol>
+                        </m>
+                        <m v="70">
+                            <symbol src="assets:omdb/1101/1101_70_0.png"></symbol>
+                        </m>
+                        <m v="75">
+                            <symbol src="assets:omdb/1101/1101_75_0.png"></symbol>
+                        </m>
+                        <m v="80">
+                            <symbol src="assets:omdb/1101/1101_80_0.png"></symbol>
+                        </m>
+                        <m v="85">
+                            <symbol src="assets:omdb/1101/1101_85_0.png"></symbol>
+                        </m>
+                        <m v="90">
+                            <symbol src="assets:omdb/1101/1101_90_0.png"></symbol>
+                        </m>
+                        <m v="95">
+                            <symbol src="assets:omdb/1101/1101_95_0.png"></symbol>
+                        </m>
+                        <m v="100">
+                            <symbol src="assets:omdb/1101/1101_100_0.png"></symbol>
+                        </m>
+                        <m v="105">
+                            <symbol src="assets:omdb/1101/1101_105_0.png"></symbol>
+                        </m>
+                        <m v="110">
+                            <symbol src="assets:omdb/1101/1101_110_0.png"></symbol>
+                        </m>
+                        <m v="115">
+                            <symbol src="assets:omdb/1101/1101_115_0.png"></symbol>
+                        </m>
+                        <m v="120">
+                            <symbol src="assets:omdb/1101/1101_120_0.png"></symbol>
+                        </m>
                    </m>
+                    <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
+                        stroke-width="1.0"></caption>
                </m>
                <m v="1">
-                    <circle fill="#ffffff" radius="28" scale-radius="true" stroke="#00ff00" stroke-width="4"/>
-                    <m select="any">
-                        <text k="maxSpeed" use="max-speed-limit"></text>
-                        <caption k="minSpeed" dy="-28" fill="#000000" priority="5" size="14" stroke="#ffffff"
-                            stroke-width="1.0"></caption>
+<!--                    <circle fill="#ffffff" radius="30" scale-radius="true" stroke="#00ff00" stroke-width="4"/>-->
+<!--                    <text k="maxSpeed" use="max-speed-limit"></text>-->
+                    <m k="maxSpeed">
+                        <m v="5">
+                            <symbol src="assets:omdb/1101/1101_5_1.png"></symbol>
+                        </m>
+                        <m v="10">
+                            <symbol src="assets:omdb/1101/1101_10_1.png"></symbol>
+                        </m>
+                        <m v="15">
+                            <symbol src="assets:omdb/1101/1101_15_1.png"></symbol>
+                        </m>
+                        <m v="20">
+                            <symbol src="assets:omdb/1101/1101_20_1.png"></symbol>
+                        </m>
+                        <m v="25">
+                            <symbol src="assets:omdb/1101/1101_25_1.png"></symbol>
+                        </m>
+                        <m v="30">
+                            <symbol src="assets:omdb/1101/1101_30_1.png"></symbol>
+                        </m>
+                        <m v="35">
+                            <symbol src="assets:omdb/1101/1101_35_1.png"></symbol>
+                        </m>
+                        <m v="40">
+                            <symbol src="assets:omdb/1101/1101_40_1.png"></symbol>
+                        </m>
+                        <m v="45">
+                            <symbol src="assets:omdb/1101/1101_45_1.png"></symbol>
+                        </m>
+                        <m v="50">
+                            <symbol src="assets:omdb/1101/1101_50_1.png"></symbol>
+                        </m>
+                        <m v="55">
+                            <symbol src="assets:omdb/1101/1101_55_1.png"></symbol>
+                        </m>
+                        <m v="60">
+                            <symbol src="assets:omdb/1101/1101_60_1.png"></symbol>
+                        </m>
+                        <m v="65">
+                            <symbol src="assets:omdb/1101/1101_65_1.png"></symbol>
+                        </m>
+                        <m v="70">
+                            <symbol src="assets:omdb/1101/1101_70_1.png"></symbol>
+                        </m>
+                        <m v="75">
+                            <symbol src="assets:omdb/1101/1101_75_1.png"></symbol>
+                        </m>
+                        <m v="80">
+                            <symbol src="assets:omdb/1101/1101_80_1.png"></symbol>
+                        </m>
+                        <m v="85">
+                            <symbol src="assets:omdb/1101/1101_85_1.png"></symbol>
+                        </m>
+                        <m v="90">
+                            <symbol src="assets:omdb/1101/1101_90_1.png"></symbol>
+                        </m>
+                        <m v="95">
+                            <symbol src="assets:omdb/1101/1101_95_1.png"></symbol>
+                        </m>
+                        <m v="100">
+                            <symbol src="assets:omdb/1101/1101_100_1.png"></symbol>
+                        </m>
+                        <m v="105">
+                            <symbol src="assets:omdb/1101/1101_105_1.png"></symbol>
+                        </m>
+                        <m v="110">
+                            <symbol src="assets:omdb/1101/1101_110_1.png"></symbol>
+                        </m>
+                        <m v="115">
+                            <symbol src="assets:omdb/1101/1101_115_1.png"></symbol>
+                        </m>
+                        <m v="120">
+                            <symbol src="assets:omdb/1101/1101_120_1.png"></symbol>
+                        </m>
                    </m>
+                    <caption k="minSpeed" dy="-28" fill="#000000" priority="0" size="14" stroke="#ffffff"
+                        stroke-width="1.0"></caption>
                </m>
            </m>
        </m>
--- a/collect-library/src/main/assets/omdb/1101/1101_100_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_100_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_100_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_100_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_100_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_100_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_100_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_100_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_105_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_105_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_105_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_105_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_105_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_105_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_105_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_105_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_10_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_10_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_10_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_10_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_10_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_10_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_10_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_10_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_110_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_110_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_110_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_110_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_110_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_110_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_110_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_110_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_115_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_115_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_115_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_115_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_115_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_115_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_115_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_115_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_120_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_120_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_120_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_120_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_120_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_120_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_120_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_120_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_15_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_15_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_15_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_15_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_15_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_15_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_15_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_15_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_20_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_20_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_20_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_20_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_20_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_20_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_20_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_20_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_25_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_25_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_25_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_25_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_25_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_25_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_25_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_25_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_2_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_2_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_2_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_2_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_2_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_2_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_2_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_2_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_30_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_30_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_30_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_30_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_30_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_30_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_30_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_30_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_35_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_35_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_35_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_35_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_35_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_35_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_35_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_35_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_3_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_3_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_3_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_3_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_3_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_3_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_3_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_3_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_40_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_40_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_40_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_40_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_40_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_40_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_40_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_40_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_45_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_45_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_45_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_45_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_45_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_45_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_45_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_45_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_50_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_50_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_50_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_50_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_50_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_50_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_50_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_50_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_55_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_55_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_55_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_55_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_55_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_55_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_55_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_55_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_5_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_5_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_5_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_5_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_5_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_5_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_5_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_5_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_60_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_60_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_60_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_60_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_60_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_60_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_60_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_60_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_65_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_65_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_65_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_65_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_65_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_65_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_65_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_65_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_70_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_70_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_70_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_70_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_70_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_70_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_70_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_70_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_75_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_75_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_75_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_75_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_75_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_75_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_75_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_75_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_80_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_80_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_80_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_80_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_80_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_80_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_80_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_80_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_85_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_85_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_85_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_85_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_85_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_85_2.png
--- a/collect-library/src/main/assets/omdb/1101/1101_85_3.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_85_3.png
--- a/collect-library/src/main/assets/omdb/1101/1101_90_0.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_90_0.png
--- a/collect-library/src/main/assets/omdb/1101/1101_90_1.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_90_1.png
--- a/collect-library/src/main/assets/omdb/1101/1101_90_2.png
+++ b/collect-library/src/main/assets/omdb/1101/1101_90_2.png
--- a/Show More
+++ b/Show More