fix: 添加导流区纹理

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

@@ -191,6 +191,11 @@ class ImportOMDBHelper @AssistedInject constructor(
                                         else -> renderEntity.properties.put(key, value.toString())
                                     }
                                 }
+
+                                // 如果properties中不包含name，那么自动将要素名称添加进properties中
+                                if (!renderEntity.properties.containsKey("name")) {
+                                    renderEntity.properties["name"] = renderEntity.name;
+                                }
                                 //遍历判断只显示与任务Link相关的任务数据
                                 if(currentConfig.checkLinkId){
 

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

@@ -54,6 +54,9 @@
     <style-text fill="#000000" id="max-speed-limit" k="name" size="18" stroke="#000000"
         stroke-width="0.1" />
 
+    <style-text caption="true" fill="#2d51bc" font-family="black" id="area-name"
+        k="name" size="12" stroke="#ffffff" stroke-width="0.4" />
+
     <!--###### AREA styles ######-->
 
     <!--residential-->
@@ -2272,7 +2275,8 @@
 
         <!-- 导流区 -->
         <m v="OMDB_FILL_AREA">
-            <area use="obj-area" repeat="false" src="@text:人行横道"></area>
+            <area use="obj-area" repeat="false" src="assets:omdb/tex_fill_area_with_text_3012.png"></area>
+            <text use="area-name"></text>
         </m>
     </m>
 </rendertheme>

collect-library/src/main/assets/omdb/tex_fill_area_3012.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="132.4" height="362.8" viewBox="0 0 132.4 362.8"><defs><style>.d{fill:#fff;}.e{fill:#ffd4ca;opacity:0;}</style></defs><g id="c"><g><rect class="e" x="-115.2" y="115.3" width="362.8" height="132.2" transform="translate(-115.2 247.6) rotate(-90)"/><g><polygon class="d" points="132.4 67.1 132.3 67 132.3 67.2 132.4 67.1"/><polygon class="d" points="0 67 0 67.1 0 66.9 0 67"/><polygon class="d" points="66.2 16.1 124.8 74.7 132.3 67.2 132.3 67 73.8 8.4 73.8 8.4 66.2 .8 0 66.9 0 67.1 7.6 74.6 66.2 16.1"/><polygon class="d" points="0 138.9 0 139 0 138.8 0 138.9"/><polygon class="d" points="132.4 138.9 132.3 138.8 132.3 139 132.4 138.9"/><polygon class="d" points="66.2 87.9 124.8 146.5 132.3 139 132.3 138.8 73.8 80.3 73.8 80.3 66.2 72.7 0 138.8 0 139 7.6 146.5 66.2 87.9"/><polygon class="d" points="0 210.7 0 210.8 0 210.6 0 210.7"/><polygon class="d" points="132.4 210.7 132.3 210.6 132.3 210.8 132.4 210.7"/><polygon class="d" points="89.2 182.7 124.8 218.3 132.3 210.8 132.3 210.6 89.2 167.5 89.2 182.7"/><polygon class="d" points="45.6 180.4 45.6 165.1 0 210.6 0 210.8 7.6 218.3 45.6 180.4"/><polygon class="d" points="132.4 282.6 132.3 282.5 132.3 282.7 132.4 282.6"/><polygon class="d" points="0 282.5 0 282.6 0 282.4 0 282.5"/><polygon class="d" points="65.4 232.4 50.1 232.4 0 282.4 0 282.6 7.6 290.2 65.4 232.4"/><polygon class="d" points="67 232.4 124.8 290.2 132.3 282.7 132.3 282.5 82.3 232.4 67 232.4"/><polygon class="d" points="0 354.4 0 354.5 0 354.3 0 354.4"/><polygon class="d" points="132.4 354.4 132.3 354.3 132.3 354.5 132.4 354.4"/><polygon class="d" points="73.8 295.8 66.2 288.2 0 354.3 0 354.5 7.6 362 66.2 303.4 124.8 362 132.3 354.5 132.3 354.3 73.8 295.8 73.8 295.8"/><path class="e" d="M72.3,202.8h-8.4c1.3,1.2,3.1,2.8,4.9,4.5,1.3-1.4,2.4-2.9,3.5-4.5Z"/><path class="e" d="M61.8,204.9l2-2.1h-2.4v11c2-1.3,3.8-2.8,5.4-4.4-1.8-1.8-3.6-3.5-5-4.6Z"/><polygon class="e" points="72.5 166.1 70.8 164.3 71.1 166.1 72.5 166.1"/><path class="e" d="M68.9,211.6c-1.8,1.8-3.8,3.3-5.8,4.7l-1.8-2.3v2.4h4.9c0-.1,.1,0,.1,0h7.1c-1.1-1.4-2.8-3.1-4.5-4.9Z"/><rect class="e" x="62.2" y="129.5" width="9.9" height="1.6"/><path class="e" d="M63.6,135.4c3,.1,5.7,0,8.7,0,1.6,0,1.8-.3,2-1.3v-.6c.1,0-12.1,0-12.1,0v.6c0,1.1,.2,1.3,1.4,1.4Z"/><path class="e" d="M69.5,144.6c1.4,0,1.5-.3,1.5-1.8v-1h-7.1c1.1,.7,2.2,1.5,2.9,2l-.5,.7,2.3,2.3-.7-2.2h1.7Z"/><polygon class="e" points="65.4 232.4 67 232.4 66.2 231.6 65.4 232.4"/><polygon class="d" points="66.1 216.4 66.3 216.4 66.2 216.3 66.1 216.4"/><path class="d" d="M62.7,137.8c3.7,0,7.1,0,10.8,0,2.5,0,2.9-.2,3.4-2.3,0-.4,.1-.8,.2-1.3l-2-.7v-6.7h-15.8v7.9c0,2.5,.9,3.1,3.4,3.1Zm-.6-8.4h9.9v1.6h-9.9v-1.6Zm0,4h12.2v.6c-.3,1-.4,1.2-2.1,1.3-3.1,0-5.7,.1-8.7,0-1.2,0-1.4-.3-1.4-1.4v-.6Z"/><path class="d" d="M74,143.7v-1.9h3.6v-2.6h-3.6v-1.1h-3c0,0,0,1.1,0,1.1h-13.6v2.6h4.3l-.8,1c1.3,.8,2.9,2,3.9,2.9l1.3-1.3h.1c0,.1,.5-.6,.5-.6-.7-.6-1.8-1.4-2.9-2h7.1v1c0,1.5,0,1.7-1.5,1.8h-1.7c0,0,.7,2.2,.7,2.2l.5,.5h1.5c2.8-.4,3.4-.9,3.4-3.6Z"/><polygon class="d" points="68.8 147.4 69.1 147.4 68.6 146.9 68.8 147.4"/><path class="d" d="M64.9,145.8c.1,.1,.3,.2,.4,.3l1-1.6h-.1c0-.1-1.3,1.2-1.3,1.2Z"/><path class="d" d="M75.9,180.3c0,.4,0,.8,0,1.1,0,.6-.1,.7-.4,.8-.2,0-.4,0-.6,0-.3,0-.3-.2-.3-.8v-6.4h-2.6c0-.1,0,7,0,7,0,1.7,0,2.6,1.7,2.8,.8,0,2,0,2.3,0,1.8-.2,2-.5,2.3-2.6,0-.4,0-.7,.1-1.1v-.7s-2.3-.7-2.3-.7v.6Z"/><path class="d" d="M68.1,166.1h-4.6v2.7h3.1c-1.1,1.3-2.2,2.4-2.7,2.9-.3,.2-.5,.4-1.1,.5l.7,2.4h2.2c2.2-.2,6.2-.4,8.4-.5,.4,.5,.7,.9,.9,1.3l2-1.9c-1.4-2.1-3-3.7-3.8-4.5l-2,1.4c.3,.3,.6,.7,1.1,1.2-1.8,0-3.7,.1-5.2,.2,.6-.4,1.9-1.7,3-3h5.1l-2.7-2.7h-1.4l-.3-1.8-.5-.5h-2.7c0,.1,.5,2.3,.5,2.3Z"/><path class="d" d="M63.1,167c-.4-.4-1.5-1.2-2.4-1.9l-2,2c.9,.7,2.2,1.7,2.8,2.3l1.5-2.4Z"/><path class="d" d="M62.5,172.4c-1.1-1-3.1-2.4-4.1-3.1l-1.5,2.3c1.3,.9,2.4,1.8,4.1,3.2l1.5-2.4Z"/><path class="d" d="M60.9,183.6l2.1,1.9c3.2-2.9,3.8-3.2,3.8-10.4h-2.6c0,4.8,0,6.1-3.2,8.5Z"/><path class="d" d="M60,175.7c-.8,2.5-1.7,5.1-3,7.7l2.8,1.4c1.2-3,1.9-5.5,2.7-8l-2.4-1.1Z"/><polygon class="d" points="68 184.4 70.6 184.4 70.6 175 68 174.9 68 184.4"/><polygon class="d" points="70.7 163.8 70.3 163.8 70.8 164.3 70.7 163.8"/><path class="d" d="M59.3,164.2l-1.6,2.2c.2,.1,.6,.4,1,.8l2-2c-.6-.4-1.2-.8-1.4-1Z"/><polygon class="d" points="76.8 168.8 76.8 166.1 72.5 166.1 75.2 168.8 76.8 168.8"/><path class="d" d="M61.4,216.4v-2.4l1.8,2.3c2-1.4,4-2.9,5.8-4.7,1.7,1.8,3.3,3.5,4.5,4.9h-7.1l2.9,2.9h7.7v-2.9h-3.2l2.1-2.2c-1.2-1.3-2.9-3-4.7-4.8,1.5-1.6,2.8-3.3,4-5l-2.2-1.6h3.7v-2.9h-18.3v19.5h5l2.9-2.9h-4.7Zm11-13.7c-1.1,1.6-2.2,3.1-3.5,4.5-1.8-1.7-3.5-3.3-4.9-4.5h8.4Zm-11,0h2.4l-2,2.1c1.3,1.1,3.1,2.7,5,4.6-1.6,1.6-3.4,3-5.4,4.4v-11Z"/><polygon class="d" points="66.3 216.4 66.1 216.4 63.2 219.3 69.2 219.3 66.3 216.4"/></g></g></g></svg>