diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 0cf2e923..0d898a13 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -4,43 +4,43 @@ "table": "OMDB_CHECKPOINT", "code": 1012, "name": "检查点", - "zoomMin": 18, - "zoomMax": 23 + "zoomMin": 16, + "zoomMax": 19 }, "2001": { "table": "OMDB_RD_LINK", "code": 2001, "name": "道路线", - "zoomMin": 18, - "zoomMax": 19 + "zoomMin": 16, + "zoomMax": 17 }, "2002": { "table": "OMDB_RD_LINK_FUNCTION_CLASS", "code": 2002, "name": "道路功能等级", - "zoomMin": 18, - "zoomMax": 19 + "zoomMin": 16, + "zoomMax": 17 }, "2008": { "table": "OMDB_RD_LINK_KIND", "code": 2008, "name": "道路种别", - "zoomMin": 18, - "zoomMax": 19 + "zoomMin": 16, + "zoomMax": 17 }, "2010": { "table": "OMDB_LINK_DIRECT", "code": 2010, "name": "道路方向", - "zoomMin": 18, - "zoomMax": 19 + "zoomMin": 16, + "zoomMax": 17 }, "2011": { "table": "OMDB_LINK_NAME", "code": 2011, "name": "道路名", - "zoomMin": 18, - "zoomMax": 19, + "zoomMin": 16, + "zoomMax": 17, "transformer": [ { "k": "geometry", @@ -54,8 +54,8 @@ "table": "OMDB_LANE_MARK_BOUNDARYTYPE", "code": 2013, "name": "车道边界类型", - "zoomMin": 20, - "zoomMax": 23, + "zoomMin": 18, + "zoomMax": 21, "transformer": [ { "k": "geometry", @@ -69,22 +69,22 @@ "table": "OMDB_LINK_SPEEDLIMIT", "code": 2019, "name": "常规线限速", - "zoomMin": 18, - "zoomMax": 19 + "zoomMin": 16, + "zoomMax": 17 }, "2020": { "table": "OMDB_LINK_SPEEDLIMIT_COND", "code": 2020, "name": "条件线限速", - "zoomMin": 18, - "zoomMax": 19 + "zoomMin": 16, + "zoomMax": 17 }, "2021": { "table": "OMDB_LINK_SPEEDLIMIT_VAR", "code": 2021, "name": "可变线限速", - "zoomMin": 18, - "zoomMax": 19 + "zoomMin": 16, + "zoomMax": 17 }, "2022": { "table": "OMDB_CON_ACCESS", @@ -110,8 +110,8 @@ "table": "OMDB_RDBOUND_BOUNDARYTYPE", "code": 2083, "name": "道路边界类型", - "zoomMin": 20, - "zoomMax": 23 + "zoomMin": 18, + "zoomMax": 21 }, "2201":{ "table": "OMDB_BRIDGE", @@ -122,8 +122,8 @@ "table": "OMDB_TUNNEL", "code": 2202, "name": "隧道", - "zoomMin": 18, - "zoomMax": 23, + "zoomMin": 16, + "zoomMax": 21, "transformer": [ { "k": "geometry", @@ -137,8 +137,8 @@ "table": "OMDB_INTERSECTION", "code": 4001, "name": "路口", - "zoomMin": 18, - "zoomMax": 19, + "zoomMin": 16, + "zoomMax": 17, "transformer": [ { "k": "geometry", @@ -152,8 +152,8 @@ "table": "OMDB_SPEEDLIMIT", "code": 4002, "name": "常规点限速", - "zoomMin": 18, - "zoomMax": 23, + "zoomMin": 16, + "zoomMax": 21, "transformer": [ { "k": "maxSpeed", @@ -173,8 +173,8 @@ "table": "OMDB_SPEEDLIMIT_COND", "code": 4003, "name": "条件点限速", - "zoomMin": 18, - "zoomMax": 23, + "zoomMin": 16, + "zoomMax": 21, "transformer": [ { "k": "maxSpeed", @@ -188,8 +188,8 @@ "table": "OMDB_SPEEDLIMIT_VAR", "code": 4004, "name": "可变点限速", - "zoomMin": 18, - "zoomMax": 23, + "zoomMin": 16, + "zoomMax": 21, "transformer": [ { "k": "location", @@ -215,8 +215,8 @@ "table": "OMDB_RESTRICTION", "code": 4006, "name": "普通交限", - "zoomMin": 18, - "zoomMax": 23, + "zoomMin": 16, + "zoomMax": 21, "transformer": [ { "k": "geometry", @@ -254,8 +254,8 @@ "table": "OMDB_ELECTRONICEYE", "code": 4010, "name": "电子眼", - "zoomMin": 18, - "zoomMax": 23, + "zoomMin": 16, + "zoomMax": 21, "transformer": [ { "k": "geometry", @@ -287,8 +287,8 @@ "table": "OMDB_TRAFFICLIGHT", "code": 4022, "name": "交通灯", - "zoomMin": 18, - "zoomMax": 23, + "zoomMin": 16, + "zoomMax": 21, "transformer": [ ] }, @@ -296,8 +296,8 @@ "table": "OMDB_LANEINFO", "code": 4601, "name": "车信", - "zoomMin": 18, - "zoomMax": 19, + "zoomMin": 16, + "zoomMax": 17, "transformer": [ { "k": "geometry", @@ -323,8 +323,8 @@ "table": "OMDB_LANE_LINK_LG", "code": 5001, "name": "车道中心线", - "zoomMin": 20, - "zoomMax": 23, + "zoomMin": 18, + "zoomMax": 21, "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 4cbbb603..50ad0d80 100644 --- a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt +++ b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt @@ -115,8 +115,8 @@ class ImportConfig { class TableInfo { val table: String = "" val code: Int = 0 - val zoomMin: Int = 18 - val zoomMax: Int = 23 + val zoomMin: Int = 16 + val zoomMax: Int = 21 val name: String = "" var checked : Boolean = true var transformer: MutableList = mutableListOf() 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 d7695aae..c425344f 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 @@ -189,6 +189,8 @@ class MainViewModel @Inject constructor( private var disTime: Long = 1000 + private var currentMapZoomLevel: Int = 0 + init { mapController.mMapView.vtmMap.events.bind(Map.UpdateListener { e, mapPosition -> @@ -196,8 +198,13 @@ class MainViewModel @Inject constructor( Map.SCALE_EVENT, Map.MOVE_EVENT, Map.ROTATE_EVENT -> liveDataCenterPoint.value = mapPosition } + if(mapController.mMapView.vtmMap.mapPosition.zoomLevel>=16){ + + } + currentMapZoomLevel = mapController.mMapView.vtmMap.mapPosition.zoomLevel }) + currentMapZoomLevel = mapController.mMapView.vtmMap.mapPosition.zoomLevel shareUtil = ShareUtil(mapController.mMapView.context, 1) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 9fb51e19..d4f29fa3 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1,5 +1,5 @@ - @@ -1486,18 +1486,18 @@ - + - + - + @@ -1530,7 +1530,7 @@ - + @@ -1562,7 +1562,7 @@ - + @@ -1578,14 +1578,14 @@ - + 0 - + @@ -1597,7 +1597,7 @@ - + @@ -1660,7 +1660,7 @@ - + @@ -1687,13 +1687,13 @@ - + - + @@ -1709,7 +1709,7 @@ - + @@ -1722,7 +1722,7 @@ - + @@ -1737,7 +1737,7 @@ - + listResult) { + public boolean decode(int mapLevel,Tile tile, ITileDataSink sink, List listResult) { mTileDataSink = sink; mTileScale = 1 << tile.zoomLevel; mTileX = tile.tileX / mTileScale; @@ -74,10 +74,12 @@ public class OMDBDataDecoder extends TileDecoder { listResult.stream().iterator().forEachRemaining(new Consumer() { @Override public void accept(RenderEntity renderEntity) { - if(zoomLevel>=renderEntity.getZoomMin()&&zoomLevel<=renderEntity.getZoomMax()){ + if(!(mapLevelrenderEntity.getZoomMax())){ Map properties= new HashMap<>(renderEntity.getProperties().size()); properties.putAll(renderEntity.getProperties()); parseGeometry(renderEntity.getTable(), renderEntity.getWkt(), properties); + }else{ + Log.e("qj","render"+renderEntity.name+"=="+renderEntity.getZoomMin()+"==="+renderEntity.getZoomMax()); } } }); @@ -188,4 +190,10 @@ public class OMDBDataDecoder extends TileDecoder { if (!hasName && fallbackName != null) mMapElement.tags.add(new Tag(Tag.KEY_NAME, fallbackName, false)); } + + public void clean(){ + if(mTileDataSink!=null){ + mTileDataSink.notifyAll(); + } + } } diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java index 0596ffb5..ed7e07d4 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java @@ -70,7 +70,7 @@ public class OMDBReferenceDecoder extends TileDecoder { listResult.stream().iterator().forEachRemaining(new Consumer() { @Override public void accept(ReferenceEntity renderEntity) { - if(mapLevel>=renderEntity.getZoomMin()&&mapLevel<=renderEntity.getZoomMax()){ + if(!(mapLevelrenderEntity.getZoomMax())){ Map properties= new HashMap<>(renderEntity.getProperties().size()); properties.putAll(renderEntity.getProperties()); parseGeometry(renderEntity.getTable(), renderEntity.getWkt(), properties); diff --git a/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java b/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java index a228f9bd..a09727ba 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java @@ -31,7 +31,7 @@ public class Constant { public static String[] HAD_LAYER_INVISIABLE_ARRAY; public static final int OVER_ZOOM = 21; public static final int MAX_ZOOM = 23; - public static final int OMDB_MIN_ZOOM = 18; + public static final int OMDB_MIN_ZOOM = 16; /** * 服务器地址