diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index bd7dcec7..1095b5cd 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -46,6 +46,7 @@ "name": "道路种别", "zoomMin": 15, "zoomMax": 20, + "catch":false, "checkLinkId": false }, "2010": { @@ -173,7 +174,7 @@ "name": "文字", "zoomMin": 15, "zoomMax": 20, - "transformer2Code": "" + "transformer": [] }, "3003":{ "table": "OMDB_OBJECT_SYMBOL", @@ -181,7 +182,22 @@ "name": "符号", "zoomMin": 15, "zoomMax": 20, - "transformer2Code": "" + "transformer": [] + }, + "3004":{ + "table": "OMDB_OBJECT_ARROW", + "code": 3004, + "name": "箭头", + "zoomMin": 15, + "zoomMax": 20, + "transformer": [ + { + "k": "geometry", + "v": "~", + "klib": "geometry", + "vlib": "obtainDynamicSrc('assets:omdb/arrowDirection/','.svg','arrowClass')" + } + ] }, "3005":{ "table": "OMDB_TRAFFIC_SIGN", @@ -472,6 +488,7 @@ "name": "车道中心线", "zoomMin": 18, "zoomMax": 20, + "catch":false, "transformer": [ { "k": "geometry", diff --git a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt index b2cd1aa5..18f8f3b7 100644 --- a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt +++ b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt @@ -122,6 +122,7 @@ class TableInfo { val zoomMin: Int = 16 val zoomMax: Int = 21 val checkLinkId: Boolean = true//是否需要校验linkid + val catch: Boolean = true//是否需要捕捉 val name: String = "" var checked : Boolean = true var transformer: MutableList = mutableListOf() diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt index ff43946c..38750fa4 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -229,6 +229,7 @@ class ImportOMDBHelper @AssistedInject constructor( if (!renderEntity.properties.containsKey("name")) { renderEntity.properties["name"] = renderEntity.name; } + //遍历判断只显示与任务Link相关的任务数据 if(currentConfig.checkLinkId){ @@ -307,6 +308,12 @@ class ImportOMDBHelper @AssistedInject constructor( // 对renderEntity做预处理后再保存 val resultEntity = importConfig.transformProperties(renderEntity) + if(currentConfig.catch){ + renderEntity.catchEnable=0 + }else{ + renderEntity.catchEnable=1 + } + //对code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA,存在多个属性值时，渲染优先级：FRONTAGE>MAIN_SIDE_A CCESS if(renderEntity.code == DataCodeEnum.OMDB_LINK_ATTRIBUTE.code){ 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 4be80621..b4160ae1 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -610,26 +610,28 @@ class ImportPreProcess { // 获取杆状物的高程数据 val geometry = renderEntity.wkt if (geometry != null) { - var minHeight = Double.MAX_VALUE - var maxHeight = Double.MIN_VALUE - for (coordinate in geometry.coordinates) { - if (coordinate.z < minHeight) { - minHeight = coordinate.z - } - if (coordinate.z > maxHeight) { - maxHeight = coordinate.z - } - } - for (coordinate in geometry.coordinates) { - if (coordinate.z == minHeight) { - coordinate.z = 0.0 - } - if (coordinate.z == maxHeight) { - coordinate.z = 40.0 - } - } - renderEntity.geometry = - WKTWriter(3).write(GeometryTools.createLineString(geometry.coordinates)) +// var minHeight = Double.MAX_VALUE +// var maxHeight = Double.MIN_VALUE +// for (coordinate in geometry.coordinates) { +// if (coordinate.z < minHeight) { +// minHeight = coordinate.z +// } +// if (coordinate.z > maxHeight) { +// maxHeight = coordinate.z +// } +// } +// for (coordinate in geometry.coordinates) { +// if (coordinate.z == minHeight) { +// coordinate.z = 0.0 +// } +// if (coordinate.z == maxHeight) { +// coordinate.z = 40.0 +// } +// } +// renderEntity.geometry = +// WKTWriter(3).write(GeometryTools.createLineString(geometry.coordinates)) + + renderEntity.geometry = GeometryTools.createGeometry(GeoPoint(geometry.coordinates[0].y, geometry.coordinates[0].x)).toString() } } @@ -741,4 +743,12 @@ class ImportPreProcess { Realm.getDefaultInstance().insert(dynamicSrcReference) } } + + /** + * 向当前renderEntity中添加动态属性 + * */ + fun obtainDynamicSrc(renderEntity: RenderEntity, prefix: String, suffix: String, codeName: String) { + val code = renderEntity.properties[codeName] + renderEntity.properties["src"] = "${prefix}${code}${suffix}" + } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt index 90d2c841..4315475d 100644 --- a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt @@ -244,6 +244,7 @@ class RealmOperateHelper() { point: Point, buffer: Double = DEFAULT_BUFFER, bufferType: BUFFER_TYPE = DEFAULT_BUFFER_TYPE, + catchAll: Boolean = true, sort: Boolean = true ): MutableList { val result = mutableListOf() @@ -261,14 +262,25 @@ class RealmOperateHelper() { val yStart = tileYSet.stream().min(Comparator.naturalOrder()).orElse(null) val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null) val realm = getRealmDefaultInstance() - // 查询realm中对应tile号的数据 - val realmList = getRealmTools(RenderEntity::class.java, false) - .notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.name) - .greaterThanOrEqualTo("tileX", xStart) - .lessThanOrEqualTo("tileX", xEnd) - .greaterThanOrEqualTo("tileY", yStart) - .lessThanOrEqualTo("tileY", yEnd) - .findAll() + var realmList = mutableListOf() + if(catchAll){ + // 查询realm中对应tile号的数据 + realmList = getRealmTools(RenderEntity::class.java, false) + .greaterThanOrEqualTo("tileX", xStart) + .lessThanOrEqualTo("tileX", xEnd) + .greaterThanOrEqualTo("tileY", yStart) + .lessThanOrEqualTo("tileY", yEnd) + .findAll() + }else{ + // 查询realm中对应tile号的数据 + realmList = getRealmTools(RenderEntity::class.java, false) + .lessThan("catchEnable", 1) + .greaterThanOrEqualTo("tileX", xStart) + .lessThanOrEqualTo("tileX", xEnd) + .greaterThanOrEqualTo("tileY", yStart) + .lessThanOrEqualTo("tileY", yEnd) + .findAll() + } // 将获取到的数据和查询的polygon做相交，只返回相交的数据 val queryResult = realmList?.stream()?.filter { polygon.intersects(it.wkt) diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index cef80df1..03b46c3f 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -471,11 +471,11 @@ class MainViewModel @Inject constructor( private suspend fun captureItem(point: GeoPoint) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { val itemList = realmOperateHelper.queryElement( - point = GeometryTools.createPoint( + GeometryTools.createPoint( point.longitude, point.latitude ), - buffer = 2.0 + buffer = 1.0, catchAll = false ) if (itemList.size == 1) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt index 361fd9cb..2fe88f19 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt @@ -23,6 +23,7 @@ class ItemAdapter(private var itemListener: ((Int, RenderEntity) -> Unit?)? = nu val binding = holder.viewBinding as AdapterItemBinding var renderEntity = data[position] binding.root.isSelected = selectPosition == position + binding.itemIndex.text = (position+1).toString() binding.name.text = DataCodeEnum.findTableNameByCode(renderEntity.code) binding.root.setOnClickListener { if (selectPosition != position) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt index 9539a3f1..58c38c44 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt @@ -129,7 +129,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit? // 定位到指定位置 niMapController.mMapView.vtmMap.animator() // .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 )) - .animateTo(GeoPoint( 40.480633792652746, 115.99816629572948 )) + .animateTo(GeoPoint( 40.50755634913162,115.80235967728436 )) } R.id.personal_center_menu_open_all_layer -> { MapParamUtils.setDataLayerEnum(DataLayerEnum.SHOW_ALL_LAYERS) diff --git a/app/src/main/res/layout/adapter_item.xml b/app/src/main/res/layout/adapter_item.xml index b3a2751d..f9136866 100644 --- a/app/src/main/res/layout/adapter_item.xml +++ b/app/src/main/res/layout/adapter_item.xml @@ -1,16 +1,28 @@ - + android:padding="10dp"> + + - \ No newline at end of file + + diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 45f4d66f..f07dd1e2 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1948,16 +1948,19 @@ + - + + - - - - - - + + + + + + + - + @@ -2326,22 +2326,38 @@ - - - - + - + + + + + + + + + + + + + + + - + + + + + + diff --git a/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg b/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg index 074675df..122a28af 100644 --- a/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg +++ b/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg @@ -1,4 +1,103 @@ - + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/0.svg b/collect-library/src/main/assets/omdb/arrowDirection/0.svg new file mode 100644 index 00000000..1fe1b76d --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/0.svg @@ -0,0 +1,19 @@ + + + + 18 + Created with Sketch. + + + + + + + 其 + 它 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1.svg b/collect-library/src/main/assets/omdb/arrowDirection/1.svg new file mode 100644 index 00000000..b6309773 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1.svg @@ -0,0 +1,24 @@ + + + + 1 + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/10.svg b/collect-library/src/main/assets/omdb/arrowDirection/10.svg new file mode 100644 index 00000000..997e5a2c --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/10.svg @@ -0,0 +1,21 @@ + + + + 16 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1025.svg b/collect-library/src/main/assets/omdb/arrowDirection/1025.svg new file mode 100644 index 00000000..f5d83583 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1025.svg @@ -0,0 +1,19 @@ + + + + 7 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1026.svg b/collect-library/src/main/assets/omdb/arrowDirection/1026.svg new file mode 100644 index 00000000..47afaa40 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1026.svg @@ -0,0 +1,19 @@ + + + + 4 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1027.svg b/collect-library/src/main/assets/omdb/arrowDirection/1027.svg new file mode 100644 index 00000000..0332107e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1027.svg @@ -0,0 +1,20 @@ + + + + 5 + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1028.svg b/collect-library/src/main/assets/omdb/arrowDirection/1028.svg new file mode 100644 index 00000000..f950ad4a --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1028.svg @@ -0,0 +1,19 @@ + + + + 2 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1029.svg b/collect-library/src/main/assets/omdb/arrowDirection/1029.svg new file mode 100644 index 00000000..ca19abf8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1029.svg @@ -0,0 +1,20 @@ + + + + 15 + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1032.svg b/collect-library/src/main/assets/omdb/arrowDirection/1032.svg new file mode 100644 index 00000000..71fcf524 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1032.svg @@ -0,0 +1,19 @@ + + + + 13 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/11.svg b/collect-library/src/main/assets/omdb/arrowDirection/11.svg new file mode 100644 index 00000000..776dec2f --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/11.svg @@ -0,0 +1,35 @@ + + + + 13 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/12.svg b/collect-library/src/main/assets/omdb/arrowDirection/12.svg new file mode 100644 index 00000000..2808334e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/12.svg @@ -0,0 +1,19 @@ + + + + 8 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/128.svg b/collect-library/src/main/assets/omdb/arrowDirection/128.svg new file mode 100644 index 00000000..eca7e002 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/128.svg @@ -0,0 +1,16 @@ + + + + 右前拉链式通行复制 2 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/13.svg b/collect-library/src/main/assets/omdb/arrowDirection/13.svg new file mode 100644 index 00000000..2f52b5d9 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/13.svg @@ -0,0 +1,33 @@ + + + + 14 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/14.svg b/collect-library/src/main/assets/omdb/arrowDirection/14.svg new file mode 100644 index 00000000..34714d8d --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/14.svg @@ -0,0 +1,22 @@ + + + + 15 + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1536.svg b/collect-library/src/main/assets/omdb/arrowDirection/1536.svg new file mode 100644 index 00000000..da36d14d --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1536.svg @@ -0,0 +1,19 @@ + + + + 8 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/16.svg b/collect-library/src/main/assets/omdb/arrowDirection/16.svg new file mode 100644 index 00000000..fa97503c --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/16.svg @@ -0,0 +1,18 @@ + + + + 10 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/17.svg b/collect-library/src/main/assets/omdb/arrowDirection/17.svg new file mode 100644 index 00000000..67721acd --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/17.svg @@ -0,0 +1,21 @@ + + + + 17 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/2.svg b/collect-library/src/main/assets/omdb/arrowDirection/2.svg new file mode 100644 index 00000000..51b45c35 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/2.svg @@ -0,0 +1,16 @@ + + + + 3 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/2048.svg b/collect-library/src/main/assets/omdb/arrowDirection/2048.svg new file mode 100644 index 00000000..4c36bca5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/2048.svg @@ -0,0 +1,23 @@ + + + + 10 + Created with Sketch. + + + + + + + + + + + + X + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/256.svg b/collect-library/src/main/assets/omdb/arrowDirection/256.svg new file mode 100644 index 00000000..34dd6dec --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/256.svg @@ -0,0 +1,16 @@ + + + + 左前拉链式通行复制 2 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/3.svg b/collect-library/src/main/assets/omdb/arrowDirection/3.svg new file mode 100644 index 00000000..70d151fa --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/3.svg @@ -0,0 +1,32 @@ + + + + 5 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/32.svg b/collect-library/src/main/assets/omdb/arrowDirection/32.svg new file mode 100644 index 00000000..e161f55e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/32.svg @@ -0,0 +1,18 @@ + + + + 11 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/4.svg b/collect-library/src/main/assets/omdb/arrowDirection/4.svg new file mode 100644 index 00000000..af5b7770 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/4.svg @@ -0,0 +1,16 @@ + + + + 4 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/4096.svg b/collect-library/src/main/assets/omdb/arrowDirection/4096.svg new file mode 100644 index 00000000..4fea3c82 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/4096.svg @@ -0,0 +1,18 @@ + + + + 11 + Created with Sketch. + + + + + + X + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/5.svg b/collect-library/src/main/assets/omdb/arrowDirection/5.svg new file mode 100644 index 00000000..69b2dc1d --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/5.svg @@ -0,0 +1,18 @@ + + + + 2 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/513.svg b/collect-library/src/main/assets/omdb/arrowDirection/513.svg new file mode 100644 index 00000000..e807a30a --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/513.svg @@ -0,0 +1,17 @@ + + + + 6 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/514.svg b/collect-library/src/main/assets/omdb/arrowDirection/514.svg new file mode 100644 index 00000000..b8009126 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/514.svg @@ -0,0 +1,17 @@ + + + + 3 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/515.svg b/collect-library/src/main/assets/omdb/arrowDirection/515.svg new file mode 100644 index 00000000..b6a8529e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/515.svg @@ -0,0 +1,17 @@ + + + + 9 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/516.svg b/collect-library/src/main/assets/omdb/arrowDirection/516.svg new file mode 100644 index 00000000..47e7e825 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/516.svg @@ -0,0 +1,17 @@ + + + + 编组 44 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/517.svg b/collect-library/src/main/assets/omdb/arrowDirection/517.svg new file mode 100644 index 00000000..3c06e6cd --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/517.svg @@ -0,0 +1,17 @@ + + + + 14 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/520.svg b/collect-library/src/main/assets/omdb/arrowDirection/520.svg new file mode 100644 index 00000000..dc201de2 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/520.svg @@ -0,0 +1,19 @@ + + + + 12 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/6.svg b/collect-library/src/main/assets/omdb/arrowDirection/6.svg new file mode 100644 index 00000000..ee40261a --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/6.svg @@ -0,0 +1,19 @@ + + + + 9 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/64.svg b/collect-library/src/main/assets/omdb/arrowDirection/64.svg new file mode 100644 index 00000000..8d57f946 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/64.svg @@ -0,0 +1,15 @@ + + + + 提示右后方掉头复制 2 + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/65.svg b/collect-library/src/main/assets/omdb/arrowDirection/65.svg new file mode 100644 index 00000000..7f38e819 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/65.svg @@ -0,0 +1,22 @@ + + + + 提示前方可自行或右后方掉头复制 2 + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/66.svg b/collect-library/src/main/assets/omdb/arrowDirection/66.svg new file mode 100644 index 00000000..9a53634b --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/66.svg @@ -0,0 +1,18 @@ + + + + 右右后方掉 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/69.svg b/collect-library/src/main/assets/omdb/arrowDirection/69.svg new file mode 100644 index 00000000..f9a9763e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/69.svg @@ -0,0 +1,19 @@ + + + + 左直右后方掉 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/7.svg b/collect-library/src/main/assets/omdb/arrowDirection/7.svg new file mode 100644 index 00000000..3cb83ead --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/7.svg @@ -0,0 +1,40 @@ + + + + 12 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/8.svg b/collect-library/src/main/assets/omdb/arrowDirection/8.svg new file mode 100644 index 00000000..d9e21f19 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/8.svg @@ -0,0 +1,22 @@ + + + + 6 + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/9.svg b/collect-library/src/main/assets/omdb/arrowDirection/9.svg new file mode 100644 index 00000000..8e6c6b3b --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/9.svg @@ -0,0 +1,25 @@ + + + + 7 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/test.png b/collect-library/src/main/assets/omdb/arrowDirection/test.png new file mode 100644 index 00000000..08bcef0c Binary files /dev/null and b/collect-library/src/main/assets/omdb/arrowDirection/test.png differ diff --git a/collect-library/src/main/assets/omdb/arrowDirection/test.svg b/collect-library/src/main/assets/omdb/arrowDirection/test.svg new file mode 100644 index 00000000..ef91d67e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/test.svg @@ -0,0 +1,15 @@ + + + + Fill 20 + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/test_sdf.png b/collect-library/src/main/assets/omdb/arrowDirection/test_sdf.png new file mode 100644 index 00000000..1f2b93a3 Binary files /dev/null and b/collect-library/src/main/assets/omdb/arrowDirection/test_sdf.png differ diff --git a/collect-library/src/main/assets/omdb/icon_pole_3006.svg b/collect-library/src/main/assets/omdb/icon_pole_3006.svg new file mode 100644 index 00000000..9c70037f --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_pole_3006.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_crosswalk_3014.svg b/collect-library/src/main/assets/omdb/object_crosswalk_3014.svg new file mode 100644 index 00000000..d8aceae7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_crosswalk_3014.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_1.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_1.svg new file mode 100644 index 00000000..09d6f4ff --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_2.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_2.svg new file mode 100644 index 00000000..fcec6795 --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_3.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_3.svg new file mode 100644 index 00000000..3a947ce3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_4.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_4.svg new file mode 100644 index 00000000..cb7f35c8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_9.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_9.svg new file mode 100644 index 00000000..0ff7e21d --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_9.svg @@ -0,0 +1 @@ + \ 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 deleted file mode 100644 index 3955f1c3..00000000 --- a/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ 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 deleted file mode 100644 index 6d0cf474..00000000 Binary files a/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png and /dev/null differ 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 deleted file mode 100644 index d21b45d8..00000000 Binary files a/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png and /dev/null differ 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 deleted file mode 100644 index dcad73bc..00000000 Binary files a/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png and /dev/null differ 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 deleted file mode 100644 index a1e0761d..00000000 --- a/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt index c389d360..fc4644a3 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt @@ -62,6 +62,7 @@ open class RenderEntity() : RealmObject(), Parcelable { var zoomMin: Int = 18 //显示最小级别 var zoomMax: Int = 23 //显示最大级别 var enable:Int = 0 // 默认0不是显示 1为渲染显示 2为常显 + var catchEnable:Int = 0 // 0捕捉 1不捕捉 constructor(name: String) : this() { this.name = name