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 64ac2675..cbc2aca8 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -153,6 +153,9 @@ class ImportOMDBHelper @AssistedInject constructor( if (list != null) { // 将list数据转换为map for ((index, line) in list.withIndex()) { + if (line == null || line.trim() == "") { + continue + } Log.d("ImportOMDBHelper", "解析第：${index+1}行") val map = gson.fromJson>(line, object:TypeToken>(){}.getType()) .toMutableMap() diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index e9d14e89..8c7ec3f1 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -164,6 +164,7 @@ class MainActivity : BaseActivity() { // 在mapController初始化前获取当前OMDB图层显隐 viewModel.refreshOMDBLayer(LayerConfigUtils.getLayerConfigList()) mapController.mMapView.vtmMap.viewport().maxZoomLevel = 25 + mapController.mMapView.vtmMap.viewport().maxTilt = 85f //关联生命周期 binding.lifecycleOwner = this //给xml转递对象 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 8dbcfbd7..e78ff100 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 @@ -115,7 +115,7 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) : viewModel.readRealmData() // 定位到指定位置 niMapController.mMapView.vtmMap.animator() - .animateTo(GeoPoint( 39.79440941020727, 116.51302718503038 )) + .animateTo(GeoPoint( 39.7991980627346, 116.50936676873703 )) } // R.id.personal_center_menu_task_list -> { // findNavController().navigate(R.id.TaskManagerFragment) diff --git a/collect-library/resources/rendertheme.xsd b/collect-library/resources/rendertheme.xsd index 3d4d76c5..6b2e9c6d 100644 --- a/collect-library/resources/rendertheme.xsd +++ b/collect-library/resources/rendertheme.xsd @@ -144,6 +144,7 @@ + diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 3d2a4ca0..f6ef4f7a 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1600,7 +1600,7 @@ - + @@ -1835,10 +1835,6 @@ - - - @@ -2237,6 +2233,9 @@ + + + diff --git a/collect-library/src/main/assets/omdb/test.jpeg b/collect-library/src/main/assets/omdb/test.jpeg new file mode 100644 index 00000000..06d62e5f Binary files /dev/null and b/collect-library/src/main/assets/omdb/test.jpeg differ diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java index 65fb92fc..69ee70b6 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java @@ -4,11 +4,9 @@ import static org.oscim.core.MercatorProjection.latitudeToY; import static org.oscim.core.MercatorProjection.longitudeToX; import android.os.Build; -import android.util.Log; import androidx.annotation.RequiresApi; -import com.navinfo.collect.library.data.entity.GeometryFeatureEntity; import com.navinfo.collect.library.data.entity.RenderEntity; import org.locationtech.jts.geom.Coordinate; @@ -20,8 +18,6 @@ import org.locationtech.jts.geom.MultiPoint; import org.locationtech.jts.geom.MultiPolygon; import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; -import org.locationtech.jts.io.ParseException; -import org.locationtech.jts.io.WKBReader; import org.oscim.core.MapElement; import org.oscim.core.Tag; import org.oscim.core.Tile; @@ -144,7 +140,7 @@ public class OMDBDataDecoder extends TileDecoder { int length = removeLast ? coordinates.length - 1 : coordinates.length; for (int i = 0; i < length; i++) { mMapElement.addPoint((float) ((longitudeToX(coordinates[i].x) - mTileX) * mTileScale), - (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale)); + (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), (float)coordinates[i].z); } // int length = removeLast ? coordinates.length - 1 : coordinates.length; 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 d859fde9..075f465c 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 @@ -140,7 +140,7 @@ public class OMDBReferenceDecoder extends TileDecoder { int length = removeLast ? coordinates.length - 1 : coordinates.length; for (int i = 0; i < length; i++) { mMapElement.addPoint((float) ((longitudeToX(coordinates[i].x) - mTileX) * mTileScale), - (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale)); + (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), (float)coordinates[i].z); } // int length = removeLast ? coordinates.length - 1 : coordinates.length; diff --git a/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java b/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java index 44271835..3086ee49 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java @@ -222,9 +222,7 @@ public class GeometryTools { Geometry geometry; try { - geometry = reader.read(wkt); - if (geometry != null) { return geometry; } diff --git a/vtm b/vtm index c6ba77aa..24467eb5 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit c6ba77aa0eb90a84fb19377706eb6792ec4a42b6 +Subproject commit 24467eb56e3a4eafe8a5747bec7590ab234569fb