xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

面数据增加纹理

Browse Source
This commit is contained in:
xiaoyan
2023-07-18 10:56:21 +08:00
parent 13089fe6f2
commit 3f173aa86f
10 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
collect-library/resources/rendertheme.xsd
View File

@@ -144,6 +144,7 @@
<xs:attribute name="blend" default="-1" type="xs:integer" use="optional"/>
<xs:attribute name="blend-fill" default="#000000" type="tns:color" use="optional"/>
<xs:attribute name="mesh" default="false" type="xs:boolean" use="optional"/>
<xs:attribute name="repeat" default="true" type="xs:boolean" use="optional"/>
</xs:complexType>
<xs:complexType name="caption">

9
collect-library/src/main/assets/editormarker.xml
View File

@@ -1600,7 +1600,7 @@
</m>
</m>
<!-- 道路线 -->
<m k="qi_table" v="OMDB_RD_LINK">
<m v="OMDB_RD_LINK">
<line stroke="#9c9c9c" width="1" />
</m>
<!--道路种别-->
@@ -1835,10 +1835,6 @@
<!-- 车信 -->
<m v="OMDB_LANEINFO">
<m k="currentType" v="0">
<m k="currentDirect" v="0">
<symbol repeat="false" repeat-start="0" repeat-gap="2000"
src="assets:omdb/4601/normal/1301_0.svg" symbol-height="29" symbol-width="29"></symbol>
</m>
<m k="currentDirect" v="1">
<symbol repeat="false" repeat-start="0" repeat-gap="2000"
src="assets:omdb/4601/normal/1301_1.svg" symbol-height="29" symbol-width="29"></symbol>
@@ -2237,6 +2233,9 @@
</m>
</m>
</m>
<m v="OMDB_AREA">
<area use="water"></area>
</m>
<m k="type" v="s_2_e">
<line use="s2e" />
</m>

BIN
collect-library/src/main/assets/omdb/test.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 79 KiB

6
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java
View File

@@ -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;

2
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java
View File

@@ -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;

2
collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java
View File

@@ -222,9 +222,7 @@ public class GeometryTools {
Geometry geometry;
try {
geometry = reader.read(wkt);
if (geometry != null) {
return geometry;
}