修改道路形态code不对问题
This commit is contained in:
qiji4215
parent
53e5154c36
commit
b53aa520d4
@ -324,7 +324,7 @@ class ImportOMDBHelper @AssistedInject constructor(
|
||||
}
|
||||
}else if(renderEntity.code == DataCodeEnum.OMDB_RAMP.code){
|
||||
/*匝道*/
|
||||
var formWay = renderEntity.properties["FORM_OF_WAY"]
|
||||
var formWay = renderEntity.properties["formOfWay"]
|
||||
if(formWay!=null){
|
||||
when (formWay) {
|
||||
"93"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_1.code
|
||||
@ -338,7 +338,7 @@ class ImportOMDBHelper @AssistedInject constructor(
|
||||
}
|
||||
}else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM1.code){
|
||||
/*道路形态1*/
|
||||
var formWay = renderEntity.properties["FORM_OF_WAY"]
|
||||
var formWay = renderEntity.properties["formOfWay"]
|
||||
if(formWay!=null){
|
||||
when (formWay) {
|
||||
"35"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_1.code
|
||||
@ -348,7 +348,7 @@ class ImportOMDBHelper @AssistedInject constructor(
|
||||
}
|
||||
}else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM2.code){
|
||||
/*道路形态2*/
|
||||
var formWay = renderEntity.properties["FORM_OF_WAY"]
|
||||
var formWay = renderEntity.properties["formOfWay"]
|
||||
if(formWay!=null){
|
||||
when (formWay) {
|
||||
"10"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_1.code
|
||||
|
||||
@ -1010,7 +1010,7 @@ class MainActivity : BaseActivity() {
|
||||
*/
|
||||
private fun showMainActivityBottomSheetGroup() {
|
||||
binding.mainActivityBottomSheetGroup.visibility = View.VISIBLE
|
||||
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 60)
|
||||
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 256, 60)
|
||||
mapController.mMapView.vtmMap.animator().animateTo(
|
||||
GeoPoint(
|
||||
mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
|
||||
@ -1024,7 +1024,7 @@ class MainActivity : BaseActivity() {
|
||||
*/
|
||||
private fun hideMainActivityBottomSheetGroup() {
|
||||
binding.mainActivityBottomSheetGroup.visibility = View.GONE
|
||||
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 0)
|
||||
mapController.mMapView.setScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 256, 0)
|
||||
mapController.mMapView.vtmMap.animator().animateTo(
|
||||
GeoPoint(
|
||||
mapController.mMapView.vtmMap.mapPosition.geoPoint.latitude,
|
||||
|
||||
@ -452,7 +452,7 @@ class MainViewModel @Inject constructor(
|
||||
withContext(Dispatchers.Main) {
|
||||
if (Constant.AUTO_LOCATION) {
|
||||
mapController.mMapView.vtmMap.animator()
|
||||
.animateTo(GeoPoint(location.longitude, location.latitude))
|
||||
.animateTo(GeoPoint(location.latitude, location.longitude))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -494,11 +494,8 @@ class MainViewModel @Inject constructor(
|
||||
|
||||
val linkList = realmOperateHelper.queryLink(point = point)
|
||||
|
||||
/*val linkList = realmOperateHelper.queryLine(
|
||||
/* val linkList = realmOperateHelper.queryLine(
|
||||
point = point,
|
||||
)
|
||||
|
||||
// val linkList = realmOperateHelper.queryLine(point = point, buffer = 2.5, table = "OMDB_LANE_MARK_BOUNDARYTYPE")
|
||||
buffer = 2.5,
|
||||
table = "OMDB_LANE_MARK_BOUNDARYTYPE"
|
||||
)*/
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
<item
|
||||
android:id="@+id/personal_center_menu_version"
|
||||
android:icon="@drawable/ic_baseline_layers_24"
|
||||
android:title="版本：ONE_23QE4_V1.2.0_20230811_A" />
|
||||
android:title="版本：ONE_23QE4_V1.3.0_20230817_A" />
|
||||
</group>
|
||||
<group android:checkableBehavior="single">
|
||||
<item android:title="小标题">
|
||||
|
||||
@ -2068,13 +2068,13 @@
|
||||
</m>
|
||||
</m>
|
||||
</m>
|
||||
<m k="boundaryType" v="3">
|
||||
<symbol repeat="true" repeat-gap="6" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="12" symbol-height="12"></symbol>
|
||||
</m>
|
||||
<m k="boundaryType" v="4">
|
||||
<symbol repeat-gap="16" repeat="true" repeat-start="0" src="assets:omdb/icon_2013_4.svg" symbol-width="32" symbol-height="56"></symbol>
|
||||
<line stroke="#FFBC6E" use="boundaryType" width="0.1"/>
|
||||
<symbol repeat-gap="12" repeat="true" repeat-start="0" src="assets:omdb/icon_2013_4.svg" symbol-width="16" symbol-height="46"></symbol>
|
||||
</m>
|
||||
<m k="boundaryType" v="3">
|
||||
<symbol repeat="true" repeat-gap="4" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="10" symbol-height="8"></symbol>
|
||||
</m>
|
||||
|
||||
<m k="boundaryType" v="5|7">
|
||||
<line stroke="#ffffff" use="boundaryType" />
|
||||
</m>
|
||||
|
||||
@ -1 +1,61 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="107.5" height="105.4" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 107.5 105.4"><defs><style>.p{fill:url(#j);}.q{fill:url(#g);}.r{fill:url(#m);}.s{fill:url(#h);}.t{fill:url(#i);}.u{fill:url(#o);}.v{fill:url(#k);}.w{fill:url(#n);}.x{fill:url(#l);}.y{fill:url(#f);}.z{fill:url(#d);}.aa{fill:url(#e);}.ab{fill:none;}</style><linearGradient id="d" x1="48.3" y1="64.9" x2="49.7" y2="64.9" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#231815"/><stop offset="0" stop-color="#372d2a"/><stop offset="0" stop-color="#655d5b"/><stop offset=".1" stop-color="#8e8987"/><stop offset=".2" stop-color="#b1adac"/><stop offset=".2" stop-color="#cdcbca"/><stop offset=".3" stop-color="#e3e2e1"/><stop offset=".3" stop-color="#f2f2f2"/><stop offset=".4" stop-color="#fcfbfb"/><stop offset=".5" stop-color="#fff"/><stop offset=".7" stop-color="#fcfcfc"/><stop offset=".7" stop-color="#f5f5f5"/><stop offset=".8" stop-color="#e9e8e8"/><stop offset=".8" stop-color="#d8d6d6"/><stop offset=".9" stop-color="#c2bfbe"/><stop offset=".9" stop-color="#a6a2a1"/><stop offset=".9" stop-color="#85807e"/><stop offset="1" stop-color="#605957"/><stop offset="1" stop-color="#3a312f"/><stop offset="1" stop-color="#453d3b"/><stop offset="1" stop-color="#65605f"/><stop offset="1" stop-color="#7f7c7b"/><stop offset="1" stop-color="#91908f"/><stop offset="1" stop-color="#9c9c9b"/><stop offset="1" stop-color="#a0a0a0"/></linearGradient><linearGradient id="e" x1="38.4" x2="39.8" xlink:href="#d"/><linearGradient id="f" x1="68.2" x2="69.6" xlink:href="#d"/><linearGradient id="g" x1="58.3" x2="59.6" xlink:href="#d"/><linearGradient id="h" x1="101.9" y1="64.9" x2="103.3" y2="64.9" xlink:href="#d"/><linearGradient id="i" x1="92" y1="64.9" x2="93.3" y2="64.9" xlink:href="#d"/><linearGradient id="j" x1="14.4" y1="64.9" x2="15.8" y2="64.9" xlink:href="#d"/><linearGradient id="k" x1="4.5" y1="64.9" x2="5.8" y2="64.9" xlink:href="#d"/><linearGradient id="l" x1="344.8" y1="-9.2" x2="346.1" y2="-9.2" gradientTransform="translate(-291.7 66.7)" xlink:href="#d"/><linearGradient id="m" x1="330.1" y1="-9.2" x2="331.4" y2="-9.2" gradientTransform="translate(-277 81.4)" xlink:href="#d"/><linearGradient id="n" x1="395.3" y1="258.8" x2="400.1" y2="258.8" gradientTransform="translate(-370.6 -193.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#989898"/><stop offset="0" stop-color="#a3a3a3"/><stop offset=".1" stop-color="#c4c5c5"/><stop offset=".2" stop-color="#d8d9d9"/><stop offset=".3" stop-color="#e0e1e1"/><stop offset=".4" stop-color="#dbdcdc"/><stop offset=".5" stop-color="#cccece"/><stop offset=".6" stop-color="#b5b6b7"/><stop offset=".7" stop-color="#949697"/><stop offset=".8" stop-color="#6a6c6f"/><stop offset=".8" stop-color="#3f4246"/><stop offset="1" stop-color="#404247"/><stop offset="1" stop-color="#43434a"/></linearGradient><linearGradient id="o" x1="78.5" y1="64.9" x2="83.3" y2="64.9" gradientTransform="matrix(1, 0, 0, 1, 0, 0)" xlink:href="#n"/></defs><g id="c"><g><rect class="ab" width="107.5" height="105.4"/><g><g><path class="z" d="M48.6,57.4h.9c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.2s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z"/><path class="aa" d="M38.6,57.4h.9c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.2s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z"/><path class="y" d="M68.4,57.4h.9c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.2s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z"/><path class="q" d="M58.5,57.4h.9c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.2s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z"/><path class="s" d="M102.1,57.4h.9c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.2s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z"/><path class="t" d="M92.2,57.4h.9c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.2s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z"/><path class="p" d="M14.6,57.4h.9c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.2s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z"/><path class="v" d="M4.7,57.4h.9c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.2s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z"/><path class="x" d="M53.3,3.8h.9c.1,0,.2,.1,.2,.2V111.2c0,0,0,.1-.1,.1h-1.1s0,0,0,0V4c0-.1,.1-.2,.2-.2Z" transform="translate(-3.8 111.3) rotate(-90)"/><path class="r" d="M53.3,18.5h.9c.1,0,.2,.1,.2,.2V125.9c0,0,0,.1-.1,.1h-1.1s0,0,0,0V18.7c0-.1,.1-.2,.2-.2Z" transform="translate(-18.5 126) rotate(-90)"/></g><path class="w" d="M25.4,52.7h3.1c.6,0,1.1,.5,1.1,1.1v22.3c0,.5-.4,1-1,1h-3.4c-.5,0-.9-.4-.9-.9v-22.3c0-.6,.5-1.1,1.1-1.1Z" transform="translate(54 129.8) rotate(180)"/><path class="u" d="M79.2,52.7h3.1c.6,0,1.1,.5,1.1,1.1v22.3c0,.5-.4,1-1,1h-3.4c-.5,0-.9-.4-.9-.9v-22.3c0-.6,.5-1.1,1.1-1.1Z"/></g></g></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="107.5" height="105.4"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 107.5 105.4">
|
||||
<defs>
|
||||
<style>.f{fill:url(#d);}.g{fill:url(#e);}.h{fill:none;}.i{fill:#fff;}</style>
|
||||
<linearGradient id="d" x1="640.3" y1="-514.6" x2="633.9" y2="-514.6"
|
||||
gradientTransform="translate(-610.3 579.1)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#989898" />
|
||||
<stop offset=".1" stop-color="#c1c1c1" />
|
||||
<stop offset=".3" stop-color="#e3e3e3" />
|
||||
<stop offset=".4" stop-color="#f7f7f7" />
|
||||
<stop offset=".5" stop-color="#fff" />
|
||||
<stop offset=".6" stop-color="#fbfbfb" />
|
||||
<stop offset=".6" stop-color="#f1f2f2" />
|
||||
<stop offset=".7" stop-color="#e0e1e2" />
|
||||
<stop offset=".8" stop-color="#c9c9cb" />
|
||||
<stop offset=".8" stop-color="#aaabad" />
|
||||
<stop offset=".9" stop-color="#848689" />
|
||||
<stop offset="1" stop-color="#585b5e" />
|
||||
<stop offset="1" stop-color="#3f4246" />
|
||||
</linearGradient>
|
||||
<linearGradient id="e" x1="77.7" y1="64.5" x2="84.1" y2="64.5"
|
||||
gradientTransform="matrix(1, 0, 0, 1, 0, 0)" xlink:href="#d" />
|
||||
</defs>
|
||||
<g id="c">
|
||||
<g>
|
||||
<rect class="h" width="107.5" height="105.4" />
|
||||
<g>
|
||||
<g>
|
||||
<path class="i"
|
||||
d="M48.2,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
|
||||
<path class="i"
|
||||
d="M38.3,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
|
||||
<path class="i"
|
||||
d="M68.1,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
|
||||
<path class="i"
|
||||
d="M58.2,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
|
||||
<path class="i"
|
||||
d="M101.8,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
|
||||
<path class="i"
|
||||
d="M91.9,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
|
||||
<path class="i"
|
||||
d="M14.3,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
|
||||
<path class="i"
|
||||
d="M4.4,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
|
||||
<path class="i"
|
||||
d="M52.8,3.3h1.8c.1,0,.2,.1,.2,.2V110.7c0,0,0,.1-.1,.1h-2.1s0,0,0,0V3.5c0-.1,.1-.2,.2-.2Z"
|
||||
transform="translate(-3.3 110.8) rotate(-90)" />
|
||||
<path class="i"
|
||||
d="M52.8,18h1.8c.1,0,.2,.1,.2,.2V125.4c0,0,0,.1-.1,.1h-2.1s0,0,0,0V18.2c0-.1,.1-.2,.2-.2Z"
|
||||
transform="translate(-18 125.5) rotate(-90)" />
|
||||
</g>
|
||||
<path class="f"
|
||||
d="M24.5,52.3h4.9c.6,0,1.1,.5,1.1,1.1v22.3c0,.5-.4,1-1,1h-5.2c-.5,0-.9-.4-.9-.9v-22.3c0-.6,.5-1.1,1.1-1.1Z"
|
||||
transform="translate(54 129) rotate(180)" />
|
||||
<path class="g"
|
||||
d="M78.3,52.3h4.9c.6,0,1.1,.5,1.1,1.1v22.3c0,.5-.4,1-1,1h-5.2c-.5,0-.9-.4-.9-.9v-22.3c0-.6,.5-1.1,1.1-1.1Z" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 3.5 KiB |
2
vtm
2
vtm
@ -1 +1 @@
|
||||
Subproject commit bd83adb7df464686b3f19e8a08aeef2cb49f5c17
|
||||
Subproject commit ebe23ed7731e301669b2b4ea03918e313a63617e
|
||||
Loading…
x
Reference in New Issue
Block a user