更新图标资源

This commit is contained in:
qiji4215 2023-11-24 09:26:35 +08:00
parent 167cbdc4d3
commit 231d7c429d
22 changed files with 754 additions and 351 deletions

View File

@ -101,7 +101,7 @@
"code": 2017,
"name": "道路施工",
"catch": true,
"checkLinkId": false,
"checkLinkId": true,
"zoomMin": 15,
"zoomMax": 17
},
@ -166,11 +166,38 @@
"zoomMin": 15,
"zoomMax": 17
},
"2070": {
"table": "OMDB_LINK_SEPARATION",
"code": 2070,
"name": "设施分离",
"zoomMin": 18,
"zoomMax": 20,
"filterData": true,
"catch": true
},
"2071": {
"table": "OMDB_LINK_MEDIAN",
"code": 2071,
"name": "中央隔离带",
"zoomMin": 18,
"zoomMax": 20,
"isDependOnOtherTable": true,
"filterData": true,
"catch": true,
"transformer": [
{
"k": "geometry",
"v": "~",
"klib": "geometry",
"vlib": "generateLinkMedianToPolygon()"
}
]
},
"2083": {
"table": "OMDB_RDBOUND_BOUNDARYTYPE",
"code": 2083,
"name": "道路边界类型",
"checkLinkId": false,
"checkLinkId": true,
"filterData": true,
"zoomMin": 18,
"zoomMax": 20,
@ -263,7 +290,7 @@
"zoomMax": 20,
"catch": true,
"filterData": false,
"checkLinkId": false,
"checkLinkId": true,
"transformer": [
{
"k": "geometry",
@ -280,7 +307,7 @@
"zoomMin": 15,
"zoomMax": 20,
"catch": true,
"checkLinkId": false,
"checkLinkId": true,
"transformer": [
{
"k": "geometry",
@ -297,14 +324,14 @@
"zoomMin": 18,
"zoomMax": 20,
"catch": true,
"checkLinkId": false,
"checkLinkId": true,
"transformer": []
},
"3003": {
"table": "OMDB_OBJECT_SYMBOL",
"code": 3003,
"name": "符号",
"checkLinkId": false,
"checkLinkId": true,
"zoomMin": 18,
"zoomMax": 20,
"catch": true,
@ -314,7 +341,7 @@
"table": "OMDB_OBJECT_ARROW",
"code": 3004,
"name": "箭头",
"checkLinkId": false,
"checkLinkId": true,
"zoomMin": 18,
"zoomMax": 20,
"catch": true,
@ -367,7 +394,7 @@
"code": 3012,
"name": "导流区",
"catch": true,
"checkLinkId": false,
"checkLinkId": true,
"zoomMin": 18,
"zoomMax": 20
},
@ -376,7 +403,7 @@
"code": 3014,
"name": "人行横道",
"catch": true,
"checkLinkId": false,
"checkLinkId": true,
"zoomMin": 18,
"zoomMax": 20
},
@ -384,7 +411,7 @@
"table": "OMDB_OBJECT_STOPLOCATION",
"code": 3016,
"name": "停止位置",
"checkLinkId": false,
"checkLinkId": true,
"filterData": true,
"zoomMin": 18,
"catch": true,
@ -395,7 +422,7 @@
"code": 3027,
"name": "路口内交通岛",
"catch": true,
"checkLinkId": false,
"checkLinkId": true,
"zoomMin": 18,
"zoomMax": 20
},
@ -630,7 +657,7 @@
"zoomMax": 20,
"filterData": true,
"catch": true,
"checkLinkId": false,
"checkLinkId": true,
"transformer": [
{
"k": "geometry",
@ -695,7 +722,7 @@
"name": "车道中心线",
"catch": false,
"isDependOnOtherTable": false,
"checkLinkId": false,
"checkLinkId": true,
"zoomMin": 18,
"zoomMax": 20,
"transformer": [

View File

@ -194,7 +194,8 @@ class ImportPreProcess {
val coord = Coordinate(point.getX() - dx, point.getY() - dy)
// 将这个点记录在数据中
val geometryTranslate: Geometry = GeometryTools.createGeometry(doubleArrayOf(coord.x, coord.y))
val geometryTranslate: Geometry =
GeometryTools.createGeometry(doubleArrayOf(coord.x, coord.y))
renderEntity.geometry = geometryTranslate.toString()
}
@ -237,7 +238,8 @@ class ImportPreProcess {
GeometryTools.createLineString(arrayOf<Coordinate>(pointStart, pointEnd)).toString()
startEndReference.properties["qi_table"] = renderEntity.table
startEndReference.properties["type"] = "s_2_e"
startEndReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(startEndReference.properties))
startEndReference.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(startEndReference.properties))
renderEntity.referenceEntitys.add(startEndReference)
}
@ -281,7 +283,8 @@ class ImportPreProcess {
startReference.geometry =
GeometryTools.createGeometry(GeoPoint(pointStart.y, pointStart.x)).toString()
startReference.properties["qi_table"] = renderEntity.table
startReference.properties["type"] = "s${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000)>0) "_dec" else "_acc"}"
startReference.properties["type"] =
"s${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000) > 0) "_dec" else "_acc"}"
startReference.properties["geometry"] = startReference.geometry
listResult.add(startReference)
@ -299,7 +302,8 @@ class ImportPreProcess {
endReference.geometry =
GeometryTools.createGeometry(GeoPoint(pointEnd.y, pointEnd.x)).toString()
endReference.properties["qi_table"] = renderEntity.table
endReference.properties["type"] = "e${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000)>0) "_dec" else "_acc"}"
endReference.properties["type"] =
"e${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000) > 0) "_dec" else "_acc"}"
endReference.properties["geometry"] = endReference.geometry
renderEntity.referenceEntitys.add(endReference)
//listResult.add(endReference)
@ -351,7 +355,8 @@ class ImportPreProcess {
Log.e("qj", "generateS2EReferencePoint===${startReference.geometry}")
startReference.properties["geometry"] = startReference.geometry
startReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(startReference.properties))
startReference.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(startReference.properties))
listResult.add(startReference)
Log.e("qj", "generateS2EReferencePoint===1")
@ -385,7 +390,8 @@ class ImportPreProcess {
Log.e("qj", "generateS2EReferencePoint===e_2_p${renderEntity.name}")
}
endReference.properties["geometry"] = endReference.geometry
endReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(endReference.properties))
endReference.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(endReference.properties))
renderEntity.referenceEntitys.add(endReference)
Log.e("qj", "generateS2EReferencePoint===4")
}
@ -482,7 +488,8 @@ class ImportPreProcess {
WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd)))
angleReference.properties["qi_table"] = renderEntity.table
angleReference.properties["type"] = "angle"
angleReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
angleReference.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
renderEntity.referenceEntitys.add(angleReference)
}
Log.e("qj", "generateDirectReferenceLine===1")
@ -598,21 +605,21 @@ class ImportPreProcess {
if (listResult.size > 0) {
insertData(listResult)
}
}else if(boundaryType.toInt() == 9){//根据线型平分为点数据用于渲染3D标
} else if (boundaryType.toInt() == 9) {//根据线型平分为点数据用于渲染3D标
dengfenLineString(renderEntity)
}
}
}
}
fun dengfenLineString(renderEntity: RenderEntity){
if (renderEntity.code == DataCodeEnum.OMDB_LANE_MARK_BOUNDARYTYPE.code||renderEntity.code == DataCodeEnum.OMDB_RDBOUND_BOUNDARYTYPE.code){
fun dengfenLineString(renderEntity: RenderEntity) {
if (renderEntity.code == DataCodeEnum.OMDB_LANE_MARK_BOUNDARYTYPE.code || renderEntity.code == DataCodeEnum.OMDB_RDBOUND_BOUNDARYTYPE.code) {
val boundaryType = renderEntity.properties["boundaryType"]
if (boundaryType != null) {
if(boundaryType.toInt()==9){
Log.e("qj","杆状物转换开始")
val geopointList = GeometryTools.getLineToDengGeoPints(renderEntity.wkt,5.0)
geopointList.forEach{
if (boundaryType.toInt() == 9) {
Log.e("qj", "杆状物转换开始")
val geopointList = GeometryTools.getLineToDengGeoPints(renderEntity.wkt, 5.0)
geopointList.forEach {
val referenceEntity = ReferenceEntity()
referenceEntity.name = "${renderEntity.name}线转点坐标"
referenceEntity.table = renderEntity.table
@ -625,10 +632,11 @@ class ImportPreProcess {
referenceEntity.zoomMax = renderEntity.zoomMax
referenceEntity.taskId = renderEntity.taskId
referenceEntity.enable = renderEntity.enable
referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
referenceEntity.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
renderEntity.referenceEntitys.add(referenceEntity)
}
Log.e("qj","杆状物转换结束")
Log.e("qj", "杆状物转换结束")
}
}
}
@ -673,7 +681,8 @@ class ImportPreProcess {
referenceEntity.properties["symbol"] =
"assets:omdb/4601/${type}/1301_${referenceEntity.properties["currentDirect"]}.svg"
Log.d("unpackingLaneInfo", referenceEntity.properties["symbol"].toString())
referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
referenceEntity.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
renderEntity.referenceEntitys.add(referenceEntity)
Log.e("qj", "车信===插入车信箭头")
}
@ -681,9 +690,10 @@ class ImportPreProcess {
//将主表线转化为单个点,按点要素实现捕捉
if (Geometry.TYPENAME_LINESTRING == renderEntity.wkt?.geometryType) {
var coordinates = renderEntity.wkt?.coordinates
if(coordinates!=null){
if (coordinates != null) {
val p1: Coordinate = coordinates[0]
renderEntity.geometry = GeometryTools.createGeometry(GeoPoint(p1.y,p1.x)).toString()
renderEntity.geometry =
GeometryTools.createGeometry(GeoPoint(p1.y, p1.x)).toString()
}
}
@ -775,30 +785,79 @@ class ImportPreProcess {
* 生成车道中心线面宽度
* */
fun generateAddWidthLine(renderEntity: RenderEntity) {
var newTime = 0L
// 添加车道中心面渲染原则,根据车道宽度进行渲染
val angleReference = ReferenceEntity()
// angleReference.renderEntityId = renderEntity.id
angleReference.name = "${renderEntity.name}车道中线面"
angleReference.table = renderEntity.table
angleReference.code = renderEntity.code
// Log.e("jingo", "几何转换开始")
//angleReference.geometry = renderEntity.geometry
angleReference.geometry = GeometryTools.computeLine(0.000035,0.000035,renderEntity.geometry)
// Log.e("jingo", "几何转换结束")
angleReference.geometry =
GeometryTools.computeLine(0.000035, 0.000035, renderEntity.geometry)
angleReference.properties["qi_table"] = renderEntity.table
angleReference.properties["widthProperties"] = "3"
angleReference.zoomMin = renderEntity.zoomMin
angleReference.zoomMax = renderEntity.zoomMax
angleReference.taskId = renderEntity.taskId
angleReference.enable = renderEntity.enable
val listResult = mutableListOf<ReferenceEntity>()
angleReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
angleReference.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
renderEntity.referenceEntitys.add(angleReference)
//listResult.add(angleReference)
//insertData(listResult)
}
/**
* 中央隔离带根据线几何生成面
* */
fun generateLinkMedianToPolygon(renderEntity: RenderEntity) {
if (renderEntity.code == DataCodeEnum.OMDB_LINK_MEDIAN.code) {
if (renderEntity.properties.containsKey("side") && renderEntity.properties.containsKey("median") && renderEntity.properties.containsKey(
"medianSurface"
) && renderEntity.properties.containsKey("medianWidth")&& renderEntity.properties.containsKey("direct")
) {
//基于通行方向左右 0 左侧 1 右侧 (双方向不制作)
val side = renderEntity.properties["side"]
//1有中央隔离带不与任何护栏共存 2有中央隔离带与非固定护栏共存
val median = renderEntity.properties["median"]?.toInt()
//0 未铺设 1 铺设 2 混合
var medianSurface = renderEntity.properties["medianSurface"]?.toInt()
if(median==2){
medianSurface = 3 + medianSurface!!
}
//宽度
val medianWidth = renderEntity.properties["medianWidth"]?.toDouble()
// 添加车道中心面渲染原则,根据车道宽度进行渲染
val angleReference = ReferenceEntity()
//方向 0\1\2顺方向 3逆方向
when(renderEntity.properties["direct"]?.toInt()){
0,1,2->{
if (medianWidth != null) {
angleReference.geometry =
GeometryTools.computeLine(medianWidth/100000000, 0.0, renderEntity.geometry)
Log.e("qj","width==${medianWidth/100000000}")
}
}
3->{
if (medianWidth != null) {
angleReference.geometry =
GeometryTools.computeLine(0.0, medianWidth/100000000, renderEntity.geometry)
Log.e("qj","width==${medianWidth/100000000}")
}
}
}
angleReference.name = "${renderEntity.name}"
angleReference.table = renderEntity.table
angleReference.code = renderEntity.code
angleReference.properties["qi_table"] = renderEntity.table
angleReference.properties["medianSurface"] = medianSurface.toString()
angleReference.zoomMin = renderEntity.zoomMin
angleReference.zoomMax = renderEntity.zoomMax
angleReference.taskId = renderEntity.taskId
angleReference.enable = renderEntity.enable
angleReference.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
renderEntity.referenceEntitys.add(angleReference)
}
}
}
/**
* 生成默认路口数据的参考数据
@ -825,7 +884,8 @@ class ImportPreProcess {
GeometryTools.createGeometry(nodeJSONObject["geometry"].toString()).toString()
intersectionReference.properties["qi_table"] = renderEntity.table
intersectionReference.properties["type"] = "node"
intersectionReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(intersectionReference.properties))
intersectionReference.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(intersectionReference.properties))
renderEntity.referenceEntitys.add(intersectionReference)
//listResult.add(intersectionReference)
}
@ -838,13 +898,13 @@ class ImportPreProcess {
* */
fun sortGeometry(renderEntity: RenderEntity) {
// 路口数据的其他点位是保存在nodeList对应的数组下
/* if (renderEntity.properties.containsKey("linkPid")) {
val linkList = renderEntity.properties["linkPid"]?.split(",")
//几何较少时需要判断是否要计算判断长短边
if(linkList!=null&&linkList.size<3){
/* if (renderEntity.properties.containsKey("linkPid")) {
val linkList = renderEntity.properties["linkPid"]?.split(",")
//几何较少时需要判断是否要计算判断长短边
if(linkList!=null&&linkList.size<3){
}
}*/
}
}*/
}
@ -1011,7 +1071,8 @@ class ImportPreProcess {
dynamicSrcReference.properties["type"] = "dynamicSrc"
val code = renderEntity.properties[codeName]
dynamicSrcReference.properties["src"] = "${prefix}${code}${suffix}"
dynamicSrcReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(dynamicSrcReference.properties))
dynamicSrcReference.propertiesDb =
DeflaterUtil.zipString(JSON.toJSONString(dynamicSrcReference.properties))
renderEntity.referenceEntitys.add(dynamicSrcReference)
//listResult.add(dynamicSrcReference)
}
@ -1120,24 +1181,25 @@ class ImportPreProcess {
fun generateLaneAccessType(renderEntity: RenderEntity): Boolean {
if (renderEntity.properties.containsKey("accessCharacteristic")) {
// 解析accessCharacteristic判断是否存在指定属性
val accessCharacteristic = renderEntity.properties["accessCharacteristic"].toString().toInt()
val accessCharacteristic =
renderEntity.properties["accessCharacteristic"].toString().toInt()
var str = ""
if (accessCharacteristic.and(4)>0) {
if (accessCharacteristic.and(4) > 0) {
str += ""
}
if (accessCharacteristic.and(8)>0) {
if (accessCharacteristic.and(8) > 0) {
if (str.isNotEmpty()) {
str += "|"
}
str += ""
}
if (accessCharacteristic.and(64)>0) {
if (accessCharacteristic.and(64) > 0) {
if (str.isNotEmpty()) {
str += "|"
}
str += ""
}
if (accessCharacteristic.and(128)>0) {
if (accessCharacteristic.and(128) > 0) {
if (str.isNotEmpty()) {
str += "|"
}
@ -1155,8 +1217,9 @@ class ImportPreProcess {
* 生成车道点限速的名称
* */
fun obtainLaneSpeedLimitName(renderEntity: RenderEntity) {
if (renderEntity.properties.containsKey("maxSpeed")&&renderEntity.properties.containsKey("minSpeed")) {
renderEntity.properties["ref"] = "${renderEntity.properties["maxSpeed"]}|${renderEntity.properties["minSpeed"]}"
if (renderEntity.properties.containsKey("maxSpeed") && renderEntity.properties.containsKey("minSpeed")) {
renderEntity.properties["ref"] =
"${renderEntity.properties["maxSpeed"]}|${renderEntity.properties["minSpeed"]}"
}
}
@ -1164,7 +1227,7 @@ class ImportPreProcess {
* 生成立交的辅助图层数据
* */
fun obtainZLevelReference(renderEntity: RenderEntity) {
if(renderEntity!=null&&renderEntity.properties.containsKey("zlevelList")) {
if (renderEntity != null && renderEntity.properties.containsKey("zlevelList")) {
// 获取ZLevelList数据
val zLevelList = JSONArray(renderEntity.properties["zlevelList"])
for (i in 0 until zLevelList.length()) {
@ -1173,7 +1236,8 @@ class ImportPreProcess {
val startEnd = zLevelObject.optInt("startEnd", 0)
val zLevel = zLevelObject.optInt("zlevel", 0)
val shpSeqNum = zLevelObject.optInt("shpSeqNum", 0)
val linkGeometry = GeometryTools.createGeometry(zLevelObject.optString("linkGeometry"))
val linkGeometry =
GeometryTools.createGeometry(zLevelObject.optString("linkGeometry"))
val coordinates = linkGeometry!!.coordinates
val referenceEntityList = mutableListOf<ReferenceEntity>()
// 判断当前数据的startEnd如果是0则向前和向后都绘制线如果是1起点则只绘制前两个点组成的线如果是2终点则只绘制后两个点组成的线
@ -1182,35 +1246,47 @@ class ImportPreProcess {
zLevelReference.properties["type"] = "zlevelLine"
// zLevelReference.properties["name"] = zLevel.toString()
// 根据shpSeqNum获取对应的点位
if (shpSeqNum < coordinates.size-1) {
if (shpSeqNum < coordinates.size - 1) {
val currentCoordinate = coordinates[shpSeqNum]
var nextCoordinate = coordinates[shpSeqNum+1]
var nextCoordinate = coordinates[shpSeqNum + 1]
// 计算两个点的距离,如果小于指定阈值,程序按照方向计算延长线
// if (GeometryTools.getDistance(currentCoordinate.y, currentCoordinate.x, nextCoordinate.y, nextCoordinate.x) < 3.0) {
// 获取当前点到下一个点的线方向
val angle = Angle.angle(currentCoordinate, nextCoordinate)
// 计算偏移距离
val dx: Double = GeometryTools.convertDistanceToDegree(
3.0,
currentCoordinate.y!!
) * Math.cos(angle)
val dy: Double = GeometryTools.convertDistanceToDegree(
3.0,
currentCoordinate.y!!
) * Math.sin(angle)
// 获取当前点到下一个点的线方向
val angle = Angle.angle(currentCoordinate, nextCoordinate)
// 计算偏移距离
val dx: Double = GeometryTools.convertDistanceToDegree(
3.0,
currentCoordinate.y!!
) * Math.cos(angle)
val dy: Double = GeometryTools.convertDistanceToDegree(
3.0,
currentCoordinate.y!!
) * Math.sin(angle)
// 计算偏移后的点
nextCoordinate =
Coordinate(currentCoordinate.getX() + dx, currentCoordinate.getY() + dy)
// 计算偏移后的点
nextCoordinate =
Coordinate(currentCoordinate.getX() + dx, currentCoordinate.getY() + dy)
// }
zLevelReference.geometry = GeometryTools.createLineString(arrayListOf(GeoPoint(currentCoordinate.y, currentCoordinate.x), GeoPoint(nextCoordinate.y, nextCoordinate.x))).toString()
zLevelReference.geometry = GeometryTools.createLineString(
arrayListOf(
GeoPoint(
currentCoordinate.y,
currentCoordinate.x
), GeoPoint(nextCoordinate.y, nextCoordinate.x)
)
).toString()
referenceEntityList.add(zLevelReference)
val zLevelNameReference = createZLevelReference(renderEntity)
zLevelNameReference.properties["type"] = "zlevelName"
zLevelNameReference.properties["name"] = zLevel.toString()
zLevelNameReference.geometry = GeometryTools.createGeometry(GeoPoint(nextCoordinate.y, nextCoordinate.x)).toString()
zLevelNameReference.geometry = GeometryTools.createGeometry(
GeoPoint(
nextCoordinate.y,
nextCoordinate.x
)
).toString()
referenceEntityList.add(zLevelNameReference)
}
}
@ -1220,34 +1296,43 @@ class ImportPreProcess {
zLevelReference.properties["type"] = "zlevelLine"
// zLevelReference.properties["name"] = zLevel.toString()
// 根据shpSeqNum获取对应的点位
if (shpSeqNum < coordinates.size&&shpSeqNum>0) {
if (shpSeqNum < coordinates.size && shpSeqNum > 0) {
val currentCoordinate = coordinates[shpSeqNum]
var preCoordinate = coordinates[shpSeqNum-1]
var preCoordinate = coordinates[shpSeqNum - 1]
// 计算两个点的距离,如果小于指定阈值,程序按照方向计算延长线
// if (GeometryTools.getDistance(currentCoordinate.y, currentCoordinate.x, preCoordinate.y, preCoordinate.x) < 3.0) {
// 获取当前点到下一个点的线方向
val angle = Angle.angle(currentCoordinate, preCoordinate)
// 计算偏移距离
val dx: Double = GeometryTools.convertDistanceToDegree(
3.0,
currentCoordinate.y!!
) * Math.cos(angle)
val dy: Double = GeometryTools.convertDistanceToDegree(
3.0,
currentCoordinate.y!!
) * Math.sin(angle)
// 获取当前点到下一个点的线方向
val angle = Angle.angle(currentCoordinate, preCoordinate)
// 计算偏移距离
val dx: Double = GeometryTools.convertDistanceToDegree(
3.0,
currentCoordinate.y!!
) * Math.cos(angle)
val dy: Double = GeometryTools.convertDistanceToDegree(
3.0,
currentCoordinate.y!!
) * Math.sin(angle)
// 计算偏移后的点
preCoordinate =
Coordinate(currentCoordinate.getX() + dx, currentCoordinate.getY() + dy)
// 计算偏移后的点
preCoordinate =
Coordinate(currentCoordinate.getX() + dx, currentCoordinate.getY() + dy)
// }
zLevelReference.geometry = GeometryTools.createLineString(arrayListOf(GeoPoint(currentCoordinate.y, currentCoordinate.x), GeoPoint(preCoordinate.y, preCoordinate.x))).toString()
zLevelReference.geometry = GeometryTools.createLineString(
arrayListOf(
GeoPoint(
currentCoordinate.y,
currentCoordinate.x
), GeoPoint(preCoordinate.y, preCoordinate.x)
)
).toString()
referenceEntityList.add(zLevelReference)
val zLevelNameReference = createZLevelReference(renderEntity)
zLevelNameReference.properties["type"] = "zlevelName"
zLevelNameReference.properties["name"] = zLevel.toString()
zLevelNameReference.geometry = GeometryTools.createGeometry(GeoPoint(preCoordinate.y, preCoordinate.x)).toString()
zLevelNameReference.geometry =
GeometryTools.createGeometry(GeoPoint(preCoordinate.y, preCoordinate.x))
.toString()
referenceEntityList.add(zLevelNameReference)
}
}

View File

@ -64,7 +64,7 @@
<item
android:id="@+id/personal_center_menu_version"
android:icon="@drawable/ic_baseline_layers_24"
android:title="版本24QE1_V1.1.1_20231115_A" />
android:title="版本24QE1_V1.2.1_20231124_A" />
</group>
<group android:checkableBehavior="single">
<item android:title="小标题">

View File

@ -1616,12 +1616,34 @@
</m>
</m>
<!-- 中央隔离带 -->
<m v="OMDB_LINK_MEDIAN">
<m k="medianSurface" v="0">
<area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_0.svg"></area>
</m>
<m k="medianSurface" v="1">
<area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_1.svg"></area>
</m>
<m k="medianSurface" v="2">
<area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_2.svg"></area>
</m>
<m k="medianSurface" v="3">
<area use="obj-area" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_0.svg"></area>
</m>
<m k="medianSurface" v="4">
<area use="obj-area" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_1.svg"></area>
</m>
<m k="medianSurface" v="5">
<area use="obj-area" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_2.svg"></area>
</m>
</m>
<!-- 道路边界类型 -->
<m v="OMDB_RDBOUND_BOUNDARYTYPE">
<outline-layer id="boundaryType" stroke="#8e44ad" width="0.1" />
<!--护栏-->
<m k="boundaryType" v="4">
<symbol repeat="true" repeat-gap="12" gland="true" repeat-start="0.01" src="assets:omdb/icon_2013_4.svg" symbol-width="16" symbol-height="36"></symbol>
<symbol repeat="true" repeat-gap="36" gland="true" repeat-start="5" src="assets:omdb/icon_2013_4.svg" symbol-width="56" symbol-height="56"></symbol>
</m>
<!--路牙-->
<m k="boundaryType" v="3">
@ -1629,7 +1651,7 @@
</m>
<!---->
<m k="boundaryType" v="5">
<symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_3.svg" symbol-width="24" symbol-height="12"></symbol>
<line stroke="#495462" use="boundaryType" width="0.2"/>
</m>
<!--铺设路面边缘-->
<m k="boundaryType" v="6">
@ -1648,7 +1670,7 @@
<!--护栏-->
<m k="boundaryType" v="4">
<symbol repeat="true" repeat-gap="12" gland="true" repeat-start="0.01" src="assets:omdb/icon_2013_4.svg" symbol-width="16" symbol-height="36"></symbol>
<symbol repeat="true" repeat-gap="36" gland="true" repeat-start="5" src="assets:omdb/icon_2013_4.svg" symbol-width="56" symbol-height="56"></symbol>
</m>
<!--路牙-->
<m k="boundaryType" v="3">
@ -1656,7 +1678,7 @@
</m>
<!---->
<m k="boundaryType" v="5">
<symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_3.svg" symbol-width="24" symbol-height="12"></symbol>
<line stroke="#495462" use="boundaryType" width="0.2"/>
</m>
<!--铺设路面边缘-->
<m k="boundaryType" v="6">
@ -1882,6 +1904,11 @@
</m>
</m>
<!-- 设施分离 -->
<m v="OMDB_LINK_SEPARATION">
<symbol repeat="true" repeat-gap="18" gland="true" repeat-start="0" src="assets:omdb/icon_2070_0.svg" symbol-width="32" symbol-height="32"></symbol>
</m>
<!-- 停止位置 -->
<m v="OMDB_OBJECT_STOPLOCATION">
@ -1919,7 +1946,7 @@
</m>
<m k="type" v="angle">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="24"
src="assets:omdb/icon_arrow_right.svg" ></symbol>
src="assets:omdb/icon_arrow_right_bottom.svg" ></symbol>
</m>
<m k="type" v="s_2_e">
<line use="s2e" />
@ -1940,7 +1967,7 @@
</m>
<m k="type" v="angle">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="24"
src="assets:omdb/icon_arrow_right.svg" ></symbol>
src="assets:omdb/icon_arrow_right_bottom.svg" ></symbol>
</m>
<m k="type" v="s_2_e">
<line use="s2e" />

View File

@ -2,60 +2,95 @@
<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" />
<style>
.p{fill:none;}.p,.q,.r,.s,.t,.u,.v,.w,.x,.y,.z,.aa,.ab{stroke-width:0px;}.q{fill:url(#e);}.r{fill:url(#f);}.s{fill:url(#d);}.t{fill:url(#j);}.u{fill:url(#i);}.v{fill:url(#h);}.w{fill:url(#m);}.x{fill:url(#g);}.y{fill:url(#o);}.z{fill:url(#k);}.aa{fill:url(#n);}.ab{fill:url(#l);}
</style>
<linearGradient id="d" x1="48.3" y1="52.7" x2="49.7" y2="52.7"
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=".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" />
<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="77.7" y1="64.5" x2="84.1" y2="64.5"
gradientTransform="matrix(1, 0, 0, 1, 0, 0)" xlink:href="#d" />
<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="52.7" x2="103.3" y2="52.7" xlink:href="#d" />
<linearGradient id="i" x1="92" y1="52.7" x2="93.3" y2="52.7" xlink:href="#d" />
<linearGradient id="j" x1="14.4" y1="52.7" x2="15.8" y2="52.7" xlink:href="#d" />
<linearGradient id="k" x1="4.5" y1="52.7" x2="5.8" y2="52.7" xlink:href="#d" />
<linearGradient id="l" x1="407.3" y1="29.7" x2="408.6" y2="29.7"
gradientTransform="translate(-354.2 15.6)" xlink:href="#d" />
<linearGradient id="m" x1="392.6" y1="29.7" x2="393.9" y2="29.7"
gradientTransform="translate(-339.5 30.3)" xlink:href="#d" />
<linearGradient id="n" x1="406.7" y1="360.1" x2="411.5" y2="360.1"
gradientTransform="translate(-382 -307.4)" 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="52.7" x2="83.3" y2="52.7"
gradientTransform="matrix(1,0,0,1,0,0)" xlink:href="#n" />
</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>
<rect class="p" width="107.5" height="105.4" />
<path class="s"
d="m48.6,45.2h.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="m38.6,45.2h.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="r"
d="m68.4,45.2h.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="m58.5,45.2h.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="m102.1,45.2h.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="u"
d="m92.2,45.2h.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="m14.6,45.2h.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="z"
d="m4.7,45.2h.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="ab"
d="m53.3-8.4h.9c.1,0,.2.1.2.2v107.1c0,0,0,.1-.1.1h-1.1s0,0,0,0V-8.1c0-.1.1-.2.2-.2Z"
transform="translate(8.4 99.1) rotate(-90)" />
<path class="w"
d="m53.3,6.3h.9c.1,0,.2.1.2.2v107.1c0,0,0,.1-.1.1h-1.1s0,0,0,0V6.6c0-.1.1-.2.2-.2Z"
transform="translate(-6.3 113.8) rotate(-90)" />
<path class="aa"
d="m25.4,40.6h3.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 105.4) rotate(180)" />
<path class="y"
d="m79.2,40.6h3.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>
</svg>

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="90" height="100"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 90 100">
<defs>
<style>
.e{fill:none;}.e,.f,.g,.h{stroke-width:0px;}.i{clip-path:url(#d);}.f{fill:#a28d92;}.g{fill:#f1eae9;}.h{fill:#fff;}
</style>
<clipPath id="d">
<rect class="e" width="90" height="100" />
</clipPath>
</defs>
<g id="c">
<g class="i">
<rect class="h" width="90" height="100" />
<path class="g"
d="m-10.8.2H29c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4H-19c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L-11.8.6c.3-.3.6-.4,1-.4Z" />
<path class="g"
d="m35,.2h39.9c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4H26.8c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L34.1.6c.3-.3.6-.4,1-.4Z" />
<path class="f"
d="m19.7,13.1c.7,0,1.3.6,1.3,1.4v17.1c0,.8-.6,1.4-1.3,1.4H-19.4c-.7,0-1.3-.6-1.3-1.4h0V14.5c0-.8.6-1.4,1.3-1.4H19.7Z" />
<path class="f"
d="m65,13.1c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H25.7c-.7,0-1.4-.6-1.4-1.4h0V14.5c0-.8.6-1.4,1.4-1.4h39.3Z" />
<path class="g"
d="m80.9.2h39.9c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4h-39.9c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L79.9.6c.3-.3.6-.4,1-.4Z" />
<path class="f"
d="m110,13.1c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0V14.5c0-.8.6-1.4,1.4-1.4h39.3Z" />
<path class="f"
d="m42.5,35.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H3.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
<path class="f"
d="m87.5,35.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
<path class="f"
d="m22.3,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H-17c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4H22.3Z" />
<path class="f"
d="m67.5,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H28.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
<path class="f"
d="m112.5,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
<path class="f"
d="m42.5,80c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H3.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
<path class="f"
d="m87.6,79.9c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -0,0 +1,353 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="107.5" height="107.5"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 107.5 107.5">
<defs>
<style>
.bz,.ca{fill:none;}.bz,.cb,.cc,.cd,.ce,.cf,.cg,.ch,.ci,.cj,.ck,.cl,.cm,.cn,.co,.cp,.cq,.cr,.cs,.ct,.cu,.cv,.cw,.cx,.cy,.cz,.da,.db,.dc,.dd,.de,.df,.dg,.dh,.di,.dj,.dk,.dl,.dm,.dn,.do,.dp,.dq,.dr,.ds,.dt,.du,.dv,.dw,.dx,.dy,.dz,.ea,.eb,.ec,.ed,.ee,.ef,.eg,.eh,.ei,.ej,.ek,.el,.em,.en,.eo,.ep,.eq,.er,.es,.et,.eu,.ev,.ew{stroke-width:0px;}.ca{opacity:0;stroke:#00a4b1;stroke-miterlimit:10;stroke-width:.2px;}.cb{fill:url(#ah);}.cc{fill:url(#ag);}.cd{fill:url(#aa);}.ce{fill:url(#ao);}.cf{fill:url(#af);}.cg{fill:url(#ae);}.ch{fill:url(#ab);}.ci{fill:url(#aj);}.cj{fill:url(#ap);}.ck{fill:url(#ai);}.cl{fill:url(#ad);}.cm{fill:url(#an);}.cn{fill:url(#am);}.co{fill:url(#ac);}.cp{fill:url(#at);}.cq{fill:url(#as);}.cr{fill:url(#bi);}.cs{fill:url(#bd);}.ct{fill:url(#bg);}.cu{fill:url(#bj);}.cv{fill:url(#be);}.cw{fill:url(#bf);}.cx{fill:url(#bo);}.cy{fill:url(#bm);}.cz{fill:url(#bh);}.da{fill:url(#bn);}.db{fill:url(#ba);}.dc{fill:url(#bb);}.dd{fill:url(#bk);}.de{fill:url(#bc);}.df{fill:url(#bx);}.dg{fill:url(#bq);}.dh{fill:url(#br);}.di{fill:url(#bs);}.dj{fill:url(#by);}.dk{fill:url(#bt);}.dl{fill:url(#bl);}.dm{fill:url(#bw);}.dn{fill:url(#bp);}.do{fill:url(#bu);}.dp{fill:url(#bv);}.dq{fill:url(#ar);}.dr{fill:url(#ay);}.ds{fill:url(#az);}.dt{fill:url(#aw);}.du{fill:url(#aq);}.dv{fill:url(#ax);}.dw{fill:url(#ak);}.dx{fill:url(#al);}.dy{fill:url(#au);}.dz{fill:url(#av);}.ea{fill:url(#v);}.eb{fill:url(#e);}.ec{fill:url(#y);}.ed{fill:url(#z);}.ee{fill:url(#x);}.ef{fill:url(#w);}.eg{fill:url(#u);}.eh{fill:url(#t);}.ei{fill:url(#f);}.ej{fill:url(#d);}.ek{fill:url(#s);}.el{fill:url(#j);}.em{fill:url(#q);}.en{fill:url(#r);}.eo{fill:url(#i);}.ep{fill:url(#h);}.eq{fill:url(#m);}.er{fill:url(#g);}.es{fill:url(#o);}.et{fill:url(#p);}.eu{fill:url(#k);}.ev{fill:url(#n);}.ew{fill:url(#l);}
</style>
<linearGradient id="d" x1="13.7" y1="53.7" x2="15" y2="53.7" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#221714" />
<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="#d8d7d6" />
<stop offset=".9" stop-color="#c2bfbe" />
<stop offset=".9" stop-color="#a6a2a1" />
<stop offset=".9" stop-color="#85807e" />
<stop offset="1" stop-color="#605a57" />
<stop offset="1" stop-color="#39312e" />
<stop offset="1" stop-color="#443d3a" />
<stop offset="1" stop-color="#64605e" />
<stop offset="1" stop-color="#7e7b7a" />
<stop offset="1" stop-color="#908f8e" />
<stop offset="1" stop-color="#9b9b9a" />
<stop offset="1" stop-color="#9f9f9f" />
</linearGradient>
<linearGradient id="e" x1="3.7" x2="5.1" xlink:href="#d" />
<linearGradient id="f" x1="270.6" y1="-352.3" x2="272" y2="-352.3"
gradientTransform="translate(-266.3 383.8)" xlink:href="#d" />
<linearGradient id="g" x1="390.7" y1="-1286.3" x2="392.1" y2="-1286.3"
gradientTransform="translate(-385.2 816.6) scale(1 .6)" xlink:href="#d" />
<linearGradient id="h" x1="189.8" y1="-2181.7" x2="191.1" y2="-2181.7"
gradientTransform="translate(-182.5 1363.7) scale(1 .6)" xlink:href="#d" />
<linearGradient id="i" x1="-1617.7" y1="317" x2="-1616.3" y2="317"
gradientTransform="translate(1630.8 348.6) scale(1 -1)" xlink:href="#d" />
<linearGradient id="j" x1="-887.7" y1="1342.2" x2="-886.4" y2="1342.2"
gradientTransform="translate(899.5 850.8) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="k" x1="-261.1" y1="1004.8" x2="-259.8" y2="1004.8"
gradientTransform="translate(271.3 643.5) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="l" x1="-18.7" y1="1876.8" x2="-17.3" y2="1876.8"
gradientTransform="translate(27.4 695.4) scale(1 -.4)" xlink:href="#d" />
<linearGradient id="m" x1="28.5" x2="29.9" xlink:href="#d" />
<linearGradient id="n" x1="18.6" x2="19.9" xlink:href="#d" />
<linearGradient id="o" x1="284.7" y1="-357.1" x2="286" y2="-357.1"
gradientTransform="translate(-265.5 388.7)" xlink:href="#d" />
<linearGradient id="p" x1="399.8" y1="-1305.6" x2="401.1" y2="-1305.6"
gradientTransform="translate(-379.3 828.4) scale(1 .6)" xlink:href="#d" />
<linearGradient id="q" x1="193.2" y1="-2205.3" x2="194.6" y2="-2205.3"
gradientTransform="translate(-171.1 1378.2) scale(1 .6)" xlink:href="#d" />
<linearGradient id="r" x1="-1631.6" y1="322.1" x2="-1630.3" y2="322.1"
gradientTransform="translate(1659.6 353.6) scale(1 -1)" xlink:href="#d" />
<linearGradient id="s" x1="-897.2" y1="1360.9" x2="-895.8" y2="1360.9"
gradientTransform="translate(923.8 862.2) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="t" x1="-264.3" y1="1028.5" x2="-263" y2="1028.5"
gradientTransform="translate(289.3 658) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="u" x1="-18.7" y1="1918.6" x2="-17.3" y2="1918.6"
gradientTransform="translate(42.2 710.2) scale(1 -.4)" xlink:href="#d" />
<linearGradient id="v" x1="-1912" y1="127.5" x2="-1908.5" y2="127.5"
gradientTransform="translate(1927.1 -85.1)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#888" />
<stop offset="0" stop-color="#888" />
<stop offset="0" stop-color="#acacac" />
<stop offset=".1" stop-color="#cacaca" />
<stop offset=".2" stop-color="#e1e1e1" />
<stop offset=".3" stop-color="#f2f2f2" />
<stop offset=".4" stop-color="#fbfbfb" />
<stop offset=".5" stop-color="#fff" />
<stop offset=".7" stop-color="#fcfcfc" />
<stop offset=".8" stop-color="#f5f5f5" />
<stop offset=".9" stop-color="#e8e8e8" />
<stop offset=".9" stop-color="#d6d6d7" />
<stop offset="1" stop-color="#bfbfc0" />
<stop offset="1" stop-color="#b4b4b5" />
</linearGradient>
<linearGradient id="w" x1="43.3" y1="53.7" x2="44.7" y2="53.7" xlink:href="#d" />
<linearGradient id="x" x1="33.4" y1="53.7" x2="34.8" y2="53.7" xlink:href="#d" />
<linearGradient id="y" x1="298.7" y1="-362" x2="300" y2="-362"
gradientTransform="translate(-264.7 393.6)" xlink:href="#d" />
<linearGradient id="z" x1="408.8" y1="-1324.8" x2="410.1" y2="-1324.8"
gradientTransform="translate(-373.5 840.2) scale(1 .6)" xlink:href="#d" />
<linearGradient id="aa" x1="196.7" y1="-2228.8" x2="198" y2="-2228.8"
gradientTransform="translate(-159.8 1392.6) scale(1 .6)" xlink:href="#d" />
<linearGradient id="ab" x1="-1645.6" y1="327.1" x2="-1644.2" y2="327.1"
gradientTransform="translate(1688.3 358.7) scale(1 -1)" xlink:href="#d" />
<linearGradient id="ac" x1="-906.6" y1="1379.6" x2="-905.2" y2="1379.6"
gradientTransform="translate(948.1 873.7) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="ad" x1="-267.6" y1="1052.1" x2="-266.2" y2="1052.1"
gradientTransform="translate(307.4 672.5) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="ae" x1="-18.7" y1="1960.3" x2="-17.3" y2="1960.3"
gradientTransform="translate(57 725) scale(1 -.4)" xlink:href="#d" />
<linearGradient id="af" y1="142.3" y2="142.3" gradientTransform="translate(1941.9 -99.9)"
xlink:href="#v" />
<linearGradient id="ag" x1="58.1" y1="53.7" x2="59.5" y2="53.7" xlink:href="#d" />
<linearGradient id="ah" x1="48.2" y1="53.7" x2="49.6" y2="53.7" xlink:href="#d" />
<linearGradient id="ai" x1="312.7" y1="-366.9" x2="314" y2="-366.9"
gradientTransform="translate(-263.9 398.4)" xlink:href="#d" />
<linearGradient id="aj" x1="417.7" y1="-1344.1" x2="419.1" y2="-1344.1"
gradientTransform="translate(-367.7 852) scale(1 .6)" xlink:href="#d" />
<linearGradient id="ak" x1="200.1" y1="-2252.4" x2="201.5" y2="-2252.4"
gradientTransform="translate(-148.4 1407) scale(1 .6)" xlink:href="#d" />
<linearGradient id="al" x1="-1659.5" y1="332.2" x2="-1658.1" y2="332.2"
gradientTransform="translate(1717.1 363.7) scale(1 -1)" xlink:href="#d" />
<linearGradient id="am" x1="-916.1" y1="1398.2" x2="-914.7" y2="1398.2"
gradientTransform="translate(972.3 885.1) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="an" x1="-270.8" y1="1075.8" x2="-269.4" y2="1075.8"
gradientTransform="translate(325.4 686.9) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="ao" x1="-18.7" y1="2002" x2="-17.3" y2="2002"
gradientTransform="translate(71.8 739.9) scale(1 -.4)" xlink:href="#d" />
<linearGradient id="ap" y1="157.1" y2="157.1" gradientTransform="translate(1956.7 -114.7)"
xlink:href="#v" />
<linearGradient id="aq" x1="73" y1="53.7" x2="74.4" y2="53.7" xlink:href="#d" />
<linearGradient id="ar" x1="63.1" y1="53.7" x2="64.4" y2="53.7" xlink:href="#d" />
<linearGradient id="as" x1="326.7" y1="-371.7" x2="328.1" y2="-371.7"
gradientTransform="translate(-263.1 403.3)" xlink:href="#d" />
<linearGradient id="at" x1="426.8" y1="-1363.4" x2="428.1" y2="-1363.4"
gradientTransform="translate(-361.9 863.8) scale(1 .6)" xlink:href="#d" />
<linearGradient id="au" x1="203.6" y1="-2276" x2="205" y2="-2276"
gradientTransform="translate(-137 1421.5) scale(1 .6)" xlink:href="#d" />
<linearGradient id="av" x1="-1673.5" y1="337.2" x2="-1672.1" y2="337.2"
gradientTransform="translate(1745.9 368.8) scale(1 -1)" xlink:href="#d" />
<linearGradient id="aw" x1="-925.5" y1="1417" x2="-924.2" y2="1417"
gradientTransform="translate(996.7 896.5) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="ax" x1="-274" y1="1099.5" x2="-272.7" y2="1099.5"
gradientTransform="translate(343.5 701.5) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="ay" x1="-18.7" y1="2043.8" x2="-17.3" y2="2043.8"
gradientTransform="translate(86.7 754.7) scale(1 -.4)" xlink:href="#d" />
<linearGradient id="az" y1="172" y2="172" gradientTransform="translate(1971.6 -129.6)"
xlink:href="#v" />
<linearGradient id="ba" x1="87.8" y1="53.8" x2="89.2" y2="53.8" xlink:href="#d" />
<linearGradient id="bb" x1="77.9" y1="53.8" x2="79.3" y2="53.8" xlink:href="#d" />
<linearGradient id="bc" x1="340.7" y1="-376.6" x2="342.1" y2="-376.6"
gradientTransform="translate(-262.3 408.1)" xlink:href="#d" />
<linearGradient id="bd" x1="435.8" y1="-1382.6" x2="437.1" y2="-1382.6"
gradientTransform="translate(-356 875.6) scale(1 .6)" xlink:href="#d" />
<linearGradient id="be" x1="207" y1="-2299.6" x2="208.4" y2="-2299.6"
gradientTransform="translate(-125.6 1435.9) scale(1 .6)" xlink:href="#d" />
<linearGradient id="bf" x1="-1687.4" y1="342.3" x2="-1686" y2="342.3"
gradientTransform="translate(1774.7 373.8) scale(1 -1)" xlink:href="#d" />
<linearGradient id="bg" x1="-935" y1="1435.6" x2="-933.6" y2="1435.6"
gradientTransform="translate(1020.9 908) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="bh" x1="-277.2" y1="1123.1" x2="-275.9" y2="1123.1"
gradientTransform="translate(361.6 715.9) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="bi" x1="-18.6" y1="2085.5" x2="-17.3" y2="2085.5"
gradientTransform="translate(101.5 769.6) scale(1 -.4)" xlink:href="#d" />
<linearGradient id="bj" y1="186.8" y2="186.8" gradientTransform="translate(1986.4 -144.4)"
xlink:href="#v" />
<linearGradient id="bk" x1="102.7" y1="53.8" x2="104" y2="53.8" xlink:href="#d" />
<linearGradient id="bl" x1="92.7" y1="53.8" x2="94.1" y2="53.8" xlink:href="#d" />
<linearGradient id="bm" x1="354.7" y1="-381.4" x2="356.1" y2="-381.4"
gradientTransform="translate(-261.4 413)" xlink:href="#d" />
<linearGradient id="bn" x1="444.8" y1="-1401.9" x2="446.1" y2="-1401.9"
gradientTransform="translate(-350.2 887.4) scale(1 .6)" xlink:href="#d" />
<linearGradient id="bo" x1="210.5" y1="-2323.1" x2="211.9" y2="-2323.1"
gradientTransform="translate(-114.3 1450.3) scale(1 .6)" xlink:href="#d" />
<linearGradient id="bp" x1="-1701.3" y1="347.3" x2="-1700" y2="347.3"
gradientTransform="translate(1803.4 378.9) scale(1 -1)" xlink:href="#d" />
<linearGradient id="bq" x1="-944.4" y1="1454.3" x2="-943" y2="1454.3"
gradientTransform="translate(1045.2 919.4) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="br" x1="-280.5" y1="1146.8" x2="-279.1" y2="1146.8"
gradientTransform="translate(379.6 730.4) scale(1 -.6)" xlink:href="#d" />
<linearGradient id="bs" x1="-18.6" y1="2127.2" x2="-17.3" y2="2127.2"
gradientTransform="translate(116.3 784.4) scale(1 -.4)" xlink:href="#d" />
<linearGradient id="bt" y1="201.6" y2="201.6" gradientTransform="translate(2001.2 -159.2)"
xlink:href="#v" />
<linearGradient id="bu" x1="-709.6" y1="357.9" x2="-704.2" y2="357.9"
gradientTransform="translate(760.8 -286)" xlink:href="#d" />
<linearGradient id="bv" y1="215.5" y2="215.5" gradientTransform="translate(2015.2 -173.1)"
xlink:href="#v" />
<linearGradient id="bw" y1="113.5" y2="113.5" gradientTransform="translate(1913.1 -71.1)"
xlink:href="#v" />
<linearGradient id="bx" x1="-1014.3" y1="-422" x2="-1009.5" y2="-422"
gradientTransform="translate(1043.7 496.6)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#979797" />
<stop offset="0" stop-color="#a1a1a1" />
<stop offset=".1" stop-color="#c3c3c3" />
<stop offset=".2" stop-color="#d7d7d7" />
<stop offset=".3" stop-color="#dfdfdf" />
<stop offset=".4" stop-color="#dadada" />
<stop offset=".5" stop-color="#cbcccc" />
<stop offset=".6" stop-color="#b4b4b6" />
<stop offset=".7" stop-color="#939496" />
<stop offset=".8" stop-color="#696b6e" />
<stop offset=".8" stop-color="#3e4146" />
<stop offset="1" stop-color="#3f4147" />
<stop offset="1" stop-color="#424249" />
</linearGradient>
<linearGradient id="by" x1="-1058.7" x2="-1053.9"
gradientTransform="translate(1132.6 496.6)" xlink:href="#bx" />
</defs>
<g id="c">
<path class="ej"
d="m13.9,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<path class="eb"
d="m4,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<rect class="ei" x="4.3" y="29.7" width="1.4" height="3.7"
transform="translate(10.6 .1) rotate(19.1)" />
<rect class="er" x="5.6" y="28.4" width="1.4" height="2.2"
transform="translate(25.9 6.6) rotate(52.6)" />
<rect class="ep" x="7.3" y="27.5" width="1.4" height="2.2"
transform="translate(33.9 14.3) rotate(76.5)" />
<rect class="eo" x="13.1" y="29.7" width="1.4" height="3.7"
transform="translate(37.5 56.5) rotate(160.1)" />
<rect class="el" x="11.8" y="28.3" width="1.4" height="2.2"
transform="translate(43.1 38.6) rotate(129.6)" />
<rect class="eu" x="10.2" y="27.5" width="1.4" height="2.2"
transform="translate(41.1 24.3) rotate(102.6)" />
<rect class="ew" x="8.7" y="27.8" width="1.4" height="1.2"
transform="translate(37.8 19) rotate(90)" />
<path class="eq"
d="m28.7,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<path class="ev"
d="m18.8,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<rect class="es" x="19.1" y="29.7" width="1.4" height="3.7"
transform="translate(11.4 -4.8) rotate(19.1)" />
<rect class="et" x="20.4" y="28.4" width="1.4" height="2.2"
transform="translate(31.7 -5.2) rotate(52.6)" />
<rect class="em" x="22.1" y="27.5" width="1.4" height="2.2"
transform="translate(45.3 -.2) rotate(76.5)" />
<rect class="en" x="27.9" y="29.7" width="1.4" height="3.7"
transform="translate(66.2 51.5) rotate(160.1)" />
<rect class="ek" x="26.6" y="28.3" width="1.4" height="2.2"
transform="translate(67.4 27.1) rotate(129.6)" />
<rect class="eh" x="25" y="27.5" width="1.4" height="2.2"
transform="translate(59.2 9.8) rotate(102.6)" />
<rect class="eg" x="23.5" y="27.8" width="1.4" height="1.2"
transform="translate(52.6 4.2) rotate(90)" />
<rect class="ea" x="15" y="40.6" width="3.5" height="3.5"
transform="translate(-25.6 59.2) rotate(-90)" />
<path class="ef"
d="m43.6,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<path class="ee"
d="m33.6,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<rect class="ec" x="34" y="29.7" width="1.4" height="3.7"
transform="translate(12.3 -9.6) rotate(19.1)" />
<rect class="ed" x="35.2" y="28.4" width="1.4" height="2.2"
transform="translate(37.5 -17) rotate(52.6)" />
<rect class="cd" x="36.9" y="27.5" width="1.4" height="2.2"
transform="translate(56.7 -14.6) rotate(76.5)" />
<rect class="ch" x="42.7" y="29.7" width="1.4" height="3.7"
transform="translate(95 46.4) rotate(160.1)" />
<rect class="co" x="41.5" y="28.3" width="1.4" height="2.2"
transform="translate(91.7 15.7) rotate(129.6)" />
<rect class="cl" x="39.8" y="27.5" width="1.4" height="2.2"
transform="translate(77.2 -4.7) rotate(102.6)" />
<rect class="cg" x="38.4" y="27.8" width="1.4" height="1.2"
transform="translate(67.4 -10.6) rotate(90)" />
<rect class="cf" x="29.9" y="40.6" width="3.5" height="3.5"
transform="translate(-10.8 74) rotate(-90)" />
<path class="cc"
d="m58.4,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<path class="cb"
d="m48.4,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<rect class="ck" x="48.8" y="29.7" width="1.4" height="3.7"
transform="translate(13.1 -14.5) rotate(19.1)" />
<rect class="ci" x="50" y="28.4" width="1.4" height="2.2"
transform="translate(43.4 -28.7) rotate(52.6)" />
<rect class="dw" x="51.7" y="27.5" width="1.4" height="2.2"
transform="translate(68.1 -29) rotate(76.5)" />
<rect class="dx" x="57.6" y="29.7" width="1.4" height="3.7"
transform="translate(123.8 41.4) rotate(160.1)" />
<rect class="cn" x="56.3" y="28.3" width="1.4" height="2.2"
transform="translate(116 4.3) rotate(129.6)" />
<rect class="cm" x="54.6" y="27.5" width="1.4" height="2.2"
transform="translate(95.3 -19.1) rotate(102.6)" />
<rect class="ce" x="53.2" y="27.8" width="1.4" height="1.2"
transform="translate(82.3 -25.5) rotate(90)" />
<rect class="cj" x="44.7" y="40.6" width="3.5" height="3.5"
transform="translate(4.1 88.9) rotate(-90)" />
<path class="du"
d="m73.2,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<path class="dq"
d="m63.3,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<rect class="cq" x="63.6" y="29.7" width="1.4" height="3.7"
transform="translate(13.9 -19.3) rotate(19.1)" />
<rect class="cp" x="64.9" y="28.4" width="1.4" height="2.2"
transform="translate(49.2 -40.5) rotate(52.6)" />
<rect class="dy" x="66.6" y="27.5" width="1.4" height="2.2"
transform="translate(79.5 -43.4) rotate(76.5)" />
<rect class="dz" x="72.4" y="29.7" width="1.4" height="3.7"
transform="translate(152.6 36.3) rotate(160.1)" />
<rect class="dt" x="71.1" y="28.3" width="1.4" height="2.2"
transform="translate(140.3 -7.2) rotate(129.6)" />
<rect class="dv" x="69.5" y="27.5" width="1.4" height="2.2"
transform="translate(113.4 -33.6) rotate(102.6)" />
<rect class="dr" x="68" y="27.8" width="1.4" height="1.2"
transform="translate(97.1 -40.3) rotate(90)" />
<rect class="ds" x="59.5" y="40.6" width="3.5" height="3.5"
transform="translate(18.9 103.7) rotate(-90)" />
<path class="db"
d="m88.1,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<path class="dc"
d="m78.1,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<rect class="de" x="78.5" y="29.7" width="1.4" height="3.7"
transform="translate(14.7 -24.2) rotate(19.1)" />
<rect class="cs" x="79.7" y="28.4" width="1.4" height="2.2"
transform="translate(55.1 -52.3) rotate(52.6)" />
<rect class="cv" x="81.4" y="27.5" width="1.4" height="2.2"
transform="translate(90.9 -57.8) rotate(76.5)" />
<rect class="cw" x="87.2" y="29.7" width="1.4" height="3.7"
transform="translate(181.4 31.3) rotate(160.1)" />
<rect class="ct" x="86" y="28.3" width="1.4" height="2.2"
transform="translate(164.6 -18.6) rotate(129.6)" />
<rect class="cz" x="84.3" y="27.5" width="1.4" height="2.2"
transform="translate(131.4 -48.1) rotate(102.6)" />
<rect class="cr" x="82.9" y="27.8" width="1.4" height="1.2"
transform="translate(111.9 -55.1) rotate(90)" />
<rect class="cu" x="74.4" y="40.6" width="3.5" height="3.5"
transform="translate(33.7 118.5) rotate(-90)" />
<path class="dd"
d="m102.9,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<path class="dl"
d="m92.9,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
<rect class="cy" x="93.3" y="29.7" width="1.4" height="3.7"
transform="translate(15.5 -29) rotate(19.1)" />
<rect class="da" x="94.5" y="28.4" width="1.4" height="2.2"
transform="translate(60.9 -64.1) rotate(52.6)" />
<rect class="cx" x="96.2" y="27.5" width="1.4" height="2.2"
transform="translate(102.2 -72.3) rotate(76.5)" />
<rect class="dn" x="102.1" y="29.7" width="1.4" height="3.7"
transform="translate(210.1 26.2) rotate(160.1)" />
<rect class="dg" x="100.8" y="28.3" width="1.4" height="2.2"
transform="translate(188.8 -30) rotate(129.6)" />
<rect class="dh" x="99.1" y="27.5" width="1.4" height="2.2"
transform="translate(149.5 -62.6) rotate(102.6)" />
<rect class="di" x="97.7" y="27.8" width="1.4" height="1.2"
transform="translate(126.8 -70) rotate(90)" />
<rect class="dk" x="89.2" y="40.6" width="3.5" height="3.5"
transform="translate(48.6 133.4) rotate(-90)" />
<path class="do" d="m51.3,20h5.2c0,0,.1,0,.1.1v103.7h-5.4V20.2c0,0,0-.1.1-.1Z"
transform="translate(-18.1 125.8) rotate(-90)" />
<rect class="dp" x="103.1" y="41.5" width="3.5" height="1.8"
transform="translate(62.5 147.3) rotate(-90)" />
<rect class="dm" x="1.1" y="41.5" width="3.5" height="1.8"
transform="translate(-39.5 45.2) rotate(-90)" />
<path class="df"
d="m30.1,69.2h3.1c.6,0,1.1.5,1.1,1.1v8.8c0,.5-.4,1-1,1h-3.4c-.5,0-.9-.4-.9-.9v-8.8c0-.6.5-1.1,1.1-1.1Z"
transform="translate(63.3 149.3) rotate(180)" />
<path class="dj"
d="m74.6,69.2h3.1c.6,0,1.1.5,1.1,1.1v8.8c0,.5-.4,1-1,1h-3.4c-.5,0-.9-.4-.9-.9v-8.8c0-.6.5-1.1,1.1-1.1Z"
transform="translate(152.2 149.3) rotate(180)" />
<line class="ca" x1="2" y1="53.7" x2="105.8" y2="53.7" />
<line class="ca" x1="53.9" y1="102.6" x2="53.9" y2="4.9" />
<rect class="bz" width="107.5" height="107.5" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><defs><style>.d{fill:#889b86;stroke-width:0px;}</style></defs><g id="c"><rect class="d" width="18" height="18"/></g></svg>

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 B

View File

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><defs><style>.d{fill:#45aa04;stroke-width:0px;}</style></defs><g id="c"><rect class="d" width="18" height="18"/></g></svg>

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 B

View File

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><defs><style>.d{fill:#134c05;stroke-width:0px;}</style></defs><g id="c"><rect class="d" width="18" height="18"/></g></svg>

After

Width:  |  Height:  |  Size: 250 B

View File

@ -1,33 +1 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
<defs>
<radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#ff9287" />
<stop offset=".8" stop-color="#ff5f4c" />
<stop offset="1" stop-color="#ff5f4c" />
</radialGradient>
<radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#e75545" />
<stop offset=".8" stop-color="#c4483b" />
<stop offset="1" stop-color="#983b31" />
</radialGradient>
</defs>
<g id="c">
<rect width="69.7" height="136" style="fill:rgba(255,255,255,0); stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
style="fill:#ff5f4c; isolation:isolate; opacity:.3; stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
style="fill:#a74d4b; isolation:isolate; opacity:.7; stroke-width:0px;" />
<path
d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
style="fill:url(#d); stroke-width:0px;" />
<circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
<circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
<circle cx="34.8" cy="68" r="26.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{stroke:#db4646;stroke-width:2.1px;}.h,.i{fill:none;}.j{fill:#a74d4b;opacity:.7;}.j,.i,.k,.l,.m,.n{stroke-width:0px;}.j,.k{isolation:isolate;}.i{opacity:0;}.k{fill:#ff5f4c;opacity:.3;}.l{fill:#fff;}.m{fill:url(#f);}.n{fill:url(#g);}</style><radialGradient id="f" cx="263.2" cy="286.8" fx="263.2" fy="286.8" r=".9" gradientTransform="translate(-9405.4 -24647.8) rotate(38.2) scale(75.3 47.3) skewX(7.6)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff9287"/><stop offset=".8" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="g" cx="259.6" cy="284" fx="259.6" fy="284" r=".4" gradientTransform="translate(-14219.7 -15164.5) scale(54.9 53.6)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><rect class="i" width="70" height="94"/><ellipse id="d" class="k" cx="35.8" cy="84.1" rx="14.4" ry="3.7"/><ellipse id="e" class="j" cx="35.8" cy="84.1" rx="7.5" ry="3"/><path class="m" d="m26.8,71.1l-1.1-1.1c-9.6-4.2-15.6-13.5-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.9-8.9-13h.1Z"/><ellipse class="n" cx="35.1" cy="45.5" rx="19.8" ry="19.3"/><ellipse class="l" cx="35.3" cy="45.3" rx="20.1" ry="19.6"/><ellipse class="h" cx="35.3" cy="45.3" rx="19" ry="18.6"/></g></svg>

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -1,41 +1 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
<defs>
<radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#b5b4b4" />
<stop offset=".7" stop-color="#6e6c6c" />
<stop offset="1" stop-color="#2f2f2f" />
</radialGradient>
<radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#e75545" />
<stop offset=".8" stop-color="#c4483b" />
<stop offset="1" stop-color="#983b31" />
</radialGradient>
</defs>
<g id="c">
<rect x="0" width="69.7" height="136" style="fill:none; stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
style="fill:#4d4d4d; isolation:isolate; opacity:.3; stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
style="fill:#363333; isolation:isolate; opacity:.7; stroke-width:0px;" />
<path
d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
style="fill:url(#d); stroke-width:0px;" />
<circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
<circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
<circle cx="34.8" cy="68" r="26.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
<circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
<circle cx="34.8" cy="68" r="26.5" style="fill:none; stroke:#2f2f2f; stroke-width:3px;" />
<line x1="11" y1="79.4" x2="44.8" y2="45.3"
style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
<line x1="15.8" y1="85.9" x2="52.3" y2="49.5"
style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
<path d="m22.8,91.7l18.7-18.7,16.5-16.5"
style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{stroke:#db4646;}.h,.i{stroke-width:2.1px;}.h,.i,.j,.k{fill:none;}.i,.k{stroke:#2f2f2f;}.l{fill:#363333;opacity:.7;}.l,.m{isolation:isolate;}.l,.m,.j,.n,.o,.p{stroke-width:0px;}.m{fill:#262d34;opacity:.2;}.j{opacity:0;}.k{stroke-linecap:round;stroke-width:1.4px;}.n{fill:#fff;}.o{fill:url(#f);}.p{fill:url(#g);}</style><radialGradient id="f" cx="-356.5" cy="276.3" fx="-356.5" fy="276.3" r="1.3" gradientTransform="translate(19417.3 3353.6) rotate(38.1) scale(54 33.9) skewX(7.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b5b4b4"/><stop offset=".7" stop-color="#6e6c6c"/><stop offset="1" stop-color="#2f2f2f"/></radialGradient><radialGradient id="g" cx="-355.3" cy="282.7" fx="-355.3" fy="282.7" r=".5" gradientTransform="translate(14044.3 -10803.9) scale(39.4 38.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><rect class="j" width="70" height="94"/><ellipse id="d" class="m" cx="35" cy="83.3" rx="14.4" ry="3.7"/><ellipse id="e" class="l" cx="35" cy="83.3" rx="7.5" ry="3"/><path class="o" d="m26.5,71l-1.1-1c-9.6-4.2-15.6-13.4-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.8-8.9-13h.1Z"/><ellipse class="p" cx="34.8" cy="45.4" rx="19.8" ry="19.2"/><ellipse class="n" cx="35" cy="45.2" rx="20.1" ry="19.6"/><ellipse class="h" cx="35" cy="45.2" rx="19" ry="18.5"/><ellipse class="n" cx="35" cy="45.2" rx="20.1" ry="19.6"/><ellipse class="i" cx="35" cy="45.2" rx="19" ry="18.5"/><line class="k" x1="17.9" y1="53.1" x2="42.2" y2="29.3"/><line class="k" x1="21.4" y1="57.7" x2="47.6" y2="32.2"/><path class="k" d="m26.4,61.7l13.4-13.1,11.9-11.5"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -1,39 +1 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
<defs>
<radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#ff9287" />
<stop offset=".8" stop-color="#ff5f4c" />
<stop offset="1" stop-color="#ff5f4c" />
</radialGradient>
<radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#e75545" />
<stop offset=".8" stop-color="#c4483b" />
<stop offset="1" stop-color="#983b31" />
</radialGradient>
</defs>
<g id="c">
<rect x="0" width="69.7" height="136" style="fill:rgba(255,255,255,0); stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
style="fill:#ff5f4c; isolation:isolate; opacity:.3; stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
style="fill:#a74d4b; isolation:isolate; opacity:.7; stroke-width:0px;" />
<path
d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
style="fill:url(#d); stroke-width:0px;" />
<circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
<circle cx="34.8" cy="68" r="30" style="fill:#fff; stroke-width:0px;" />
<circle cx="34.8" cy="68" r="28.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
<path
d="m34.8,92c-3.2,0-6.4-.6-9.3-1.9-2.9-1.2-5.4-2.9-7.6-5.1-2.2-2.2-3.9-4.8-5.1-7.6-1.3-3-1.9-6.1-1.9-9.3s.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6,2.2-2.2,4.8-3.9,7.6-5.1,3-1.3,6.1-1.9,9.3-1.9s6.4.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1,2.2,2.2,3.9,4.8,5.1,7.6,1.3,3,1.9,6.1,1.9,9.3s-.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6-2.2,2.2-4.8,3.9-7.6,5.1-3,1.3-6.1,1.9-9.3,1.9Z"
style="fill:#fff; stroke-width:0px;" />
<path
d="m34.8,46c-3,0-5.9.6-8.6,1.7-2.6,1.1-5,2.7-7,4.7-2,2-3.6,4.4-4.7,7-1.1,2.7-1.7,5.6-1.7,8.6s.6,5.9,1.7,8.6c1.1,2.6,2.7,5,4.7,7,2,2,4.4,3.6,7,4.7,2.7,1.1,5.6,1.7,8.6,1.7s5.9-.6,8.6-1.7c2.6-1.1,5-2.7,7-4.7,2-2,3.6-4.4,4.7-7,1.1-2.7,1.7-5.6,1.7-8.6s-.6-5.9-1.7-8.6c-1.1-2.6-2.7-5-4.7-7-2-2-4.4-3.6-7-4.7-2.7-1.1-5.6-1.7-8.6-1.7m0-4c14.4,0,26,11.6,26,26s-11.6,26-26,26-26-11.6-26-26,11.6-26,26-26Z"
style="fill:#2a23f5; stroke-width:0px;" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{stroke:#db4646;stroke-width:2.1px;}.h,.i{fill:none;}.j{fill:#a74d4b;opacity:.7;}.j,.i,.k,.l,.m,.n,.o{stroke-width:0px;}.j,.k{isolation:isolate;}.i{opacity:0;}.k{fill:#ff5f4c;opacity:.3;}.l{fill:#2a23f5;}.m{fill:#fff;}.n{fill:url(#f);}.o{fill:url(#g);}</style><radialGradient id="f" cx="-3.7" cy="281" fx="-3.7" fy="281" r="1.3" gradientTransform="translate(4499.7 -8568.4) rotate(38.1) scale(54 33.9) skewX(7.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff9287"/><stop offset=".8" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="g" cx="-4.7" cy="282.1" fx="-4.7" fy="282.1" r=".5" gradientTransform="translate(218.3 -10783.8) scale(39.4 38.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><ellipse id="d" class="k" cx="35" cy="83.9" rx="14.4" ry="3.7"/><ellipse id="e" class="j" cx="35" cy="83.9" rx="7.5" ry="3"/><path class="n" d="m26.2,71l-1.1-1c-9.6-4.2-15.6-13.4-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.8-8.9-13h.1Z"/><ellipse class="o" cx="34.5" cy="45.4" rx="19.8" ry="19.2"/><ellipse class="m" cx="34.7" cy="45.2" rx="21.6" ry="21"/><ellipse class="h" cx="34.7" cy="45.2" rx="20.5" ry="19.9"/><path class="m" d="m34.7,61.9c-2.3,0-4.6-.4-6.7-1.3-2.1-.8-3.9-2-5.5-3.6-1.6-1.5-2.8-3.4-3.7-5.3-.9-2.1-1.4-4.3-1.4-6.5s.4-4.5,1.4-6.5c.9-2,2.1-3.8,3.7-5.3,1.6-1.5,3.4-2.7,5.5-3.6,2.2-.9,4.4-1.3,6.7-1.3s4.6.4,6.7,1.3c2.1.8,3.9,2,5.5,3.6s2.8,3.4,3.7,5.3c.9,2.1,1.4,4.3,1.4,6.5s-.4,4.5-1.4,6.5c-.9,2-2.1,3.8-3.7,5.3-1.6,1.5-3.4,2.7-5.5,3.6-2.2.9-4.4,1.3-6.7,1.3Z"/><path class="l" d="m34.7,29.8c-2.2,0-4.2.4-6.2,1.2-1.9.8-3.6,1.9-5,3.3s-2.6,3.1-3.4,4.9c-.8,1.9-1.2,3.9-1.2,6s.4,4.1,1.2,6c.8,1.8,1.9,3.5,3.4,4.9s3.2,2.5,5,3.3c1.9.8,4,1.2,6.2,1.2s4.2-.4,6.2-1.2c1.9-.8,3.6-1.9,5-3.3s2.6-3.1,3.4-4.9c.8-1.9,1.2-3.9,1.2-6s-.4-4.1-1.2-6c-.8-1.8-1.9-3.5-3.4-4.9s-3.2-2.5-5-3.3c-1.9-.8-4-1.2-6.2-1.2m0-2.8c10.3,0,18.7,8.1,18.7,18.2s-8.3,18.2-18.7,18.2-18.7-8.1-18.7-18.2,8.3-18.2,18.7-18.2Z"/><circle class="m" cx="34.8" cy="45.3" r="15.7"/><rect class="i" width="70" height="94"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -1,47 +1 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
<defs>
<radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#b5b4b4" />
<stop offset=".7" stop-color="#6e6c6c" />
<stop offset="1" stop-color="#2f2f2f" />
</radialGradient>
<radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#e75545" />
<stop offset=".8" stop-color="#c4483b" />
<stop offset="1" stop-color="#983b31" />
</radialGradient>
</defs>
<g id="c">
<rect x="0" width="69.7" height="136" style="fill:none; stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
style="fill:#4d4d4d; isolation:isolate; opacity:.3; stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
style="fill:#363333; isolation:isolate; opacity:.7; stroke-width:0px;" />
<path
d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
style="fill:url(#d); stroke-width:0px;" />
<circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
<circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
<circle cx="34.8" cy="68" r="26.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
<circle cx="34.8" cy="68" r="30" style="fill:#fff; stroke-width:0px;" />
<circle cx="34.8" cy="68" r="28.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
<path
d="m34.8,92c-3.2,0-6.4-.6-9.3-1.9-2.9-1.2-5.4-2.9-7.6-5.1-2.2-2.2-3.9-4.8-5.1-7.6-1.3-3-1.9-6.1-1.9-9.3s.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6,2.2-2.2,4.8-3.9,7.6-5.1,3-1.3,6.1-1.9,9.3-1.9s6.4.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1,2.2,2.2,3.9,4.8,5.1,7.6,1.3,3,1.9,6.1,1.9,9.3s-.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6-2.2,2.2-4.8,3.9-7.6,5.1-3,1.3-6.1,1.9-9.3,1.9Z"
style="fill:#fff; stroke-width:0px;" />
<path
d="m34.8,46c-3,0-5.9.6-8.6,1.7-2.6,1.1-5,2.7-7,4.7-2,2-3.6,4.4-4.7,7-1.1,2.7-1.7,5.6-1.7,8.6s.6,5.9,1.7,8.6c1.1,2.6,2.7,5,4.7,7,2,2,4.4,3.6,7,4.7,2.7,1.1,5.6,1.7,8.6,1.7s5.9-.6,8.6-1.7c2.6-1.1,5-2.7,7-4.7,2-2,3.6-4.4,4.7-7,1.1-2.7,1.7-5.6,1.7-8.6s-.6-5.9-1.7-8.6c-1.1-2.6-2.7-5-4.7-7-2-2-4.4-3.6-7-4.7-2.7-1.1-5.6-1.7-8.6-1.7m0-4c14.4,0,26,11.6,26,26s-11.6,26-26,26-26-11.6-26-26,11.6-26,26-26Z"
style="fill:#2f2f2f; stroke-width:0px;" />
<line x1="12.3" y1="77.5" x2="44.3" y2="45.5"
style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
<line x1="16.3" y1="84.5" x2="52.3" y2="50.5"
style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
<path d="m24,89.4l33.3-31.9"
style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{stroke:#db4646;stroke-width:2.1px;}.h,.i,.j{fill:none;}.k{fill:#363333;opacity:.7;}.k,.l{isolation:isolate;}.k,.l,.i,.m,.n,.o,.p{stroke-width:0px;}.l{fill:#262d34;opacity:.2;}.i{opacity:0;}.j{stroke:#2f2f2f;stroke-linecap:round;stroke-width:1.4px;}.m{fill:#2f2f2f;}.n{fill:#fff;}.o{fill:url(#e);}.p{fill:url(#d);}</style><radialGradient id="d" cx="-167.6" cy="279.9" fx="-167.6" fy="279.9" r="1.3" gradientTransform="translate(11449.3 -3063) rotate(38.1) scale(54 33.9) skewX(7.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b5b4b4"/><stop offset=".7" stop-color="#6e6c6c"/><stop offset="1" stop-color="#2f2f2f"/></radialGradient><radialGradient id="e" cx="-168" cy="283.4" fx="-168" fy="283.4" r=".5" gradientTransform="translate(6660.2 -10832.7) scale(39.4 38.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><rect class="i" width="70" height="94"/><path class="p" d="m27.1,69.3l-1.1-1c-9.6-4.2-15.6-13.4-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.8-8.9-13h.1Z"/><ellipse class="o" cx="35.4" cy="43.7" rx="19.8" ry="19.2"/><ellipse class="n" cx="35.6" cy="43.5" rx="20.1" ry="19.6"/><ellipse class="h" cx="35.6" cy="43.5" rx="19" ry="18.5"/><ellipse class="n" cx="35.6" cy="43.5" rx="21.6" ry="21"/><ellipse class="h" cx="35.6" cy="43.5" rx="20.5" ry="19.9"/><path class="n" d="m35.6,60.2c-2.3,0-4.6-.4-6.7-1.3-2.1-.8-3.9-2-5.5-3.6-1.6-1.5-2.8-3.4-3.7-5.3-.9-2.1-1.4-4.3-1.4-6.5s.4-4.5,1.4-6.5c.9-2,2.1-3.8,3.7-5.3,1.6-1.5,3.4-2.7,5.5-3.6,2.2-.9,4.4-1.3,6.7-1.3s4.6.4,6.7,1.3c2.1.8,3.9,2,5.5,3.6s2.8,3.4,3.7,5.3c.9,2.1,1.4,4.3,1.4,6.5s-.4,4.5-1.4,6.5c-.9,2-2.1,3.8-3.7,5.3-1.6,1.5-3.4,2.7-5.5,3.6-2.2.9-4.4,1.3-6.7,1.3Z"/><path class="m" d="m35.6,28.1c-2.2,0-4.2.4-6.2,1.2-1.9.8-3.6,1.9-5,3.3s-2.6,3.1-3.4,4.9c-.8,1.9-1.2,3.9-1.2,6s.4,4.1,1.2,6c.8,1.8,1.9,3.5,3.4,4.9s3.2,2.5,5,3.3c1.9.8,4,1.2,6.2,1.2s4.2-.4,6.2-1.2c1.9-.8,3.6-1.9,5-3.3s2.6-3.1,3.4-4.9c.8-1.9,1.2-3.9,1.2-6s-.4-4.1-1.2-6c-.8-1.8-1.9-3.5-3.4-4.9s-3.2-2.5-5-3.3c-1.9-.8-4-1.2-6.2-1.2m0-2.8c10.3,0,18.7,8.1,18.7,18.2s-8.3,18.2-18.7,18.2-18.7-8.1-18.7-18.2,8.3-18.2,18.7-18.2Z"/><line class="j" x1="19.5" y1="50.1" x2="42.4" y2="27.7"/><line class="j" x1="22.3" y1="55" x2="48.2" y2="31.2"/><path class="j" d="m27.9,58.4l23.9-22.3"/><ellipse id="f" class="l" cx="35.8" cy="82" rx="14.4" ry="3.7"/><ellipse id="g" class="k" cx="35.8" cy="82" rx="7.5" ry="3"/></g></svg>

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -1,35 +1 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
<defs>
<radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#ff9287" />
<stop offset=".8" stop-color="#ff5f4c" />
<stop offset="1" stop-color="#ff5f4c" />
</radialGradient>
<radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#e75545" />
<stop offset=".8" stop-color="#c4483b" />
<stop offset="1" stop-color="#983b31" />
</radialGradient>
</defs>
<g id="c">
<rect x="0" width="69.7" height="136" style="fill:rgba(255,255,255,0); stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
style="fill:#ff5f4c; isolation:isolate; opacity:.3; stroke-width:0px;" />
<ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
style="fill:#a74d4b; isolation:isolate; opacity:.7; stroke-width:0px;" />
<path
d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
style="fill:url(#d); stroke-width:0px;" />
<circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
<circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
<circle cx="34.8" cy="68" r="24" style="fill:#2a23f5; stroke-width:0px;" />
<circle cx="34.8" cy="68" r="25.5"
style="fill:none; stroke:#db4646; stroke-dasharray:0 0 9 10; stroke-linecap:square; stroke-width:3px;" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{fill:#a74d4b;opacity:.7;}.h,.i,.j,.k,.l,.m,.n{stroke-width:0px;}.h,.j{isolation:isolate;}.i{opacity:0;}.i,.o{fill:none;}.j{fill:#ff5f4c;opacity:.3;}.o{stroke:#db4646;stroke-dasharray:0 0 0 0 0 0 6.4 7.1;stroke-linecap:square;stroke-width:2.1px;}.k{fill:#2a23f5;}.l{fill:#fff;}.m{fill:url(#f);}.n{fill:url(#g);}</style><radialGradient id="f" cx="131.4" cy="284.8" fx="131.4" fy="284.8" r="1.3" gradientTransform="translate(-1182.6 -13193.2) rotate(38.1) scale(54 33.9) skewX(7.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff9287"/><stop offset=".8" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="g" cx="128.9" cy="283.6" fx="128.9" fy="283.6" r=".5" gradientTransform="translate(-5048.6 -10839.4) scale(39.4 38.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><ellipse id="d" class="j" cx="35.5" cy="84.1" rx="14.4" ry="3.7"/><ellipse id="e" class="h" cx="35.5" cy="84.1" rx="7.5" ry="3"/><path class="m" d="m26.7,71.1l-1.1-1c-9.6-4.2-15.6-13.4-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.8-8.9-13h.1Z"/><ellipse class="n" cx="35" cy="45.6" rx="19.8" ry="19.2"/><ellipse class="l" cx="35.2" cy="45.3" rx="20.1" ry="19.6"/><ellipse class="k" cx="35.2" cy="45.3" rx="17.2" ry="16.8"/><ellipse class="o" cx="35.2" cy="45.3" rx="18.3" ry="17.8"/><rect class="i" width="70" height="94"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94"
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94">
<defs>
<style>.e{fill:none;opacity:0;}.e,.f{stroke-width:0px;}.f{fill:url(#d);}</style>
<linearGradient id="d" x1="399.5" y1="413.3" x2="399.5" y2="411.9"
gradientTransform="translate(-4397.7 -3927.6) rotate(90) scale(10 -10.8)"
gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#ca4916" />
<stop offset="1" stop-color="#f7ad5d" />
</linearGradient>
</defs>
<g id="c">
<rect class="e" width="70" height="94" />
<path class="f"
d="m35,82.4h22.4v-4.1c0-.7.4-1.3,1-1.6.6-.3,1.3-.2,1.7.2l7.4,5.8c.8.6.9,1.7.2,2.5,0,0-.1.1-.2.2l-7.4,5.8c-.5.4-1.2.5-1.7.2-.6-.3-1-.9-1-1.6v-4.2h-22.3c0-.6,0-.7,0-1.4s0-1.1,0-1.9h0Z" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 928 B

View File

@ -35,6 +35,8 @@ public enum class DataCodeEnum(var tableName: String, var code: String) {
OMDB_LANE_NUM("车道数", "2041"),
OMDB_PHY_LANENUM("物理车道数", "2097"),
OMDB_VIADUCT("高架", "2043"),
OMDB_LINK_SEPARATION("设施分离", "2070"),
OMDB_LINK_MEDIAN("中央隔离带", "2071"),
OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "2083"),
OMDB_LANE_CONSTRUCTION("车道施工", "2090"),
OMDB_LANE_TYPE_ACCESS("车道类型","2092"),

View File

@ -91,7 +91,7 @@ public class OMDBDataDecoder extends TileDecoder {
}
});
//增加交通标牌聚合显示
List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 5.0);
List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 3.0);
if (list1 != null && list1.size() > 0) {
Log.e("qj", "聚合交通标牌转换开始" + list.size());
list1.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {
@ -105,7 +105,7 @@ public class OMDBDataDecoder extends TileDecoder {
Log.e("qj", "聚合交通标牌转换结束" + list1.size());
}
//增加交通标牌聚合显示
List<RenderEntity> list2 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFICLIGHT.getCode(), traffList, 5.0);
List<RenderEntity> list2 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFICLIGHT.getCode(), traffList, 2.0);
if (list2 != null && list2.size() > 0) {
Log.e("qj", "聚合红绿灯转换开始" + traffList.size());
list2.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {

2
vtm

@ -1 +1 @@
Subproject commit c046e788f5c739612a31c308639fca2de639669a
Subproject commit 024159afee2b9e438dd6c2a6419e034df287a8db