From 554452ddc97a8052452fa3c06d7e22c27513f3f9 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 25 Aug 2023 15:42:13 +0800 Subject: [PATCH 1/5] merge code --- vtm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtm b/vtm index c6a242fa..46142c01 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit c6a242fab870bc5b1b0e62856afc6350abe5ff3c +Subproject commit 46142c01c32056db6a661aad7e565c3c607c372f From d346dc1d4c61a7e5a662f3e768b512859f793e59 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 25 Aug 2023 17:24:30 +0800 Subject: [PATCH 2/5] merge code --- vtm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtm b/vtm index 46142c01..651069c5 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit 46142c01c32056db6a661aad7e565c3c607c372f +Subproject commit 651069c58a2e3e5d0dc72b225baffbca59f0bf50 From 7994ae611ab4e5b6179790fcbdf6e80471948dee Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 25 Aug 2023 17:41:16 +0800 Subject: [PATCH 3/5] merge code --- app/src/main/assets/omdb_config.json | 9 ++++++++- .../main/java/com/navinfo/omqs/db/ImportPreProcess.kt | 2 -- collect-library/src/main/assets/editormarker.xml | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 08bf4e2b..6f61e995 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -158,7 +158,14 @@ "name": "隧道", "zoomMin": 15, "zoomMax": 20, - "transformer2Code": "" + "transformer": [ + { + "k": "geometry", + "v": "~", + "klib": "geometry", + "vlib": "generateS2EReferencePoint()" + } + ] }, "3005":{ "table": "OMDB_TRAFFIC_SIGN", diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index 1a62c9b0..e32176e6 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -225,7 +225,6 @@ class ImportPreProcess { // 起点坐标 startReference.geometry = GeometryTools.createGeometry(GeoPoint(pointStart.y, pointStart.x)).toString() - startReference.properties = renderEntity.properties startReference.properties["qi_table"] = renderEntity.table Log.e("qj","generateS2EReferencePoint===$table===$proKey") if (renderEntity.table == table) { @@ -258,7 +257,6 @@ class ImportPreProcess { // 终点坐标 endReference.geometry = GeometryTools.createGeometry(GeoPoint(pointEnd.y, pointEnd.x)).toString() - endReference.properties = renderEntity.properties endReference.properties["qi_table"] = renderEntity.table if (renderEntity.table == table) { if (renderEntity.properties.containsKey(proKey)) { diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index c58d6192..89267a6f 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2163,7 +2163,7 @@ - + Date: Mon, 28 Aug 2023 09:30:15 +0800 Subject: [PATCH 4/5] merge code --- app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index fc941920..4be80621 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -443,6 +443,8 @@ class ImportPreProcess { referenceEntity.table = renderEntity.table referenceEntity.enable = renderEntity.enable referenceEntity.taskId = renderEntity.taskId + referenceEntity.zoomMin = renderEntity.zoomMin + referenceEntity.zoomMax = renderEntity.zoomMax // 与原数据使用相同的geometry referenceEntity.geometry = renderEntity.geometry.toString() referenceEntity.properties["qi_table"] = renderEntity.table From 4c53144549040a5ff5a1e700ac64419851035ebd Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 30 Aug 2023 11:04:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E8=A1=8C?= =?UTF-8?q?=E6=A8=AA=E9=81=93=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 ++-- app/src/main/assets/omdb_config.json | 7 +++++++ .../omqs/http/taskupload/TaskUploadScope.kt | 5 +++-- .../src/main/assets/editormarker.xml | 9 +++++++-- .../src/main/assets/omdb/tex_fill_area_3014.png | Bin 0 -> 7789 bytes .../src/main/assets/omdb/tex_fill_area_3014.svg | 1 + .../main/assets/omdb/tex_fill_area_3014_0.svg | 7 +++++++ .../main/assets/omdb/tex_fill_area_3014_1.png | Bin 0 -> 1491 bytes .../main/assets/omdb/tex_fill_area_3014_2.png | Bin 0 -> 3770 bytes .../main/assets/omdb/tex_fill_area_3014_3.png | Bin 0 -> 11162 bytes .../main/assets/omdb/tex_fill_area_3014_4.svg | 10 ++++++++++ .../collect/library/enums/DataCodeEnum.kt | 1 + 12 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014.png create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014.svg create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png create mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d84e4a52..dba0cc3b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,11 +21,11 @@ + + - - diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 38169ef2..273c291c 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -207,6 +207,13 @@ "zoomMin": 18, "zoomMax": 20 }, + "3014":{ + "table": "OMDB_CROSS_WALK", + "code": 3014, + "name": "人行横道", + "zoomMin": 18, + "zoomMax": 20 + }, "3016":{ "table": "OMDB_OBJECT_STOPLOCATION", "code": 3016, diff --git a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt index 519430d6..e5d22648 100644 --- a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt +++ b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt @@ -14,6 +14,7 @@ import com.navinfo.omqs.bean.SysUserBean import com.navinfo.omqs.http.DefaultResponse import com.navinfo.omqs.tools.FileManager.Companion.FileUploadStatus import com.navinfo.omqs.util.DateTimeUtil +import com.navinfo.omqs.util.FileUtils import io.realm.Realm import kotlinx.coroutines.* import java.util.* @@ -134,7 +135,7 @@ class TaskUploadScope( evaluationTaskId = taskBean.id.toString(), linkPid = hadLinkDvoBean.linkPid,//"84207223282277331" linkStatus = linkStatus, - markId = hadLinkDvoBean.mesh,//"20065597" + markId = UUID.randomUUID().toString(),//"20065597" trackPhotoNumber = "", markGeometry = "", featureName = "", @@ -195,7 +196,7 @@ class TaskUploadScope( evaluationTaskId = taskBean.id.toString(), linkPid = hadLinkDvoBean.linkPid,//"84207223282277331" linkStatus = linkStatus, - markId = hadLinkDvoBean.mesh,//"20065597" + markId = it.id,//"20065597" trackPhotoNumber = "", markGeometry = it.geometry, featureName = it.classCode, diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index e1982691..79440e2f 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2316,7 +2316,7 @@ + src="assets:omdb/4010/right.svg" symbol-height="40" symbol-width="40"> @@ -2331,6 +2331,11 @@ + + + + + @@ -2352,7 +2357,7 @@ + src="@src" symbol-height="24" symbol-width="24" degree="90"> diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014.png new file mode 100644 index 0000000000000000000000000000000000000000..e261be02640f362ddb68b163e8b6ad76a3155a4c GIT binary patch literal 7789 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 \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg new file mode 100644 index 00000000..3955f1c3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png new file mode 100644 index 0000000000000000000000000000000000000000..6d0cf474c45a2acbaaaf1e116b84523288dc8e29 GIT binary patch literal 1491 zcma)+e>Br;9LK-I+K_FfYe`+j%|el*x-5~Cje&ePO;YL;oVQW0{|<}P#po*di|^37p?&S ztaE*Wx)Ps70RTA0$J6~RDOCCi`z$2L6f)1j1?t5)v>u{bJRlX8a;q$B!+R=l+&c&! z%(IODeEXZstjdH12c8XXe>LM=>~7tpiH^H{**EJl{d^0pdRmY0w*AG(jAeAXz`2&jqPb+bl)q~S& zNjhuz6fiNVu^UaBat!TMSm>oLQLS_kC{1>Zd3oPRr4R#!<+=h%--Kq;phZ*N8>DlP z$P~PEb1KFVG!k^Qlfgz%RymI2nI^8fMd&EdflHueH)sb}e}gy($_H&rwTTW-!+n1l zXVAeuW(j=WK=WaT-!%FH8U2TF6f9jd*7A4Z4d;+ZtP z1o;%EJfv5me1Lw$mP9MZm3^~f1ylt;4GtHxhSCD9&2uB#-3OPG=jw_ zTrVNVpdG!5b&MBvsd?O5aVqrd;i95{W*e&eTGchh94ong%P0}uejIh7dX?(NqEkhfq%4!O6>NpPbR6;z+=DtnG`bIQRqQK-L~7`2V>9gnP+eu z&+~`4jerRXFy5%)6M)@N@720P2nyjPZ2Mfz0%Uiei*cE3$a{0wU5d&3?C@?(tlCcm3Bk!moT49R zH&S}8sCxOO!_BoH>Y2gTH6%ieeP1t8@&|EDKKC!STrlkBwe1I-T0mtswQFfwH9`tnRmC*obq`0-@|a*n_);3H$Sqs!n%S!H zvQuUchFt&rnV+~88QI1{6Hs#U7jN-57U?jSm>svz`cb)vpm;L`DUXk&cNe%xCKE%{ zL$YzF=*5Ls$6BY`nk@%}j5D{o#m4k@9j<6rj*fa(AULc7CMVuMrrD--nNy0u;qH4y zRHGJfQR&S6Ock7(KsF4I&^eg2QFQomoboL?sv_4sYlg)3wRtMJpGmMmy)&nj>4irq z`3sPWD&gQBT~UE%lxwudPu3=D?1%N>{RPgtEDhHOXCxt1DFD^SA_Xc>Pm(db)F}c>O_M@R^1& zZ`|PEKtHqIep`#$#`@FF1n1bju|e%8(a0g$mSij3vZ0wRBilG5c+kG`Zd3FwTC4XnJkJX!kzG-Lr~&mVokH6Q># zSjhO_+U>$o)46Fa(0j-&(q(OiyCf{L_JRT5LHiXUc<{jtCZKsG@^_Uv^#~0~^kW~@ zX4W(1r1XwObqQV7{3J9-m0tG!_KMff2>!RH+5N-IXJZBk>M*H8I);XIiq!f*Zu DQSq@K literal 0 HcmV?d00001 diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png new file mode 100644 index 0000000000000000000000000000000000000000..d21b45d8a52bfe8a62b29ef50cc09987c6337ffc GIT binary patch literal 3770 zcmeHK`&ZK07S~FxOwG9yDdr>W_OOyhLkmoYL>z0%9)n&{BXd;p{Yp&{j8f4uyVE3* zN)$B}KCtwrhKiM81->d3F~G-wCMuyr%vV8%`ZMnGmvi=7=d91(XMgtD=X{Ee9rd?Z z3tnqvWMmQW6Y7MKk+H~N=dCt1jMW7Xiw%=;+6n)IMz!6WJ{cKVrU#&qzhs@7sSJFb z5VfIj@D{9Z-GcjLBy7#4ts5rocaTvRkKt2~Z@-259W~ZYgS)N&j_gEs>b>x<>x?%R z$d%*Y^>4XiYEkS)UUJ&ErlMNt=+9vc)@y*aiEyP@v){=jQ>i&H5#lqDeOsq%wjFF? zO%+j^+#$2Ylu)*=-dwBnbRLUEX}uxzHv&@Fi0C8~gP}T)U05j{e(t%bpk%=yZRIq* zsfHGNcAj6xWVL~m# z)jd>Vbx>s zCZD$gcBv%&FX9(mS=LE?xc7$;VvlJ8rWItJS?8#JRt0^pKN0Qf8$o5WvOORUvD#$E zZh?O9Y-wURMp{Hs-YE|wsmeEV&4=?-1{MDm5dMfu%f>B24`-2=7JqVZ2=?kGeqdJl z&}jTfg}9Y9C81ChBbtA>e@s(qaGN)VV4;j1NY1B?y%0>}f+@)lV zZCi_u>gOGx&&{=MfTBBe)13#NE!+@jU-VTawwtr2o>Q`Fff_E2<{1AC4I>;=fFx-| z{^WW@Yb!(BX&jxFcya06{EQ zA%5P2*HlQmJLd)q&H{7q=8pW%$sQsNrFOp~QIW$5D`W1t&sQc1&h(Xr=lBrN$+~8mj4{cKd}=t} zO*Wdpf`0!vFnP14-pubNdz%ZWuB2F|U_=48a1}|5?`<6I>tSE|e&`8i+P`dS4LQ3i z>rQU^I*13?DU1|hVy-zIx|C&g<$S>dHxHMl*9Lp7PH$K!U_j{K>4h_!vEg~c3-%%Ko9harV)ku;toDzuNpw| z$vPkD4*K?m@dL@t3BT+)t-s~u?ipT)F1^74E+VGY{NP9iCP7sXR`Vvjf(5+tW`NQ4k5u_qpcd-`U;MDJr8Wv*ZMZwrfK!i`0|&}e)R_&M)x0ym5) z?v7X6%QIoD>#pg&^h*i4BbFj{_0iUM$Q+mEaScs6ex*C@)w-d6e9y_}=QMEqU? zvFm>`86@53TmNo#5LNNP940#XrlzS!Tbq}D_3);KiM&R6kl76Q&;*Bv%<(2FGaCV! z&~<0eweXU%8kH^1yzAi8$r1~ijadD&isKRafYf#KVp&(6 znV*69B-nccBXJF0IFiY@4R5CFkaN3vO&^)k1zjD?j2ewKtdx{RRrie%hOLUgyF(*O z$|kD%u10*6RPSBU(hJ^A5o*cF21aVp{P})-2oJowyHR)TVc!$jfPrVQp#YXamvg#Y zQp-1LxuGog)Bm^U#0tHLMt$TZ*2k)Y-R9|-V9AdgG5wL&st>D@fO#4)yhhTQ&&_8o zB%uf+FE&b^G5|3zPSMX1D7OrS$3_qvx2C>ShhV<`q3vexxax?}#Byv)oS2op2SQhf z^mWQm>y*RMu6l{MinU~8eLHdKw4A!LJ#iipkU@P*!|mbn8MzRM!^D^Ww9d%{1fsg% z^L0MvToS6~gEoU5Ex#|<?@>tW1CNb_emqhr3Nu-6ySFhReSI>`5%m~+`#|< literal 0 HcmV?d00001 diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png new file mode 100644 index 0000000000000000000000000000000000000000..dcad73bcb0233306b76b1c181776ad68b2f6968f GIT binary patch literal 11162 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 literal 0 HcmV?d00001 diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg new file mode 100644 index 00000000..a1e0761d --- /dev/null +++ b/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt index ad6c96bb..80d97d4f 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt @@ -57,6 +57,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_LINK_FORM2_11("风景路线", "2206-11"), OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"), OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"), + OMDB_CROSS_WALK("人行横道", "3014"), OMDB_OBJECT_STOPLOCATION("停止位置", "3016"), OMDB_INTERSECTION("路口", "4001"), OMDB_SPEEDLIMIT("常规点限速", "4002"),