1.增加要素聚合显示数字业务2.调整部分渲染样式
This commit is contained in:
qiji4215
parent
b123fa543f
commit
2c571bf9ce
@ -21,7 +21,7 @@ android {
|
||||
minSdk 21
|
||||
targetSdk 21
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
versionName "1.1"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
multiDexEnabled true
|
||||
|
||||
|
||||
@ -813,6 +813,21 @@ class ImportPreProcess {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 几何方向排序
|
||||
* */
|
||||
fun sortGeometry(renderEntity: RenderEntity) {
|
||||
// 路口数据的其他点位，是保存在nodeList对应的数组下
|
||||
/* if (renderEntity.properties.containsKey("linkPid")) {
|
||||
val linkList = renderEntity.properties["linkPid"]?.split(",")
|
||||
//几何较少时需要判断是否要计算判断长短边
|
||||
if(linkList!=null&&linkList.size<3){
|
||||
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 生成默认路口数据的参考数据
|
||||
* */
|
||||
|
||||
@ -8,16 +8,8 @@ import android.widget.Toast
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import androidx.room.migration.Migration
|
||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||
import com.blankj.utilcode.util.FileIOUtils
|
||||
import com.blankj.utilcode.util.ResourceUtils
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.reflect.TypeToken
|
||||
import com.navinfo.collect.library.data.entity.LinkRelation
|
||||
import com.navinfo.collect.library.data.entity.RenderEntity
|
||||
import com.navinfo.collect.library.data.entity.TaskBean
|
||||
import com.navinfo.collect.library.utils.GeometryTools
|
||||
import com.navinfo.omqs.Constant
|
||||
import com.navinfo.omqs.bean.LoginUserBean
|
||||
import com.navinfo.omqs.bean.SysUserBean
|
||||
@ -94,10 +86,8 @@ class LoginViewModel @Inject constructor(
|
||||
|
||||
var sharedPreferences: SharedPreferences? = null
|
||||
|
||||
var dataIndex = 0
|
||||
|
||||
init {
|
||||
loginUser.value = LoginUserBean(userCode = "haofuyue00213", passWord = "123456")
|
||||
loginUser.value = LoginUserBean(userCode = "lixiaoming00427", passWord = "123456")
|
||||
}
|
||||
|
||||
|
||||
@ -270,130 +260,97 @@ class LoginViewModel @Inject constructor(
|
||||
* 获取任务列表
|
||||
*/
|
||||
private suspend fun getTaskList(context: Context) {
|
||||
loginStatus.postValue(LoginStatus.LOGIN_STATUS_NET_GET_TASK_LIST)
|
||||
when (val result = networkService.getTaskList(Constant.USER_ID)) {
|
||||
is NetResult.Success -> {
|
||||
if (result.data != null) {
|
||||
val realm = Realm.getDefaultInstance()
|
||||
realm.executeTransaction {
|
||||
result.data.obj?.let { list ->
|
||||
for (index in list.indices) {
|
||||
var inSertData = true
|
||||
val task = list[index]
|
||||
val item = realm.where(TaskBean::class.java).equalTo(
|
||||
"id", task.id
|
||||
).findFirst()
|
||||
if (item != null) {
|
||||
task.fileSize = item.fileSize
|
||||
task.status = item.status
|
||||
task.currentSize = item.currentSize
|
||||
//增加mesh==null兼容性处理
|
||||
for (hadLink in item.hadLinkDvoList) {
|
||||
if(hadLink.mesh==null){
|
||||
hadLink.mesh = ""
|
||||
|
||||
//每天主动请求一次，其他情况列表内自己手动请求
|
||||
val questToday = sharedPreferences?.getBoolean(DateTimeUtil.getYYYYMMDDDate()+"getTaskList",false)
|
||||
|
||||
if(!questToday!!){
|
||||
loginStatus.postValue(LoginStatus.LOGIN_STATUS_NET_GET_TASK_LIST)
|
||||
Log.e("qj","获取任务请求开始==")
|
||||
when (val result = networkService.getTaskList(Constant.USER_ID)) {
|
||||
is NetResult.Success -> {
|
||||
if (result.data != null) {
|
||||
Log.e("qj","获取任务返回成功==")
|
||||
val realm = Realm.getDefaultInstance()
|
||||
realm.executeTransaction {
|
||||
result.data.obj?.let { list ->
|
||||
for (index in list.indices) {
|
||||
var inSertData = true
|
||||
val task = list[index]
|
||||
val item = realm.where(TaskBean::class.java).equalTo(
|
||||
"id", task.id
|
||||
).findFirst()
|
||||
if (item != null) {
|
||||
task.fileSize = item.fileSize
|
||||
task.status = item.status
|
||||
task.currentSize = item.currentSize
|
||||
//增加mesh==null兼容性处理
|
||||
for (hadLink in item.hadLinkDvoList) {
|
||||
if(hadLink.mesh==null){
|
||||
hadLink.mesh = ""
|
||||
}
|
||||
}
|
||||
task.hadLinkDvoList = item.hadLinkDvoList
|
||||
task.syncStatus = item.syncStatus
|
||||
//已上传后不在更新操作时间
|
||||
if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) {
|
||||
//赋值时间，用于查询过滤
|
||||
task.operationTime = DateTimeUtil.getNowDate().time
|
||||
}else{
|
||||
continue
|
||||
}
|
||||
} else {
|
||||
for (hadLink in task.hadLinkDvoList) {
|
||||
if(hadLink.geometry==null){
|
||||
inSertData = false
|
||||
}else if(hadLink.mesh==null){
|
||||
hadLink.mesh = ""
|
||||
}else{
|
||||
hadLink.taskId = task.id
|
||||
}
|
||||
Log.e("qj","mesh==${hadLink.mesh}")
|
||||
}
|
||||
}
|
||||
task.hadLinkDvoList = item.hadLinkDvoList
|
||||
task.syncStatus = item.syncStatus
|
||||
//已上传后不在更新操作时间
|
||||
if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) {
|
||||
//赋值时间，用于查询过滤
|
||||
task.operationTime = DateTimeUtil.getNowDate().time
|
||||
}else{
|
||||
continue
|
||||
}
|
||||
} else {
|
||||
for (hadLink in task.hadLinkDvoList) {
|
||||
if(hadLink.geometry==null){
|
||||
inSertData = false
|
||||
}else if(hadLink.mesh==null){
|
||||
hadLink.mesh = ""
|
||||
}else{
|
||||
hadLink.taskId = task.id
|
||||
}
|
||||
Log.e("qj","mesh==${hadLink.mesh}")
|
||||
Log.e("qj","task==${task.id}")
|
||||
if(inSertData){
|
||||
realm.copyToRealmOrUpdate(task)
|
||||
}
|
||||
//赋值时间，用于查询过滤
|
||||
task.operationTime = DateTimeUtil.getNowDate().time
|
||||
}
|
||||
Log.e("qj","task==${task.id}")
|
||||
if(inSertData){
|
||||
realm.copyToRealmOrUpdate(task)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
realm.close()
|
||||
}
|
||||
//测试代码
|
||||
/* viewModelScope.launch(Dispatchers.IO) {
|
||||
|
||||
|
||||
val userTaskFolder = File(Constant.USER_DATA_PATH + "/4")
|
||||
if (!userTaskFolder.exists()) userTaskFolder.mkdirs()
|
||||
val password = "encryp".encodeToByteArray().copyInto(ByteArray(64))
|
||||
val config = RealmConfiguration.Builder()
|
||||
.directory(userTaskFolder)
|
||||
.name("OMQS.realm")
|
||||
.encryptionKey(password)
|
||||
.allowQueriesOnUiThread(true)
|
||||
.schemaVersion(2)
|
||||
.build()
|
||||
|
||||
var realm = Realm.getInstance(config)
|
||||
var time = System.currentTimeMillis()
|
||||
Log.e("qj", "test===开始安装")
|
||||
Realm.compactRealm(config)
|
||||
realm.beginTransaction()
|
||||
|
||||
val txtFile = File(Constant.USER_DATA_PATH + "/OMDB_LANE_MARK_BOUNDARYTYPE")
|
||||
// 将list数据转换为map
|
||||
var gson = Gson();
|
||||
val type = object : TypeToken<RenderEntity>() {}.type
|
||||
val list = FileIOUtils.readFile2List(txtFile, "UTF-8")
|
||||
val count = 12
|
||||
if (list != null) {
|
||||
for (i in 0 until count) {
|
||||
for ((index, line) in list.withIndex()) {
|
||||
if (line == null || line.trim() == "") {
|
||||
continue
|
||||
}
|
||||
val renderEntity = gson.fromJson<RenderEntity>(line, type)
|
||||
realm.insert(renderEntity)
|
||||
}
|
||||
}
|
||||
Log.e("qj", "test===总数===${list.size*count}")
|
||||
realm.close()
|
||||
//增加当天请求过标识
|
||||
sharedPreferences?.edit()
|
||||
?.putBoolean(DateTimeUtil.getYYYYMMDDDate()+"getTaskList",true)
|
||||
Log.e("qj","获取任务结束==")
|
||||
}
|
||||
|
||||
Log.e("qj", "test===提交===${System.currentTimeMillis() - time}")
|
||||
realm.commitTransaction()
|
||||
Log.e("qj", "test===提交===${System.currentTimeMillis() - time}")
|
||||
realm.close()
|
||||
|
||||
Log.e("qj", "test===结束===${System.currentTimeMillis() - time}")
|
||||
}*/
|
||||
|
||||
loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
|
||||
}
|
||||
|
||||
is NetResult.Error<*> -> {
|
||||
withContext(Dispatchers.Main) {
|
||||
Toast.makeText(context, "${result.exception.message}", Toast.LENGTH_SHORT)
|
||||
.show()
|
||||
loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
|
||||
}
|
||||
loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
|
||||
}
|
||||
|
||||
is NetResult.Failure<*> -> {
|
||||
withContext(Dispatchers.Main) {
|
||||
Toast.makeText(context, "${result.code}:${result.msg}", Toast.LENGTH_SHORT)
|
||||
.show()
|
||||
is NetResult.Error<*> -> {
|
||||
withContext(Dispatchers.Main) {
|
||||
Toast.makeText(context, "${result.exception.message}", Toast.LENGTH_SHORT)
|
||||
.show()
|
||||
}
|
||||
loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
|
||||
}
|
||||
loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
|
||||
}
|
||||
|
||||
is NetResult.Loading -> {}
|
||||
is NetResult.Failure<*> -> {
|
||||
withContext(Dispatchers.Main) {
|
||||
Toast.makeText(context, "${result.code}:${result.msg}", Toast.LENGTH_SHORT)
|
||||
.show()
|
||||
}
|
||||
loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
|
||||
}
|
||||
|
||||
is NetResult.Loading -> {}
|
||||
}
|
||||
}else{
|
||||
loginStatus.postValue(LoginStatus.LOGIN_STATUS_SUCCESS)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -819,12 +819,22 @@ class MainActivity : BaseActivity() {
|
||||
* zoomOut
|
||||
*/
|
||||
fun zoomOutOnclick(view: View) {
|
||||
val result = mutableListOf<RenderEntity>()
|
||||
/* val result = mutableListOf<RenderEntity>()
|
||||
for (i in 0 until 10) {
|
||||
var renderEntity: RenderEntity = RenderEntity()
|
||||
renderEntity.code = "3005"
|
||||
renderEntity.geometry = "POINT(116.2694${i}13016946 40.0844${i}5791644373 0)"
|
||||
result.add(renderEntity)
|
||||
}
|
||||
var renderEntity: RenderEntity = RenderEntity()
|
||||
renderEntity.code = "3006"
|
||||
renderEntity.geometry = "POINT(116.269413016946 40.08445791644373 0)"
|
||||
result.add(renderEntity)
|
||||
|
||||
var renderEntity1: RenderEntity = RenderEntity()
|
||||
renderEntity1.code = "3007"
|
||||
renderEntity1.geometry = "POINT(116.269413016946 40.08445791644373 0)"
|
||||
result.add(renderEntity1)
|
||||
//计算后
|
||||
var index = 0
|
||||
Log.e("qj","====计算开始")
|
||||
@ -836,7 +846,7 @@ class MainActivity : BaseActivity() {
|
||||
}
|
||||
}
|
||||
lastRender = it
|
||||
}
|
||||
}*/
|
||||
Log.e("qj","====计算结束")
|
||||
mapController.animationHandler.zoomOut()
|
||||
}
|
||||
|
||||
@ -719,9 +719,9 @@ class MainViewModel @Inject constructor(
|
||||
*/
|
||||
private suspend fun captureItem(point: GeoPoint) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
var buffer = 8.0
|
||||
var buffer = 10.0
|
||||
if (mapController.mMapView.mapLevel >= 18) {
|
||||
buffer = 2.0
|
||||
buffer = 2.2
|
||||
}
|
||||
val itemList = realmOperateHelper.queryElement(
|
||||
GeometryTools.createPoint(
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
<item
|
||||
android:id="@+id/personal_center_menu_version"
|
||||
android:icon="@drawable/ic_baseline_layers_24"
|
||||
android:title="版本：23QE4_V1.5.8_20231103_A" />
|
||||
android:title="版本：24QE1_V1.1.1_20231115_A" />
|
||||
</group>
|
||||
<group android:checkableBehavior="single">
|
||||
<item android:title="小标题">
|
||||
|
||||
@ -1558,15 +1558,18 @@
|
||||
<symbol repeat="false" repeat-start="0" repeat-gap="2000"
|
||||
src="@symbol" symbol-height="24" degree="90"></symbol>
|
||||
</m>
|
||||
<!-- 杆状物 -->
|
||||
<m v="OMDB_POLE">
|
||||
<symbol src="assets:omdb/icon_pole_3006.svg" symbol-height="56" symbol-width="56"></symbol>
|
||||
</m>
|
||||
|
||||
<!-- 交通标牌 -->
|
||||
<m v="OMDB_TRAFFIC_SIGN">
|
||||
<caption dy="12" fill="#FF0000" k="name" priority="0" size="12" symbol-width="37"
|
||||
stroke="#00000000" stroke-width="1.0" bg-fill="#00ffffff"></caption>
|
||||
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" gland="true"
|
||||
src="@src" symbol-height="24" symbol-width="24" degree="-90" dy="-30"></symbol>
|
||||
src="@src" symbol-width="24" ></symbol>
|
||||
</m>
|
||||
|
||||
<!-- 杆状物 -->
|
||||
<m v="OMDB_POLE">
|
||||
<symbol src="assets:omdb/icon_pole_3006.svg" ></symbol>
|
||||
</m>
|
||||
|
||||
<m v="OMDB_AREA">
|
||||
@ -1592,11 +1595,9 @@
|
||||
|
||||
<!-- 检查点 -->
|
||||
<m v="OMDB_CHECKPOINT">
|
||||
<symbol src="assets:omdb/icon_1012_0.svg" symbol-height="56"
|
||||
symbol-width="56"></symbol>
|
||||
<symbol src="assets:omdb/icon_1012_0.svg" ></symbol>
|
||||
</m>
|
||||
|
||||
|
||||
<!-- 铁路路口 -->
|
||||
<m v="OMDB_NODE_FORM">
|
||||
<symbol src="assets:omdb/icon_1007_0.svg" symbol-height="56"
|
||||
@ -1652,10 +1653,10 @@
|
||||
|
||||
<m k="boundaryType" v="2">
|
||||
<!--标线-->
|
||||
<m k="markType" v="0">
|
||||
<line stroke="#eccc68" use="boundaryType" />
|
||||
<m k="markMaterial" v="2|3">
|
||||
<lineSymbol repeat-gap="64" symbol-width="8" src="assets:omdb/icon_2013_2_3.svg"></lineSymbol>
|
||||
</m>
|
||||
<!--标线-->
|
||||
|
||||
<m k="markType" v="1">
|
||||
<m k="markColor" v="1">
|
||||
<line stroke="#ffffff" use="boundaryType" />
|
||||
@ -1893,14 +1894,14 @@
|
||||
<m k="speedFlag" v="0">
|
||||
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
|
||||
stroke-width="1.0"></caption>
|
||||
<symbol src="assets:omdb/icon_4002_0.svg" symbol-height="42"
|
||||
symbol-width="42"></symbol>
|
||||
<symbol src="assets:omdb/icon_4002_0.svg" symbol-height="38"
|
||||
symbol-width="20"></symbol>
|
||||
</m>
|
||||
<m k="speedFlag" v="1">
|
||||
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
|
||||
<caption fill="#000000" k="maxSpeed" priority="0" size="10" stroke="#ffffff"
|
||||
stroke-width="1.0"></caption>
|
||||
<symbol src="assets:omdb/icon_4002_1.svg" symbol-height="42"
|
||||
symbol-width="42"></symbol>
|
||||
<symbol src="assets:omdb/icon_4002_1.svg" symbol-height="38"
|
||||
symbol-width="20"></symbol>
|
||||
</m>
|
||||
</m>
|
||||
|
||||
@ -1909,14 +1910,14 @@
|
||||
<m k="speedFlag" v="0">
|
||||
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
|
||||
stroke-width="1.0"></caption>
|
||||
<symbol src="assets:omdb/icon_4003_0.svg" symbol-height="42"
|
||||
symbol-width="42"></symbol>
|
||||
<symbol src="assets:omdb/icon_4003_0.svg" symbol-height="38"
|
||||
symbol-width="20"></symbol>
|
||||
</m>
|
||||
<m k="speedFlag" v="1">
|
||||
<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
|
||||
stroke-width="1.0"></caption>
|
||||
<symbol src="assets:omdb/icon_4003_1.svg" symbol-height="42"
|
||||
symbol-width="42"></symbol>
|
||||
<symbol src="assets:omdb/icon_4003_1.svg" symbol-height="38"
|
||||
symbol-width="20"></symbol>
|
||||
</m>
|
||||
</m>
|
||||
|
||||
@ -1924,27 +1925,27 @@
|
||||
<m v="OMDB_SPEEDLIMIT_VAR" >
|
||||
<caption fill="#ffffff" k="ref" priority="0" size="12" stroke="#ffffff"
|
||||
stroke-width="1.0"></caption>
|
||||
<symbol src="assets:omdb/icon_4004_0.svg" symbol-height="42"
|
||||
symbol-width="42"></symbol>
|
||||
<symbol src="assets:omdb/icon_4004_0.svg" symbol-height="38"
|
||||
symbol-width="20"></symbol>
|
||||
</m>
|
||||
|
||||
|
||||
<!--交通灯-->
|
||||
<m v="OMDB_TRAFFICLIGHT">
|
||||
<symbol repeat="false" rotate="false" src="assets:omdb/icon_4022_0.svg"
|
||||
symbol-height="56" symbol-width="56"></symbol>
|
||||
<caption dy="6" fill="#FF0000" k="name" priority="0" size="12" symbol-width="37"
|
||||
stroke="#00000000" stroke-width="1.0" bg-fill="#00ffffff"></caption>
|
||||
<symbol repeat="false" symbol-width="11" gland="true" rotate="false" src="assets:omdb/icon_4022_0.svg"></symbol>
|
||||
</m>
|
||||
|
||||
<!--普通交限-->
|
||||
<m v="OMDB_RESTRICTION">
|
||||
<m k="angle">
|
||||
<symbol repeat="false" repeat-start="0" rotate="false"
|
||||
src="assets:omdb/icon_4006_0.svg" symbol-height="56" symbol-width="56"></symbol>
|
||||
<symbol repeat="false" repeat-start="0" rotate="false" symbol-width="20"
|
||||
src="assets:omdb/icon_4006_0.svg"></symbol>
|
||||
</m>
|
||||
<m k="type" v="angle">
|
||||
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
|
||||
src="assets:omdb/icon_arrow_right.svg" symbol-height="56"
|
||||
symbol-width="56"></symbol>
|
||||
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="44"
|
||||
src="assets:omdb/icon_arrow_right_2.svg" ></symbol>
|
||||
</m>
|
||||
<m k="type" v="s_2_e">
|
||||
<line use="s2e" />
|
||||
@ -1954,13 +1955,13 @@
|
||||
<!--电子眼-->
|
||||
<m v="OMDB_ELECTRONICEYE">
|
||||
<m k="eleceyeId">
|
||||
<caption dy="-12" fill="#ffffff" k="name" priority="0" size="11"
|
||||
<caption dy="-12" fill="#ffffff" k="name" priority="0" size="11" symbol-width="36"
|
||||
stroke="#000000" stroke-width="1.0" bg-fill="#F98F03"></caption>
|
||||
<symbol repeat="false" src="assets:omdb/4010/icon_electroniceye_4010.svg" symbol-height="44" symbol-width="44"></symbol>
|
||||
<symbol repeat="false" src="assets:omdb/4010/icon_electroniceye_4010.svg" symbol-width="18"></symbol>
|
||||
</m>
|
||||
<m k="type" v="angle">
|
||||
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
|
||||
src="assets:omdb/icon_arrow_right.svg" symbol-height="54" symbol-width="54"></symbol>
|
||||
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="46"
|
||||
src="assets:omdb/icon_arrow_right_2.svg" ></symbol>
|
||||
</m>
|
||||
<m k="type" v="s_2_e">
|
||||
<line use="s2e" />
|
||||
@ -2022,7 +2023,7 @@
|
||||
|
||||
<!-- 箭头 -->
|
||||
<m v="OMDB_OBJECT_ARROW">
|
||||
<area use="obj-area" stroke="#ffffff" repeat="false" src="@src" longEdge="n" hasDirect="true"></area>
|
||||
<area use="obj-area" stroke="#00ffffff" repeat="false" src="@src" longEdge="n" hasDirect="true"></area>
|
||||
</m>
|
||||
|
||||
<!-- 道路施工 -->
|
||||
@ -2033,7 +2034,7 @@
|
||||
|
||||
<!-- 通行车辆类型Lane -->
|
||||
<m v="OMDB_LANE_ACCESS">
|
||||
<text use="road" size="14" stroke="#ffffff" fill="#e7a32d"></text>
|
||||
<text use="road" size="12" stroke="#ffffff" fill="#e7a32d"></text>
|
||||
</m>
|
||||
|
||||
<!-- 车道施工 -->
|
||||
@ -2051,7 +2052,7 @@
|
||||
<m v="OMDB_WARNINGSIGN">
|
||||
<m k="type" v="dynamicSrc">
|
||||
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
|
||||
src="@src" symbol-height="24" symbol-width="24" degree="90"></symbol>
|
||||
src="@src" degree="90"></symbol>
|
||||
</m>
|
||||
<m k="type" v="s_2_e">
|
||||
<line use="s2e" />
|
||||
|
||||
@ -1 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="30" height="24" viewBox="0 0 30 24"><defs><style>.d{fill:none;}.e{fill:#ffb400;}</style></defs><g id="c"><path class="e" d="M19.3,20.2v-2.6c0,0-3.5,2.9-3.5,2.9v-3s0-1.8-.4-2.9c-.3-.5-.7-1.2-1.1-1.7h6.4s0,0,0,0L26.5,3.4l1.5,4.6,1.5-2.3L27.5,.2l-5.7,.7-1.3,2.2,4.4-.6-5.2,8.4H1s0,2,0,2H11.1c.6,.1,1.6,.5,2.2,1.3,.8,1.1,.7,3,.7,3v3.3s-3.7-3.1-3.7-3.1v2.7c0,0,4.5,3.6,4.5,3.6l4.5-3.6Z"/><rect class="d" width="30" height="24"/></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="30" height="24" viewBox="0 0 30 24">
|
||||
<defs>
|
||||
<style>.d{fill:none;}.e{fill:#ffb400;}</style>
|
||||
</defs>
|
||||
<g id="c">
|
||||
<path class="e"
|
||||
d="M19.3,20.2v-2.6c0,0-3.5,2.9-3.5,2.9v-3s0-1.8-.4-2.9c-.3-.5-.7-1.2-1.1-1.7h6.4s0,0,0,0L26.5,3.4l1.5,4.6,1.5-2.3L27.5,.2l-5.7,.7-1.3,2.2,4.4-.6-5.2,8.4H1s0,2,0,2H11.1c.6,.1,1.6,.5,2.2,1.3,.8,1.1,.7,3,.7,3v3.3s-3.7-3.1-3.7-3.1v2.7c0,0,4.5,3.6,4.5,3.6l4.5-3.6Z" />
|
||||
<rect class="d" width="30" height="24" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 525 B After Width: | Height: | Size: 588 B |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 7.2 KiB |
@ -1 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="32mm" height="32mm" viewBox="0 0 90.7 90.7"><defs><style>.d{fill:#ca171d;stroke:#8b1c21;stroke-miterlimit:10;}.e{fill:#d7e2e3;opacity:0;}</style></defs><g id="c"><g><rect class="e" width="90.7" height="90.7"/><path class="d" d="M17.4,54.1l-14.6-7.3c-.3-.2-.5-.6-.3-.9,0-.1,.2-.2,.3-.3l14.6-7.3c.3-.2,.8,0,.9,.3,0,.2,0,.4,0,.5l-2.5,7.1,2.5,7.1c.1,.4,0,.8-.4,.9-.2,0-.4,0-.5,0Z"/></g></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="32mm" height="32mm" viewBox="0 0 90.7 90.7">
|
||||
<defs>
|
||||
<style>.d{fill:#ca171d;stroke:#8b1c21;stroke-miterlimit:10;}.e{fill:#d7e2e3;opacity:0;}
|
||||
</style>
|
||||
</defs>
|
||||
<g id="c">
|
||||
<g>
|
||||
<rect class="e" width="90.7" height="90.7" />
|
||||
<path class="d"
|
||||
d="M17.4,54.1l-14.6-7.3c-.3-.2-.5-.6-.3-.9,0-.1,.2-.2,.3-.3l14.6-7.3c.3-.2,.8,0,.9,.3,0,.2,0,.4,0,.5l-2.5,7.1,2.5,7.1c.1,.4,0,.8-.4,.9-.2,0-.4,0-.5,0Z" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 484 B After Width: | Height: | Size: 586 B |
@ -1 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="32mm" height="32mm" viewBox="0 0 90.7 90.7"><defs><style>.d{fill:#ca171d;stroke:#8b1c21;stroke-miterlimit:10;}.e{fill:#d7e2e3;opacity:0;}</style></defs><g id="c"><g><rect class="e" width="90.7" height="90.7"/><path class="d" d="M73.3,39.5l14.6,7.3c.3,.2,.5,.6,.3,.9,0,.1-.2,.2-.3,.3l-14.6,7.3c-.3,.2-.8,0-.9-.3,0-.2,0-.4,0-.5l2.5-7.1-2.5-7.1c-.1-.4,0-.8,.4-.9,.2,0,.4,0,.5,0Z"/></g></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="32mm" height="32mm" viewBox="0 0 90.7 90.7">
|
||||
<defs>
|
||||
<style>.d{fill:#ca171d;stroke:#8b1c21;stroke-miterlimit:10;}.e{fill:#d7e2e3;opacity:0;}
|
||||
</style>
|
||||
</defs>
|
||||
<g id="c">
|
||||
<g>
|
||||
<rect class="e" width="90.7" height="90.7" />
|
||||
<path class="d"
|
||||
d="M73.3,39.5l14.6,7.3c.3,.2,.5,.6,.3,.9,0,.1-.2,.2-.3,.3l-14.6,7.3c-.3,.2-.8,0-.9-.3,0-.2,0-.4,0-.5l2.5-7.1-2.5-7.1c-.1-.4,0-.8,.4-.9,.2,0,.4,0,.5,0Z" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 484 B After Width: | Height: | Size: 586 B |
@ -1,11 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="84.6" height="40.5"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 84.6 40.5">
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="86" height="205"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 86 205">
|
||||
<defs>
|
||||
<style>
|
||||
.e{fill:#fad950;}.f{fill:#1e1e1e;}.g{fill:#0a0a0a;}.h{fill:url(#d);stroke:#8b9fae;stroke-miterlimit:10;stroke-width:1.2px;}
|
||||
</style>
|
||||
<linearGradient id="d" x1=".6" y1="20.3" x2="84" y2="20.3" gradientUnits="userSpaceOnUse">
|
||||
<linearGradient id="f" x1="39.3" y1="72.2" x2="47.1" y2="72.2"
|
||||
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="g" x1="1.4" y1="21.6" x2="84.2" y2="21.6"
|
||||
gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#afbacb" />
|
||||
<stop offset=".1" stop-color="#c1ccda" />
|
||||
<stop offset=".4" stop-color="#d9e6f0" />
|
||||
@ -17,20 +31,26 @@
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<g id="c">
|
||||
<g>
|
||||
<rect class="h" x=".6" y=".6" width="83.4" height="39.3" rx="4.6" ry="4.6" />
|
||||
<g>
|
||||
<path class="e"
|
||||
d="M5.8,4.4H78.8c1.4,0,2.6,1.1,2.6,2.6v28.8c0,1.4-1.1,2.6-2.6,2.6H5.8c-1.4,0-2.6-1.1-2.6-2.6V7c0-1.4,1.1-2.6,2.6-2.6Z" />
|
||||
<path class="g"
|
||||
d="M78.8,6.5c.3,0,.5,.2,.5,.5v28.8c0,.3-.2,.5-.5,.5H5.8c-.3,0-.5-.2-.5-.5V7c0-.3,.2-.5,.5-.5H78.8m0-4.1H5.8C3.3,2.4,1.2,4.4,1.2,7v28.8c0,2.6,2.1,4.6,4.6,4.6H78.8c2.6,0,4.6-2.1,4.6-4.6V7c0-2.6-2.1-4.6-4.6-4.6h0Z" />
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<path class="f"
|
||||
d="M27.6,22.5c-.3-.5-.7-1-1-1.4v6.9h-1.5v-6.6c-.5,1.1-1.1,2.2-1.6,3.1l-1-1.3c.8-1.2,1.9-3.2,2.5-4.9h-1.7v-1.5h1.8v-2.8h1.5v2.8h1.5v1.5h-1.5v1.4l.2-.2c.5,.5,1.3,1.5,1.7,2.1l-1,1Zm3.2-.8c-.5,1.6-1.4,3.8-2.2,5.2l-1.4-.8c.8-1.4,1.7-3.5,2.2-5l1.4,.6Zm2.3-1.4v6.1c0,1.3-.5,1.5-1.8,1.7h-.8c0,0-.5-1.5-.5-1.5h.8c.7-.1,.8-.2,.8-.8v-5.4h-3.4v-1.6h8.6v1.6h-3.7Zm2.9-3.9h-7.2v-1.6h7.2v1.6Zm-1.1,4.8c.5,1.2,1.7,3.7,2.1,5l-1.4,.7c-.4-1.2-1.5-3.8-2-5.1l1.3-.6Z" />
|
||||
<path class="f"
|
||||
d="M48.9,21.4h2.5v6.5h-1.3v-5h-1.2c-.1,2.3-.5,3.7-1.2,5.3l-1.4-.7c.9-2.2,1.3-3.2,1.3-7v-6h1.4v3.9h1.1v-4.2h1.3v4.2h1v1.5h-3.3v1.5Zm11.5,4.1h-3.2v2.5h-1.5v-2.5h-4v-1.4h1.3l-.4-.5c.7-.5,1.3-.8,1.7-1.3h-1.9v-7h2.2c.2-.6,.5-1.3,.6-1.7l1.5,.4c-.1,.3-.3,.8-.5,1.3h3.2v7h-3.7c-.4,.7-1,1.3-1.7,1.9h1.5v-1.5h1.5v1.5h3.2v1.4Zm-6.6-8.9v1.5h1.6v-1.5h-1.6Zm1.3,4.3c.1-.4,.2-.9,.2-1.5h-1.5v1.5h1.3Zm3.1,0v-1.5h-1.6c0,.5-.1,1-.2,1.5h1.8Zm0-4.3h-1.5v1.5h1.5v-1.5Z" />
|
||||
</g>
|
||||
<rect width="86" height="205" style="fill:#535a60; opacity:0; stroke-width:0px;" />
|
||||
<ellipse id="d" cx="43" cy="102.5" rx="14.4" ry="3.7"
|
||||
style="fill:#262d34; isolation:isolate; opacity:.2; stroke-width:0px;" />
|
||||
<ellipse id="e" cx="43" cy="102.5" rx="7.5" ry="3"
|
||||
style="fill:#535a60; stroke-width:0px;" />
|
||||
<path
|
||||
d="m40,41.2h6c.7,0,1.3.6,1.3,1.3v57.4c0,1.9-1.5,3.4-3.4,3.4h-1.8c-1.9,0-3.4-1.5-3.4-3.4v-57.4c0-.7.6-1.3,1.3-1.3Z"
|
||||
style="fill:url(#f); opacity:.5; stroke-width:0px;" />
|
||||
<rect x="1.4" y="1.9" width="82.8" height="39.3" rx="4.6" ry="4.6"
|
||||
style="fill:url(#g); stroke:#8b9fae; stroke-miterlimit:10; stroke-width:1.2px;" />
|
||||
<rect x="4" y="5.7" width="77.5" height="34" rx="2.6" ry="2.6"
|
||||
style="fill:#fad950; stroke-width:0px;" />
|
||||
<path
|
||||
d="m79,7.7c.3,0,.5.2.5.5v28.8c0,.3-.2.5-.5.5H6.6c-.3,0-.5-.2-.5-.5V8.3c0-.3.2-.5.5-.5h72.4m0-4.1H6.6c-2.6,0-4.6,2.1-4.6,4.6v28.8c0,2.6,2.1,4.6,4.6,4.6h72.4c2.6,0,4.6-2.1,4.6-4.6V8.3c0-2.6-2.1-4.6-4.6-4.6h0Z"
|
||||
style="fill:#0a0a0a; stroke-width:0px;" />
|
||||
<path
|
||||
d="m24.3,25c-.4-.6-.9-1.3-1.3-1.9v9.3h-2.1v-8.8c-.6,1.5-1.4,3-2.1,4.1l-1.3-1.8c1.1-1.7,2.5-4.3,3.3-6.6h-2.2v-2h2.4v-3.7h2.1v3.7h2v2h-2v1.9l.3-.3c.6.6,1.7,2,2.3,2.8l-1.3,1.3Zm4.3-1.1c-.6,2.1-1.9,5.2-2.9,7l-1.9-1c1.1-1.9,2.3-4.7,2.9-6.8l1.9.8Zm3.1-1.9v8.2c0,1.8-.7,2.1-2.4,2.2h-1.1c0,.1-.7-2.1-.7-2.1h1.1c.9-.1,1-.2,1-1.1v-7.2h-4.5v-2.2h11.5v2.2h-4.9Zm3.9-5.2h-9.6v-2.1h9.6v2.1Zm-1.5,6.4c.7,1.6,2.2,4.9,2.8,6.7l-1.9.9c-.6-1.7-2-5.2-2.7-6.8l1.7-.8Z"
|
||||
style="fill:#1e1e1e; stroke-width:0px;" />
|
||||
<path
|
||||
d="m52.7,23.5h3.3v8.8h-1.7v-6.8h-1.6c-.2,3.1-.7,4.9-1.7,7.1l-1.8-.9c1.2-2.9,1.7-4.3,1.7-9.4v-8.1h1.8v5.2h1.5v-5.6h1.7v5.6h1.3v2h-4.5v2.1Zm15.3,5.5h-4.3v3.4h-2v-3.4h-5.3v-1.9h1.7l-.5-.7c1-.6,1.7-1.1,2.3-1.8h-2.5v-9.4h3c.3-.8.6-1.7.8-2.2l2,.5c-.1.4-.4,1.1-.6,1.7h4.3v9.4h-4.9c-.6,1-1.3,1.8-2.3,2.5h2v-2.1h2v2.1h4.3v1.9Zm-8.8-11.9v2h2.1v-2h-2.1Zm1.7,5.7c.2-.5.3-1.2.3-2h-2v2h1.7Zm4.2,0v-2h-2.1c0,.7-.2,1.4-.3,2h2.4Zm0-5.7h-2.1v2h2.1v-2Z"
|
||||
style="fill:#1e1e1e; stroke-width:0px;" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 3.7 KiB |
@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="64" height="124.8"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 124.8">
|
||||
<defs>
|
||||
<linearGradient id="f" x1="29.3" y1="31.1" x2="34.8" y2="31.1"
|
||||
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="g" x1="1.3" y1="14.1" x2="62.5" y2="14.1"
|
||||
gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#afbacb" />
|
||||
<stop offset=".1" stop-color="#c1ccda" />
|
||||
<stop offset=".4" stop-color="#d9e6f0" />
|
||||
<stop offset=".5" stop-color="#e3f0f8" />
|
||||
<stop offset=".6" stop-color="#dde9f2" />
|
||||
<stop offset=".8" stop-color="#ccd8e4" />
|
||||
<stop offset="1" stop-color="#b1bbcc" />
|
||||
<stop offset="1" stop-color="#aeb8c9" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<g id="c">
|
||||
<rect y="0" width="64" height="124.7" style="fill:#535a60; opacity:0; stroke-width:0px;" />
|
||||
<ellipse id="d" cx="31.9" cy="61.4" rx="14.4" ry="3.7"
|
||||
style="fill:#262d34; isolation:isolate; opacity:.2; stroke-width:0px;" />
|
||||
<ellipse id="e" cx="31.9" cy="61.4" rx="7.5" ry="3"
|
||||
style="fill:#535a60; stroke-width:0px;" />
|
||||
<path
|
||||
d="m29.8,0h4.1c.5,0,.9.4.9.9v58.6c0,1.4-1.1,2.5-2.5,2.5h-1c-1.4,0-2.5-1.1-2.5-2.5V1c0-.5.4-.9.9-.9Z"
|
||||
style="fill:url(#f); stroke-width:0px;" />
|
||||
<rect x="1.3" y=".4" width="61.1" height="27.3" rx="4.6" ry="4.6"
|
||||
style="fill:url(#g); stroke:#8b9fae; stroke-miterlimit:10; stroke-width:.9px;" />
|
||||
<path
|
||||
d="m6.4,2.6h51c2,0,3.7,1.7,3.7,3.7v17.2c0,2-1.7,3.7-3.7,3.7H6.4c-2,0-3.7-1.7-3.7-3.7V6.3c0-2,1.7-3.7,3.7-3.7Z"
|
||||
style="fill:#fad950; stroke-width:0px;" />
|
||||
<path
|
||||
d="m57.4,3.5c1.5,0,2.8,1.2,2.8,2.8v17.2c0,1.5-1.2,2.8-2.8,2.8H6.4c-1.5,0-2.8-1.2-2.8-2.8V6.3c0-1.5,1.2-2.8,2.8-2.8h51m0-1.9H6.4C3.8,1.7,1.8,3.7,1.8,6.3v17.2c0,2.6,2.1,4.6,4.6,4.6h51c2.6,0,4.6-2.1,4.6-4.6V6.3c0-2.6-2.1-4.6-4.6-4.6h0Z"
|
||||
style="fill:#0a0a0a; stroke-width:0px;" />
|
||||
<path
|
||||
d="m17.4,15.9c-.3-.5-.7-1-1-1.4v6.9h-1.5v-6.6c-.5,1.1-1.1,2.2-1.6,3.1l-1-1.3c.8-1.2,1.9-3.2,2.5-4.9h-1.7v-1.5h1.8v-2.8h1.5v2.8h1.5v1.5h-1.5v1.4l.2-.2c.5.5,1.3,1.5,1.7,2.1l-1,1Zm3.2-.8c-.5,1.6-1.4,3.8-2.2,5.2l-1.4-.8c.8-1.4,1.7-3.5,2.2-5l1.4.6Zm2.3-1.4v6.1c0,1.3-.5,1.5-1.8,1.7h-.8c0,0-.5-1.5-.5-1.5h.8c.7-.1.8-.2.8-.8v-5.4h-3.4v-1.6h8.6v1.6h-3.7Zm2.9-3.9h-7.2v-1.6h7.2v1.6Zm-1.1,4.8c.5,1.2,1.7,3.7,2.1,5l-1.4.7c-.4-1.2-1.5-3.8-2-5.1l1.3-.6Z"
|
||||
style="fill:#1e1e1e; stroke-width:0px;" />
|
||||
<path
|
||||
d="m38.7,14.8h2.5v6.5h-1.3v-5h-1.2c-.1,2.3-.5,3.7-1.2,5.3l-1.4-.7c.9-2.2,1.3-3.2,1.3-7v-6h1.4v3.9h1.1v-4.2h1.3v4.2h1v1.5h-3.3v1.5Zm11.5,4.1h-3.2v2.5h-1.5v-2.5h-4v-1.4h1.3l-.4-.5c.7-.5,1.3-.8,1.7-1.3h-1.9v-7h2.2c.2-.6.5-1.3.6-1.7l1.5.4c-.1.3-.3.8-.5,1.3h3.2v7h-3.7c-.4.7-1,1.3-1.7,1.9h1.5v-1.5h1.5v1.5h3.2v1.4Zm-6.6-8.9v1.5h1.6v-1.5h-1.6Zm1.3,4.3c.1-.4.2-.9.2-1.5h-1.5v1.5h1.3Zm3.1,0v-1.5h-1.6c0,.5-.1,1-.2,1.5h1.8Zm0-4.3h-1.5v1.5h1.5v-1.5Z"
|
||||
style="fill:#1e1e1e; stroke-width:0px;" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.8 KiB |
@ -0,0 +1,56 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="28" height="20"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 20">
|
||||
<defs>
|
||||
<linearGradient id="d" x1="14" y1="18.6" x2="14" y2="9.8" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#f5a823" />
|
||||
<stop offset=".3" stop-color="#f5c003" />
|
||||
<stop offset=".5" stop-color="#f6d11b" />
|
||||
<stop offset=".7" stop-color="#f8e93e" />
|
||||
<stop offset=".9" stop-color="#f9f956" />
|
||||
<stop offset="1" stop-color="#faff5f" />
|
||||
</linearGradient>
|
||||
<linearGradient id="e" x1="14" y1="17.8" x2="14" y2="10.1" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#ff7e00" />
|
||||
<stop offset=".3" stop-color="#fe8000" />
|
||||
<stop offset=".5" stop-color="#fd8900" />
|
||||
<stop offset=".6" stop-color="#fa9901" />
|
||||
<stop offset=".8" stop-color="#f7ae02" />
|
||||
<stop offset=".9" stop-color="#f5c003" />
|
||||
<stop offset=".9" stop-color="#f6d11b" />
|
||||
<stop offset="1" stop-color="#f8e93e" />
|
||||
<stop offset="1" stop-color="#f9f956" />
|
||||
<stop offset="1" stop-color="#faff5f" />
|
||||
</linearGradient>
|
||||
<linearGradient id="f" x1=".4" y1="9.5" x2="7.3" y2="9.5" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#ff9f0f" />
|
||||
<stop offset=".2" stop-color="#edb80f" />
|
||||
<stop offset=".5" stop-color="#f6d11b" />
|
||||
<stop offset=".7" stop-color="#f8e93e" />
|
||||
<stop offset=".9" stop-color="#f9f956" />
|
||||
<stop offset="1" stop-color="#faff5f" />
|
||||
</linearGradient>
|
||||
<linearGradient id="g" x1="278.2" y1="25.4" x2="285.1" y2="25.4"
|
||||
gradientTransform="translate(305.8 -15.9) rotate(-180) scale(1 -1)" xlink:href="#f" />
|
||||
</defs>
|
||||
<g id="c">
|
||||
<rect x="20.9" y=".5" width="7.1" height="19.3" rx="1" ry="1"
|
||||
style="fill:#684214; stroke-width:0px;" />
|
||||
<rect x="0" y="18.2" width="27.8" height="1.8" rx=".9" ry=".9"
|
||||
style="fill:#684214; stroke-width:0px;" />
|
||||
<rect width="27.8" height="19.1" rx="1" ry="1" style="fill:#e8b30a; stroke-width:0px;" />
|
||||
<rect x=".2" y=".5" width="27.6" height="18.6" rx="1" ry="1"
|
||||
style="fill:#fcd90b; stroke-width:0px;" />
|
||||
<path
|
||||
d="m21.5,9.8H6.6c-.5,0-.9.2-1.2.6l-4.2,6c-.7.9,0,2.2,1.2,2.2h23.2c1.1,0,1.8-1.3,1.2-2.2l-4.1-6c-.3-.4-.7-.6-1.2-.6Z"
|
||||
style="fill:url(#d); stroke-width:0px;" />
|
||||
<rect x="6.7" y="2.8" width="14.4" height="7.5" style="fill:#fffdab; stroke-width:0px;" />
|
||||
<path
|
||||
d="m20.2,10.1H7.9c-.5,0-.9.2-1.2.6l-3.3,4.8c-.6.9,0,2.2,1.2,2.2h18.8c1.1,0,1.8-1.3,1.2-2.2l-3.2-4.8c-.3-.4-.7-.6-1.2-.6Z"
|
||||
style="fill:url(#e); stroke-width:0px;" />
|
||||
<path d="m7.3,8.4V2.8L.4,1v17.1c0,0,6.4-8.1,6.4-8.1.4-.4.5-1,.5-1.6Z"
|
||||
style="fill:url(#f); stroke-width:0px;" />
|
||||
<path d="m20.6,8.4V2.8s6.9-1.8,6.9-1.8v17.1c0,0-6.4-8.1-6.4-8.1-.4-.4-.5-1-.5-1.6Z"
|
||||
style="fill:url(#g); stroke-width:0px;" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.1 KiB |
@ -1 +1,58 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="124.7" height="124.7" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 124.7 124.7"><defs><style>.i{fill:url(#f);}.j{fill:#fff;}.k{fill:#1566e8;}.l,.m{fill:#535a60;}.n{fill:#262d34;isolation:isolate;opacity:.2;}.o{fill:url(#g);stroke:#8b9fae;stroke-miterlimit:10;stroke-width:1px;}.m{opacity:0;}</style><linearGradient id="f" x1="60.1" y1="50.4" x2="64.9" y2="50.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="g" x1="40.1" y1="23.8" x2="84.6" y2="23.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#afbacb"/><stop offset=".1" stop-color="#c1ccda"/><stop offset=".4" stop-color="#d9e6f0"/><stop offset=".5" stop-color="#e3f0f8"/><stop offset=".6" stop-color="#dde9f2"/><stop offset=".8" stop-color="#ccd8e4"/><stop offset="1" stop-color="#b1bbcc"/><stop offset="1" stop-color="#aeb8c9"/></linearGradient></defs><g id="c"><g><rect class="m" y="0" width="124.7" height="124.7"/><g><ellipse id="d" class="n" cx="62.4" cy="61.8" rx="14.4" ry="3.7"/><ellipse id="e" class="l" cx="62.4" cy="61.8" rx="7.5" ry="3"/><path class="i" d="M62.4,38.3h0c1.4,0,2.6,1.2,2.6,2.6v19.2c0,1.4-1.1,2.5-2.5,2.5h-.3c-1.4,0-2.5-1.1-2.5-2.5v-19.3c0-1.4,1.2-2.6,2.6-2.6Z"/><rect class="o" x="40.1" y=".5" width="44.5" height="46.6" rx="14.4" ry="14.4"/><rect class="k" x="40.6" y="2.6" width="43.5" height="44" rx="14.1" ry="14.1"/><path id="h" class="j" d="M46,11.4c-.3,0-.6-.2-.7-.4s0-.6,.1-.8c1.3-1.6,3-2.9,4.8-3.9,.2,0,.4-.1,.6,0,.2,0,.4,.2,.5,.4,.2,.4,0,.9-.3,1.1-1.7,.9-3.1,2.1-4.3,3.5-.2,.2-.4,.3-.6,.3h0Zm-1.8,2.6c-.1,0-.3,0-.4-.1-.2-.1-.3-.3-.4-.5,0-.2,0-.4,.1-.6l.3-.4c.1-.2,.3-.3,.5-.4,.2,0,.4,0,.6,0,.2,.1,.3,.3,.4,.5s0,.4-.1,.6l-.3,.4c-.1,.2-.4,.4-.7,.4h0Z"/><g><path class="j" d="M61,23.3c-.3-.1-.7-.4-1.2-.7,0,0-.2,0-.2-.1v1.5h-7.1v-1.4c-.2,.2-.5,.4-.9,.7-.1,0-.2,.2-.3,.2-.3-.5-.5-1.1-.9-1.6,.2,0,.4-.2,.6-.3h-1.6v1.8c.7,.5,1.4,1.1,2.1,1.7l-.9,1.4-1.2-1.2v7.3h-1.6v-7.6c-.4,1.3-1,2.5-1.8,3.8,0-.6-.2-1.4-.4-2.3,.9-1.5,1.6-3.2,2.2-4.9h-1.8v-1.5h1.8v-3.2h1.6v3.2h1.6v1.5c1.9-1.2,3.4-2.8,4.4-4.9h1.8c0,.1-.3,.9-.3,.9,1.4,1.8,3,3.2,4.8,4.1-.3,.5-.5,1.1-.7,1.6Zm-10.3,8.5v-1.4h6.6c.4-1,.8-2.4,1.4-4.4,.1-.5,.2-.9,.3-1.1l1.6,.4c-.1,.4-.3,1-.6,1.7-.5,1.5-.9,2.6-1.2,3.4h2.4v1.4h-10.6Zm2-2c-.4-1.4-.8-2.9-1.2-4.3l1.4-.3c.5,1.3,.9,2.7,1.3,4.2l-1.5,.4Zm3.3-10.8c-.9,1.3-2,2.5-3.3,3.5h6.9c-1.5-1.1-2.7-2.3-3.5-3.5Zm-.3,10.1c-.2-1.1-.5-2.5-1-4l1.5-.3c.4,1.3,.7,2.7,.9,4l-1.4,.3Z"/><path class="j" d="M77.8,23.9c-.5-.1-1-.3-1.4-.5v6.1h-11.6v-6c-.1,0-.3,.1-.5,.2-.4,.2-.8,.3-1.1,.4,0-.2-.2-.6-.4-1.1,0-.2-.2-.4-.2-.5,2.4-.7,4.4-1.6,6-2.7h-5.6v-1.4h6.6v-1.5h1.7v1.5h6.6v1.4h-5.6c1.6,1.1,3.6,2,6,2.6l-.7,1.6Zm-15.1,8.1v-1.3h15.6v1.3h-15.6Zm7-9.5v-2c-1.3,1.1-2.6,1.9-3.9,2.5h9.7c-1.6-.7-3-1.6-4-2.6v2h-1.7Zm-3.2,1.8v1.3h8.1v-1.3h-8.1Zm0,2.4v1.3h8.1v-1.3h-8.1Z"/></g></g></g></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="46" height="124.7"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 46 124.7">
|
||||
<defs>
|
||||
<linearGradient id="g" x1="20.8" y1="75.6" x2="25.6" y2="75.6"
|
||||
gradientTransform="translate(0 126) scale(1 -1)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#989898" />
|
||||
<stop offset="0" stop-color="#a3a3a3" />
|
||||
<stop offset="0" 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="h" x1=".8" y1="102.2" x2="45.3" y2="102.2"
|
||||
gradientTransform="translate(0 126) scale(1 -1)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#afbacb" />
|
||||
<stop offset="0" stop-color="#c1ccda" />
|
||||
<stop offset=".4" stop-color="#d9e6f0" />
|
||||
<stop offset=".5" stop-color="#e3f0f8" />
|
||||
<stop offset=".6" stop-color="#dde9f2" />
|
||||
<stop offset=".8" stop-color="#ccd8e4" />
|
||||
<stop offset="1" stop-color="#b1bbcc" />
|
||||
<stop offset="1" stop-color="#aeb8c9" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<g id="c">
|
||||
<g id="d">
|
||||
<rect width="46" height="124.7" style="fill:rgba(83,90,96,0); stroke-width:0px;" />
|
||||
<ellipse id="e" cx="23.1" cy="61.8" rx="14.4" ry="3.7"
|
||||
style="fill:#262d34; isolation:isolate; opacity:.2; stroke-width:0px;" />
|
||||
<ellipse id="f" cx="23.1" cy="61.8" rx="7.5" ry="3"
|
||||
style="fill:#535a60; stroke-width:0px;" />
|
||||
<path
|
||||
d="m23.1,38.3h0c1.4,0,2.6,1.2,2.6,2.6v19.2c0,1.4-1.1,2.5-2.5,2.5h-.3c-1.4,0-2.5-1.1-2.5-2.5v-19.3c0-1.4,1.2-2.6,2.6-2.6h.1Z"
|
||||
style="fill:url(#g); stroke-width:0px;" />
|
||||
<rect x=".8" y=".5" width="44.5" height="46.6" rx="14.4" ry="14.4"
|
||||
style="fill:url(#h); stroke:#8b9fae; stroke-miterlimit:10;" />
|
||||
<rect x="1.3" y="2.6" width="43.5" height="44" rx="14.1" ry="14.1"
|
||||
style="fill:#1566e8; stroke-width:0px;" />
|
||||
<path id="i"
|
||||
d="m6.7,11.4c-.3,0-.6-.2-.7-.4s0-.6,0-.8c1.3-1.6,3-2.9,4.8-3.9.2,0,.4,0,.6,0,.2,0,.4.2.5.4.2.4,0,.9-.3,1.1-1.7.9-3.1,2.1-4.3,3.5-.2.2-.4.3-.6.3h0v-.2Zm-1.8,2.6c0,0-.3,0-.4-.1-.2-.1-.3-.3-.4-.5,0-.2,0-.4,0-.6l.3-.4c0-.2.3-.3.5-.4h.6c.2.1.3.3.4.5s0,.4,0,.6l-.3.4c0,.2-.4.4-.7.4h0Z"
|
||||
style="fill:#fff; stroke-width:0px;" />
|
||||
<path
|
||||
d="m21.7,23.3c-.3-.1-.7-.4-1.2-.7,0,0-.2,0-.2-.1v1.5h-7.1v-1.4c-.2.2-.5.4-.9.7,0,0-.2.2-.3.2-.3-.5-.5-1.1-.9-1.6.2,0,.4-.2.6-.3h-1.6v1.8c.7.5,1.4,1.1,2.1,1.7l-.9,1.4-1.2-1.2v7.3h-1.6v-7.6c-.4,1.3-1,2.5-1.8,3.8,0-.6-.2-1.4-.4-2.3.9-1.5,1.6-3.2,2.2-4.9h-1.8v-1.5h1.8v-3.2h1.6v3.2h1.6v1.5c1.9-1.2,3.4-2.8,4.4-4.9h1.8c0,.1-.3.9-.3.9,1.4,1.8,3,3.2,4.8,4.1-.3.5-.5,1.1-.7,1.6Zm-10.3,8.5v-1.4h6.6c.4-1,.8-2.4,1.4-4.4,0-.5.2-.9.3-1.1l1.6.4c0,.4-.3,1-.6,1.7-.5,1.5-.9,2.6-1.2,3.4h2.4v1.4h-10.6.1Zm2-2c-.4-1.4-.8-2.9-1.2-4.3l1.4-.3c.5,1.3.9,2.7,1.3,4.2,0,0-1.5.4-1.5.4Zm3.3-10.8c-.9,1.3-2,2.5-3.3,3.5h6.9c-1.5-1.1-2.7-2.3-3.5-3.5h-.1Zm-.3,10.1c-.2-1.1-.5-2.5-1-4l1.5-.3c.4,1.3.7,2.7.9,4l-1.4.3Z"
|
||||
style="fill:#fff; stroke-width:0px;" />
|
||||
<path
|
||||
d="m38.5,23.9c-.5-.1-1-.3-1.4-.5v6.1h-11.6v-6c0,0-.3.1-.5.2-.4.2-.8.3-1.1.4,0-.2-.2-.6-.4-1.1,0-.2-.2-.4-.2-.5,2.4-.7,4.4-1.6,6-2.7h-5.6v-1.4h6.6v-1.5h1.7v1.5h6.6v1.4h-5.6c1.6,1.1,3.6,2,6,2.6l-.7,1.6h.2Zm-15.1,8.1v-1.3h15.6v1.3h-15.6Zm7-9.5v-2c-1.3,1.1-2.6,1.9-3.9,2.5h9.7c-1.6-.7-3-1.6-4-2.6v2h-1.8Zm-3.2,1.8v1.3h8.1v-1.3h-8.1Zm0,2.4v1.3h8.1v-1.3h-8.1Z"
|
||||
style="fill:#fff; stroke-width:0px;" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 2.9 MiB After Width: | Height: | Size: 2.9 MiB |
57
collect-library/src/main/assets/omdb/icon_2013_2_3.svg
Normal file
57
collect-library/src/main/assets/omdb/icon_2013_2_3.svg
Normal file
@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="54.8" height="38.7"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 54.8 38.7">
|
||||
<defs>
|
||||
<linearGradient id="d" x1="27.4" y1="36" x2="27.4" y2="18.9" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#f5a823" />
|
||||
<stop offset=".3" stop-color="#f5c003" />
|
||||
<stop offset=".5" stop-color="#f6d11b" />
|
||||
<stop offset=".7" stop-color="#f8e93e" />
|
||||
<stop offset=".9" stop-color="#f9f956" />
|
||||
<stop offset="1" stop-color="#faff5f" />
|
||||
</linearGradient>
|
||||
<linearGradient id="e" x1="27.4" y1="34.4" x2="27.4" y2="19.6"
|
||||
gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#ff7e00" />
|
||||
<stop offset=".3" stop-color="#fe8000" />
|
||||
<stop offset=".5" stop-color="#fd8900" />
|
||||
<stop offset=".6" stop-color="#fa9901" />
|
||||
<stop offset=".8" stop-color="#f7ae02" />
|
||||
<stop offset=".9" stop-color="#f5c003" />
|
||||
<stop offset=".9" stop-color="#f6d11b" />
|
||||
<stop offset="1" stop-color="#f8e93e" />
|
||||
<stop offset="1" stop-color="#f9f956" />
|
||||
<stop offset="1" stop-color="#faff5f" />
|
||||
</linearGradient>
|
||||
<linearGradient id="f" x1=".7" y1="18.4" x2="14.3" y2="18.4" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#ff9f0f" />
|
||||
<stop offset=".2" stop-color="#edb80f" />
|
||||
<stop offset=".5" stop-color="#f6d11b" />
|
||||
<stop offset=".7" stop-color="#f8e93e" />
|
||||
<stop offset=".9" stop-color="#f9f956" />
|
||||
<stop offset="1" stop-color="#faff5f" />
|
||||
</linearGradient>
|
||||
<linearGradient id="g" x1="407.6" y1="34.3" x2="421.2" y2="34.3"
|
||||
gradientTransform="translate(461.6 -15.9) rotate(-180) scale(1 -1)" xlink:href="#f" />
|
||||
</defs>
|
||||
<g id="c">
|
||||
<rect x="40.9" y="1" width="13.9" height="37.3" rx="1" ry="1"
|
||||
style="fill:#684214; stroke-width:0px;" />
|
||||
<rect y="35.2" width="54.4" height="3.5" rx="1" ry="1"
|
||||
style="fill:#684214; stroke-width:0px;" />
|
||||
<rect width="54.4" height="36.9" rx="1" ry="1" style="fill:#e8b30a; stroke-width:0px;" />
|
||||
<rect x=".4" y=".9" width="54" height="36" rx="1" ry="1"
|
||||
style="fill:#fcd90b; stroke-width:0px;" />
|
||||
<path
|
||||
d="m42.8,18.9H12.3c-.5,0-.9.2-1.1.6L1,33.8c-.7.9,0,2.2,1.1,2.2h50.4c1.1,0,1.8-1.3,1.2-2.2l-9.8-14.2c-.3-.4-.7-.6-1.2-.6Z"
|
||||
style="fill:url(#d); stroke-width:0px;" />
|
||||
<rect x="13.2" y="5.4" width="28.2" height="14.4" style="fill:#fffdab; stroke-width:0px;" />
|
||||
<path
|
||||
d="m40.3,19.6H14.8c-.5,0-.9.2-1.2.6l-8.3,12c-.6.9,0,2.2,1.2,2.2h41.9c1.1,0,1.8-1.3,1.2-2.2l-8.1-12c-.3-.4-.7-.6-1.2-.6Z"
|
||||
style="fill:url(#e); stroke-width:0px;" />
|
||||
<path d="m14.3,17V5.4L.8,1.9v33c-.1,0,12.9-16.3,12.9-16.3.4-.4.6-1,.6-1.6Z"
|
||||
style="fill:url(#f); stroke-width:0px;" />
|
||||
<path d="m40.4,17V5.4s13.5-3.4,13.5-3.4v33c.1,0-12.9-16.3-12.9-16.3-.4-.4-.6-1-.6-1.6Z"
|
||||
style="fill:url(#g); stroke-width:0px;" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.2 KiB |
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
|
||||
<defs>
|
||||
<style>.e{fill:#fcba5a;}</style>
|
||||
</defs>
|
||||
<g id="c">
|
||||
<path id="d" class="e"
|
||||
d="M31.9,0l-14.3,23.2-1.6,2.6-1.6-2.6L0,0h0V6.1L14.1,28.9l1.9,3.1h0s1.9-3.1,1.9-3.1L32,6V0h0Z" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 365 B |
@ -1,8 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
|
||||
<defs>
|
||||
<style>.a{fill:#fcba5a;}</style>
|
||||
</defs>
|
||||
<path class="a"
|
||||
d="M31.94,0,17.6,23.21l-1.62,2.622L14.4,23.274.021,0H0V6.084L14.09,28.891l1.869,3.094.024.015,1.888-3.109L32,6.021V0Z"
|
||||
transform="translate(0 0)" />
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 339 B |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 108 KiB |
@ -1,43 +1,33 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136"
|
||||
height="136" viewBox="0 0 136 136">
|
||||
<?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>
|
||||
<style>
|
||||
.a,.f{fill:#fff;}.a{opacity:0;}.b{fill:#ff5f4c;opacity:0.304;}.c{fill:#a74d4b;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.f{stroke:#db4646;stroke-width:3px;}.g{stroke:none;}.h{fill:none;}
|
||||
</style>
|
||||
<radialGradient id="a" cx="0.21" cy="0.134" r="1.274"
|
||||
gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)"
|
||||
gradientUnits="objectBoundingBox">
|
||||
<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="0.786" stop-color="#ff5f4c" />
|
||||
<stop offset=".8" stop-color="#ff5f4c" />
|
||||
<stop offset="1" stop-color="#ff5f4c" />
|
||||
</radialGradient>
|
||||
<radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox">
|
||||
<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="0.793" stop-color="#c4483b" />
|
||||
<stop offset=".8" stop-color="#c4483b" />
|
||||
<stop offset="1" stop-color="#983b31" />
|
||||
</radialGradient>
|
||||
</defs>
|
||||
<g transform="translate(-956 -396)">
|
||||
<rect class="a" width="136" height="136" transform="translate(956 396)" />
|
||||
<g transform="translate(989.164 429.346)">
|
||||
<g transform="translate(10.653 81.66)">
|
||||
<ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497" />
|
||||
<ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268"
|
||||
transform="translate(15.687 5.229)" />
|
||||
</g>
|
||||
<g transform="translate(0 0)">
|
||||
<path class="d"
|
||||
d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z"
|
||||
transform="translate(0 0)" />
|
||||
<circle class="e" cx="27.451" cy="27.451" r="27.451"
|
||||
transform="translate(7.029 7.568)" />
|
||||
</g>
|
||||
</g>
|
||||
<g transform="translate(10174 7640)">
|
||||
<g class="f" transform="translate(-9178 -7204)">
|
||||
<circle class="g" cx="28" cy="28" r="28" />
|
||||
<circle class="h" cx="28" cy="28" r="26.5" />
|
||||
</g>
|
||||
</g>
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136" height="136" viewBox="0 0 136 136"><defs><style>.a,.h,.j{fill:none;}.a{opacity:0;}.b{fill:#4d4d4d;opacity:0.304;}.c{fill:#363333;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.f,.g{fill:#fff;stroke-width:3px;}.f{stroke:#db4646;}.g,.h{stroke:#2f2f2f;}.h{stroke-linecap:round;stroke-width:2px;}.i{stroke:none;}</style><radialGradient id="a" cx="0.21" cy="0.134" r="1.274" gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#b5b4b4"/><stop offset="0.697" stop-color="#6e6c6c"/><stop offset="1" stop-color="#2f2f2f"/></radialGradient><radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#e75545"/><stop offset="0.793" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g transform="translate(-832 -256)"><g transform="translate(-124 -140)"><rect class="a" width="136" height="136" transform="translate(956 396)"/><g transform="translate(989.164 429.346)"><g transform="translate(10.653 81.66)"><ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497"/><ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268" transform="translate(15.687 5.229)"/></g><g transform="translate(0 0)"><path class="d" d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z" transform="translate(0 0)"/><circle class="e" cx="27.451" cy="27.451" r="27.451" transform="translate(7.029 7.568)"/></g></g><g transform="translate(10174 7640)"><g class="f" transform="translate(-9178 -7204)"><circle class="i" cx="28" cy="28" r="28"/><circle class="j" cx="28" cy="28" r="26.5"/></g></g><g transform="translate(573 -37)"><g transform="translate(423 473)"><g class="g"><circle class="i" cx="28" cy="28" r="28"/><circle class="j" cx="28" cy="28" r="26.5"/></g></g><g transform="translate(427.138 478.332)"><line class="h" y1="34.047" x2="33.845" transform="translate(0 0)"/><line class="h" y1="36.376" x2="36.552" transform="translate(4.81 4.168)"/><path class="h" d="M0,35.11,18.688,16.458,35.178,0" transform="translate(11.84 11.226)"/></g></g></g></g></svg>
|
||||
<?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>
|
||||
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.1 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 2.8 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 3.4 KiB |
@ -1,45 +1,35 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="136"
|
||||
height="136" viewBox="0 0 136 136">
|
||||
<?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>
|
||||
<style>
|
||||
.a,.f{fill:#fff;}.a{opacity:0;}.b{fill:#ff5f4c;opacity:0.304;}.c{fill:#a74d4b;opacity:0.708;}.d{fill:url(#a);}.e{fill:url(#b);}.g{fill:#2a23f5;stroke:#db4646;stroke-linecap:square;stroke-width:3px;stroke-dasharray:9
|
||||
10;}.h{stroke:none;}.i{fill:none;}
|
||||
</style>
|
||||
<radialGradient id="a" cx="0.21" cy="0.134" r="1.274"
|
||||
gradientTransform="matrix(0.849, 0.529, -0.307, 0.493, 0.073, -0.043)"
|
||||
gradientUnits="objectBoundingBox">
|
||||
<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="0.786" stop-color="#ff5f4c" />
|
||||
<stop offset=".8" stop-color="#ff5f4c" />
|
||||
<stop offset="1" stop-color="#ff5f4c" />
|
||||
</radialGradient>
|
||||
<radialGradient id="b" cx="0.5" cy="0.5" r="0.5" gradientUnits="objectBoundingBox">
|
||||
<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="0.793" stop-color="#c4483b" />
|
||||
<stop offset=".8" stop-color="#c4483b" />
|
||||
<stop offset="1" stop-color="#983b31" />
|
||||
</radialGradient>
|
||||
</defs>
|
||||
<g transform="translate(-956 -396)">
|
||||
<rect class="a" width="136" height="136" transform="translate(956 396)" />
|
||||
<g transform="translate(989.164 429.346)">
|
||||
<g transform="translate(10.653 81.66)">
|
||||
<ellipse class="b" cx="24.183" cy="8.497" rx="24.183" ry="8.497" />
|
||||
<ellipse class="c" cx="8.497" cy="3.268" rx="8.497" ry="3.268"
|
||||
transform="translate(15.687 5.229)" />
|
||||
</g>
|
||||
<g transform="translate(0 0)">
|
||||
<path class="d"
|
||||
d="M22.956,71.538q-.792-.8-1.543-1.533A36.466,36.466,0,0,1,0,36.4C0,16.3,15.6,0,34.837,0S69.673,16.3,69.673,36.4c0,15.235-8.954,28.283-21.664,33.711q-.588.673-1.219,1.424A73.582,73.582,0,0,0,35.337,90.157S30.335,78.981,22.956,71.538Z"
|
||||
transform="translate(0 0)" />
|
||||
<circle class="e" cx="27.451" cy="27.451" r="27.451"
|
||||
transform="translate(7.029 7.568)" />
|
||||
</g>
|
||||
</g>
|
||||
<g transform="translate(10096 7643)">
|
||||
<circle class="f" cx="28" cy="28" r="28" transform="translate(-9100 -7207)" />
|
||||
<g class="g" transform="translate(-9096 -7203)">
|
||||
<circle class="h" cx="24" cy="24" r="24" />
|
||||
<circle class="i" cx="24" cy="24" r="25.5" />
|
||||
</g>
|
||||
</g>
|
||||
<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>
|
||||
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.0 KiB |
@ -1 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="56.7" height="56.7" viewBox="0 0 56.7 56.7"><g id="c"><g><g><circle cx="28.3" cy="28.3" r="26.8" style="fill:#fff;"/><path d="M28.3,3c14,0,25.3,11.4,25.3,25.3s-11.4,25.3-25.3,25.3S3,42.3,3,28.3,14.4,3,28.3,3m0-3C12.7,0,0,12.7,0,28.3s12.7,28.3,28.3,28.3,28.3-12.7,28.3-28.3S44,0,28.3,0h0Z" style="fill:#510710;"/></g><circle cx="28.3" cy="28.3" r="26" style="fill:#db4646;"/><circle cx="28.3" cy="28.3" r="18.4" style="fill:#fff;"/><path d="M18.4,17.6h7.1v2.1c-.5,1.8-1.1,3.6-1.8,5.4,1.2,2,1.8,4,1.8,5.7,0,2.7-.7,3.3-3.2,3.7h-.6c0,0-.8-2.1-.8-2.1h.7c1.4-.3,1.8-.5,1.8-2s-.6-3-1.9-4.9c.7-2,1.3-3.8,1.8-5.8h-2.8v18.9h-2.2V17.6Zm21.1,18.9l-1.5,2.1c-4.3-2.4-6.6-4.9-8-9.8h-1.4v7.1l3.5-1.6,.3,2.4c-.6,.2-4.1,1.8-5.8,2.6l-1.1-2.2c.8-.3,.8-.5,.8-1.2V17.7h10.9v11h-5.1c.4,1.1,.8,2,1.3,2.9,1.2-.8,2.4-1.8,3.4-2.7l1.3,1.7c-1.1,1-2.4,1.9-3.5,2.7,1.2,1.3,2.7,2.2,4.7,3.1Zm-10.9-16.6v2.4h6.4v-2.4h-6.4Zm0,6.9h6.4v-2.3h-6.4v2.3Z"/></g></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="56.7" height="56.7" viewBox="0 0 56.7 56.7">
|
||||
<g id="c">
|
||||
<g>
|
||||
<g>
|
||||
<circle cx="28.3" cy="28.3" r="26.8" style="fill:#fff;" />
|
||||
<path
|
||||
d="M28.3,3c14,0,25.3,11.4,25.3,25.3s-11.4,25.3-25.3,25.3S3,42.3,3,28.3,14.4,3,28.3,3m0-3C12.7,0,0,12.7,0,28.3s12.7,28.3,28.3,28.3,28.3-12.7,28.3-28.3S44,0,28.3,0h0Z"
|
||||
style="fill:#510710;" />
|
||||
</g>
|
||||
<circle cx="28.3" cy="28.3" r="26" style="fill:#db4646;" />
|
||||
<circle cx="28.3" cy="28.3" r="18.4" style="fill:#fff;" />
|
||||
<path
|
||||
d="M18.4,17.6h7.1v2.1c-.5,1.8-1.1,3.6-1.8,5.4,1.2,2,1.8,4,1.8,5.7,0,2.7-.7,3.3-3.2,3.7h-.6c0,0-.8-2.1-.8-2.1h.7c1.4-.3,1.8-.5,1.8-2s-.6-3-1.9-4.9c.7-2,1.3-3.8,1.8-5.8h-2.8v18.9h-2.2V17.6Zm21.1,18.9l-1.5,2.1c-4.3-2.4-6.6-4.9-8-9.8h-1.4v7.1l3.5-1.6,.3,2.4c-.6,.2-4.1,1.8-5.8,2.6l-1.1-2.2c.8-.3,.8-.5,.8-1.2V17.7h10.9v11h-5.1c.4,1.1,.8,2,1.3,2.9,1.2-.8,2.4-1.8,3.4-2.7l1.3,1.7c-1.1,1-2.4,1.9-3.5,2.7,1.2,1.3,2.7,2.2,4.7,3.1Zm-10.9-16.6v2.4h6.4v-2.4h-6.4Zm0,6.9h6.4v-2.3h-6.4v2.3Z" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1022 B After Width: | Height: | Size: 1.2 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 4.0 KiB |
@ -1,24 +1,27 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="200mm" height="200mm"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 566.9 566.9">
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="103.4" height="566.9"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 103.4 566.9">
|
||||
<defs>
|
||||
<style>
|
||||
.p{fill:url(#h);}.q{fill:url(#o);}.r{fill:url(#n);}.s{fill:url(#l);}.t{fill:rgba(77,77,77,0);}.u{fill:#fff;}.v{fill:#3d444c;}.w{fill:#272d35;isolation:isolate;opacity:.2;}.x{stroke:#d5b725;}.x,.y{fill:none;}.x,.y,.z,.aa,.ab{stroke-miterlimit:10;stroke-width:3.4px;}.y{stroke:#18873b;}.z{fill:url(#k);stroke:#d15f6a;}.aa{fill:url(#j);stroke:#161b20;}.ab{fill:url(#i);stroke:#8ba0ae;}
|
||||
</style>
|
||||
<linearGradient id="h" x1="275.8" y1="248.3" x2="291.9" y2="248.3"
|
||||
gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#999899" />
|
||||
<stop offset=".2" stop-color="#7e7e80" />
|
||||
<stop offset=".4" stop-color="#5b5d60" />
|
||||
<stop offset=".6" stop-color="#46494d" />
|
||||
<linearGradient id="i" x1="45.3" y1="408.2" x2="58.8" y2="408.2"
|
||||
gradientTransform="translate(0 -200)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#989898" />
|
||||
<stop offset="0" stop-color="#a4a4a4" />
|
||||
<stop offset="0" stop-color="#c5c5c5" />
|
||||
<stop offset=".2" stop-color="#d9dada" />
|
||||
<stop offset=".3" stop-color="#e0e1e1" />
|
||||
<stop offset=".4" stop-color="#dbdcdc" />
|
||||
<stop offset=".5" stop-color="#cdcecf" />
|
||||
<stop offset=".6" stop-color="#b5b7b8" />
|
||||
<stop offset=".7" stop-color="#949698" />
|
||||
<stop offset=".8" stop-color="#6a6d6f" />
|
||||
<stop offset=".8" stop-color="#3f4246" />
|
||||
<stop offset="1" stop-color="#404247" />
|
||||
<stop offset="1" stop-color="#414248" />
|
||||
<stop offset="1" stop-color="#43434a" />
|
||||
</linearGradient>
|
||||
<linearGradient id="i" x1="234.6" y1="126" x2="332.3" y2="126"
|
||||
gradientUnits="userSpaceOnUse">
|
||||
<linearGradient id="j" x1="12.7" y1="263.9" x2="90.3" y2="263.9"
|
||||
gradientTransform="translate(0 366) scale(1 -1)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#b1bbcb" />
|
||||
<stop offset=".1" stop-color="#c2cddb" />
|
||||
<stop offset="0" stop-color="#c2cddb" />
|
||||
<stop offset=".4" stop-color="#dbe7f0" />
|
||||
<stop offset=".5" stop-color="#e4f1f9" />
|
||||
<stop offset=".6" stop-color="#deeaf3" />
|
||||
@ -26,17 +29,17 @@
|
||||
<stop offset="1" stop-color="#b1bccd" />
|
||||
<stop offset="1" stop-color="#aeb9ca" />
|
||||
</linearGradient>
|
||||
<linearGradient id="j" x1="235.7" y1="129.8" x2="331.2" y2="129.8"
|
||||
gradientUnits="userSpaceOnUse">
|
||||
<linearGradient id="k" x1="13.7" y1="260.9" x2="89.5" y2="260.9"
|
||||
gradientTransform="translate(0 366) scale(1 -1)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#403c42" />
|
||||
<stop offset=".1" stop-color="#3c4353" />
|
||||
<stop offset="0" stop-color="#3c4353" />
|
||||
<stop offset=".3" stop-color="#3a475d" />
|
||||
<stop offset=".5" stop-color="#344256" />
|
||||
<stop offset=".7" stop-color="#233445" />
|
||||
<stop offset="1" stop-color="#0d212d" />
|
||||
</linearGradient>
|
||||
<radialGradient id="k" cx="269.6" cy="70.9" fx="269.6" fy="70.9" r="30.7"
|
||||
gradientTransform="translate(18.3 1.3) scale(1 .9)" gradientUnits="userSpaceOnUse">
|
||||
<radialGradient id="l" cx="36.8" cy="305.8" fx="36.8" fy="305.8" r="24.4"
|
||||
gradientTransform="translate(18.3 329) scale(1 -.9)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
@ -48,8 +51,8 @@
|
||||
<stop offset=".8" stop-color="#e12e2a" />
|
||||
<stop offset="1" stop-color="#ce2320" />
|
||||
</radialGradient>
|
||||
<radialGradient id="l" cx="269.6" cy="70.9" fx="252.9" fy="61.2" r="29.1"
|
||||
gradientTransform="translate(18.3 1.3) scale(1 .9)" gradientUnits="userSpaceOnUse">
|
||||
<radialGradient id="m" cx="36.8" cy="305.8" fx="23.5" fy="298.1" r="23.1"
|
||||
gradientTransform="translate(18.3 329) scale(1 -.9)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
@ -59,8 +62,8 @@
|
||||
<stop offset=".9" stop-color="#c62f2d" />
|
||||
<stop offset="1" stop-color="#a11715" />
|
||||
</radialGradient>
|
||||
<radialGradient id="n" cx="269.6" cy="137.8" fx="253.4" fy="128.4" r="28.3"
|
||||
gradientTransform="translate(18.3 1.3) scale(1 .9)" gradientUnits="userSpaceOnUse">
|
||||
<radialGradient id="o" cx="36.8" cy="252.8" fx="24" fy="245.3" r="22.4"
|
||||
gradientTransform="translate(18.3 329) scale(1 -.9)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
@ -69,13 +72,13 @@
|
||||
<stop offset="0" stop-color="#f6de46" />
|
||||
<stop offset="0" stop-color="#f7e757" />
|
||||
<stop offset="0" stop-color="#f8ec63" />
|
||||
<stop offset=".1" stop-color="#f8f06a" />
|
||||
<stop offset="0" stop-color="#f8f06a" />
|
||||
<stop offset=".2" stop-color="#f9f16c" />
|
||||
<stop offset=".9" stop-color="#f8cf00" />
|
||||
<stop offset="1" stop-color="#ffe200" />
|
||||
</radialGradient>
|
||||
<radialGradient id="o" cx="283.5" cy="204.7" fx="267" fy="195.1" r="28.7"
|
||||
gradientTransform="translate(0 1.3) scale(1 .9)" gradientUnits="userSpaceOnUse">
|
||||
<radialGradient id="p" cx="51.6" cy="199.7" fx="38.5" fy="191.9" r="22.8"
|
||||
gradientTransform="translate(0 329) scale(1 -.9)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
<stop offset="0" stop-color="#ed7474" />
|
||||
@ -87,40 +90,44 @@
|
||||
</radialGradient>
|
||||
</defs>
|
||||
<g id="c">
|
||||
<g>
|
||||
<g id="d">
|
||||
<rect id="e" class="t" width="566.9" height="566.9" />
|
||||
</g>
|
||||
<g>
|
||||
<ellipse id="f" class="w" cx="283.5" cy="286.7" rx="48.6" ry="12.5" />
|
||||
<ellipse id="g" class="v" cx="283.5" cy="286.7" rx="25.5" ry="10" />
|
||||
<path class="p"
|
||||
d="M277.2,207.1h12.5c1.4,0,2.6,1.2,2.6,2.6v77.2c0,1.4-1.1,2.5-2.5,2.5h-12.8c-1.4,0-2.5-1.1-2.5-2.5v-77.2c0-1.4,1.2-2.6,2.6-2.6Z" />
|
||||
<rect class="ab" x="234.6" y="11.7" width="97.6" height="228.6" rx="48.8"
|
||||
ry="48.8" />
|
||||
<rect class="aa" x="235.7" y="21.9" width="95.5" height="215.8" rx="47.8"
|
||||
ry="47.8" />
|
||||
<g>
|
||||
<path class="z"
|
||||
d="M253.3,68.3c0,16,13.5,29,30.2,29s30.2-13,30.2-29-13.5-29-30.2-29-30.2,13-30.2,29Z" />
|
||||
<path class="s"
|
||||
d="M254.8,68.3c0,15.2,12.8,27.5,28.7,27.5s28.7-12.3,28.7-27.5-12.8-27.5-28.7-27.5-28.7,12.3-28.7,27.5Z" />
|
||||
</g>
|
||||
<path id="m" class="u"
|
||||
d="M253,48.1c-1,0-2-.5-2.4-1.5s-.3-2,.4-2.7c4.4-5.2,9.8-9.7,15.9-13,.6-.3,1.4-.4,2.1-.2,.7,.2,1.2,.7,1.6,1.3,.7,1.3,.2,2.8-1.1,3.5-5.5,2.9-10.3,6.8-14.3,11.5-.5,.6-1.3,.9-2.1,.9v.2Zm-5.9,8.4c-.5,0-1-.1-1.4-.4-.6-.4-1-.9-1.2-1.6-.2-.7,0-1.4,.3-2l.9-1.4c.4-.6,1-1,1.7-1.2,.7-.2,1.4,0,2,.3,.6,.4,1.1,.9,1.2,1.6s0,1.4-.3,2l-.9,1.4c-.5,.8-1.3,1.3-2.3,1.3h0Z" />
|
||||
<g>
|
||||
<path class="x"
|
||||
d="M254.2,131.5c0,15.5,13.1,28.1,29.3,28.1s29.3-12.6,29.3-28.1-13.1-28.1-29.3-28.1-29.3,12.6-29.3,28.1Z" />
|
||||
<path class="r"
|
||||
d="M255.6,131.5c0,14.8,12.5,26.7,27.8,26.7s27.8-12,27.8-26.7-12.5-26.7-27.8-26.7-27.8,12-27.8,26.7Z" />
|
||||
</g>
|
||||
<g>
|
||||
<path class="y"
|
||||
d="M253.3,194.7c0,15.7,13.5,28.5,30.2,28.5s30.2-12.8,30.2-28.5-13.5-28.5-30.2-28.5-30.2,12.8-30.2,28.5Z" />
|
||||
<path class="q"
|
||||
d="M254.8,194.7c0,15,12.8,27.1,28.7,27.1s28.7-12.1,28.7-27.1-12.8-27.1-28.7-27.1-28.7,12.1-28.7,27.1Z" />
|
||||
</g>
|
||||
<g id="d">
|
||||
<g id="e">
|
||||
<rect id="f" width="103.4" height="566.9" style="fill:none; stroke-width:0px;" />
|
||||
</g>
|
||||
<ellipse id="g" cx="51.7" cy="283.2" rx="35.7" ry="9.2"
|
||||
style="fill:#262d34; isolation:isolate; opacity:.2; stroke-width:0px;" />
|
||||
<ellipse id="h" cx="51.7" cy="283.2" rx="18.6" ry="7.4"
|
||||
style="fill:#535a60; stroke-width:0px;" />
|
||||
<path
|
||||
d="m52.9,285h-2.5c-3.5,0-6.2-2.7-6.2-6.2v-145.2c0-1.2,1-2.2,2.2-2.2h10.2c1.2,0,2.2,1,2.2,2.2v145.2c.2,3.5-2.5,6.2-5.9,6.2Z"
|
||||
style="fill:url(#i); stroke-width:0px;" />
|
||||
<path
|
||||
d="m51.5,11.4h0c21.4,0,38.8,17.4,38.8,38.8v103.9c0,21.4-17.4,38.8-38.8,38.8h0c-21.4,0-38.8-17.4-38.8-38.8V50.1c0-21.4,17.3-38.8,38.8-38.8h0Z"
|
||||
style="fill:url(#j); stroke:#8ba0ae; stroke-miterlimit:10; stroke-width:2.7px;" />
|
||||
<path
|
||||
d="m51.5,19.5h0c20.9,0,37.9,16.9,37.9,37.9v95.4c0,20.9-16.9,37.9-37.9,37.9h0c-20.9,0-37.9-16.9-37.9-37.9V57.4c0-20.9,16.9-37.9,37.9-37.9Z"
|
||||
style="fill:url(#k); stroke:#161b20; stroke-miterlimit:10; stroke-width:2.7px;" />
|
||||
<path
|
||||
d="m27.7,56.2c0,12.7,10.7,23,23.9,23s23.9-10.3,23.9-23-10.7-23-23.9-23-23.9,10.3-23.9,23Z"
|
||||
style="fill:url(#l); stroke:#d15f6a; stroke-miterlimit:10; stroke-width:2.7px;" />
|
||||
<path
|
||||
d="m28.9,56.2c0,12,10.2,21.8,22.8,21.8s22.8-9.8,22.8-21.8-10.2-21.8-22.8-21.8-22.8,9.8-22.8,21.8Z"
|
||||
style="fill:url(#m); stroke-width:0px;" />
|
||||
<path id="n"
|
||||
d="m27.3,40.3c-.8,0-1.6-.4-1.9-1.2s-.2-1.6.4-2.1c3.5-4.1,7.8-7.7,12.6-10.3.5-.2,1.2-.4,1.6-.1.6.1.9.6,1.3,1.1.6,1.1.1,2.2-.8,2.8-4.3,2.3-8.2,5.4-11.3,9.1-.4.5-1.1.7-1.6.7h0c0,.1-.2,0-.2,0Zm-4.7,6.7c-.4,0-.8,0-1.2-.4-.5-.4-.8-.7-.9-1.3-.1-.6,0-1.2.2-1.6l.7-1.2c.4-.5.8-.8,1.4-.9s1.2,0,1.6.2c.5.4.8.7.9,1.3s0,1.2-.2,1.6l-.7,1.2c-.4.6-1.1,1.1-1.9,1.1h0Z"
|
||||
style="fill:#fff; stroke-width:0px;" />
|
||||
<path
|
||||
d="m28.4,106.3c0,12.3,10.4,22.3,23.2,22.3s23.2-10,23.2-22.3-10.4-22.3-23.2-22.3-23.2,10-23.2,22.3Z"
|
||||
style="fill:none; stroke:#d5b725; stroke-miterlimit:10; stroke-width:2.7px;" />
|
||||
<path
|
||||
d="m29.4,106.3c0,11.8,9.9,21.1,22.1,21.1s22.1-9.6,22.1-21.1-9.9-21.1-22.1-21.1-22.1,9.6-22.1,21.1h0Z"
|
||||
style="fill:url(#o); stroke-width:0px;" />
|
||||
<path
|
||||
d="m27.7,156.6c0,12.5,10.7,22.7,23.9,22.7s23.9-10.2,23.9-22.7-10.7-22.7-23.9-22.7-23.9,10.2-23.9,22.7Z"
|
||||
style="fill:none; stroke:#18873b; stroke-miterlimit:10; stroke-width:2.7px;" />
|
||||
<path
|
||||
d="m28.9,156.6c0,11.9,10.2,21.5,22.8,21.5s22.8-9.6,22.8-21.5-10.2-21.5-22.8-21.5-22.8,9.6-22.8,21.5Z"
|
||||
style="fill:url(#p); stroke-width:0px;" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.8 KiB |
@ -1 +1,33 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="296" height="296" viewBox="0 0 296 296"><defs><style>.a{opacity:0;isolation:isolate;}.b{fill:#545e6c;opacity:0.999;}.c{fill:rgba(255,255,255,0.12);stroke:#f7ad5d;}.d{fill:rgba(255,255,255,0.11);stroke:rgba(255,255,255,0.67);opacity:0.459;}.e{stroke:rgba(0,0,0,0);stroke-miterlimit:10;fill:url(#a);}.f{stroke:none;}.g{fill:none;}</style><linearGradient id="a" x1="0.5" y1="0.267" x2="0.5" y2="0.712" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ca4916"/><stop offset="1" stop-color="#f7ad5d"/></linearGradient></defs><g transform="translate(-243 -404)"><g transform="translate(1762 -801) rotate(90)"><g class="a" transform="translate(1205 1231)"><rect class="b" width="296" height="296" transform="translate(0 -8)"/></g><g transform="translate(1250 1231)"><g class="c" transform="translate(13 50)"><circle class="f" cx="90" cy="90" r="90"/><circle class="g" cx="90" cy="90" r="89.5"/></g><g class="d" transform="translate(35 72)"><circle class="f" cx="68" cy="68" r="68"/><circle class="g" cx="68" cy="68" r="67.5"/></g><path class="e" d="M18.942,57.189V36.331H6.056A6,6,0,0,1,.535,32.946a5.356,5.356,0,0,1,.753-5.814L21.849,2.2a6.269,6.269,0,0,1,9.537,0L51.947,27.132a5.356,5.356,0,0,1,.753,5.814,6,6,0,0,1-5.521,3.386H34.293V57.1c-2.29-.125-4.628-.189-6.947-.189-2.8,0-5.622.093-8.4.277Z" transform="translate(76.383 -6.188)"/></g></g></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="56"
|
||||
height="56" viewBox="0 0 56 56">
|
||||
<defs>
|
||||
<style>
|
||||
.a{opacity:0;isolation:isolate;}.b{fill:#545e6c;opacity:0.999;}.c{fill:rgba(255,255,255,0.12);stroke:#f7ad5d;}.d{fill:rgba(255,255,255,0.11);stroke:rgba(255,255,255,0.67);opacity:0.459;}.e{stroke:rgba(0,0,0,0);stroke-miterlimit:10;fill:url(#a);}.f{stroke:none;}.g{fill:none;}
|
||||
</style>
|
||||
<linearGradient id="a" x1="0.5" y1="0.267" x2="0.5" y2="0.712"
|
||||
gradientUnits="objectBoundingBox">
|
||||
<stop offset="0" stop-color="#ca4916" />
|
||||
<stop offset="1" stop-color="#f7ad5d" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<g transform="translate(-243 -404)">
|
||||
<g transform="translate(298.797 404) rotate(90)">
|
||||
<g class="a">
|
||||
<rect class="b" width="56" height="56" transform="translate(0 -0.203)" />
|
||||
</g>
|
||||
<g transform="translate(11.16 0.341)">
|
||||
<g class="c" transform="translate(-0.16 10.455)">
|
||||
<circle class="f" cx="17" cy="17" r="17" />
|
||||
<circle class="g" cx="17" cy="17" r="16.5" />
|
||||
</g>
|
||||
<g class="d" transform="translate(3.84 14.455)">
|
||||
<circle class="f" cx="13" cy="13" r="13" />
|
||||
<circle class="g" cx="13" cy="13" r="12.5" />
|
||||
</g>
|
||||
<path class="e"
|
||||
d="M3.571,10.78h0V6.849H1.142A1.131,1.131,0,0,1,.1,6.21a1.01,1.01,0,0,1,.142-1.1L4.119.415a1.182,1.182,0,0,1,1.8,0l3.876,4.7a1.01,1.01,0,0,1,.142,1.1,1.131,1.131,0,0,1-1.041.638H6.464v3.915c-.432-.024-.872-.036-1.31-.036-.527,0-1.06.018-1.584.052Z"
|
||||
transform="translate(11.721 0)" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.8 KiB |
18
collect-library/src/main/assets/omdb/icon_arrow_right_2.svg
Normal file
18
collect-library/src/main/assets/omdb/icon_arrow_right_2.svg
Normal file
@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="28" height="28"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 28">
|
||||
<defs>
|
||||
<linearGradient id="d" x1="-2036.5" y1="79" x2="-2036.5" y2="78.4"
|
||||
gradientTransform="translate(-827.5 20461.3) 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 width="28" height="28" style="fill:none; stroke-width:0px;" />
|
||||
<path
|
||||
d="m13.9,12.6h7.1v-2.4c0-.4.2-.8.6-1,.4-.2.8-.1,1.1.1l4.7,3.9c.5.4.6,1.2.1,1.7,0,0,0,0-.1.1l-4.7,3.9c-.3.3-.7.3-1.1.1-.4-.2-.6-.6-.6-1v-2.4h-7.1c0-.4,0-.9,0-1.3s0-1.1,0-1.6h0Z"
|
||||
style="fill:url(#d); stroke-width:0px;" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 901 B |
@ -1 +1,47 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="124.7" height="124.7" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 124.7 124.7"><defs><style>.m{fill:url(#f);}.n,.o{fill:#535a60;}.p{fill:#262d34;isolation:isolate;opacity:.2;}.q{fill:url(#j);filter:url(#k);}.r{fill:url(#g);filter:url(#h);}.o{opacity:0;}</style><linearGradient id="f" x1="58.7" y1="31" x2="66.4" y2="31" 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="g" x1="776.5" y1="39.3" x2="788.4" y2="39.3" gradientTransform="translate(-720)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#11627b"/><stop offset=".1" stop-color="#0b788d"/><stop offset=".3" stop-color="#00a4b1"/><stop offset=".4" stop-color="#039aa9"/><stop offset=".5" stop-color="#068b9d"/><stop offset=".8" stop-color="#11627b"/></linearGradient><filter id="h" filterUnits="userSpaceOnUse"><feOffset dx="0" dy="1"/><feGaussianBlur result="i" stdDeviation=".3"/><feFlood flood-color="#000" flood-opacity=".2"/><feComposite in2="i" operator="in"/><feComposite in="SourceGraphic"/></filter><linearGradient id="j" x1="-396.1" y1="15.6" x2="-408" y2="15.6" gradientTransform="translate(-339.8) rotate(-180) scale(1 -1)" xlink:href="#g"/><filter id="k" filterUnits="userSpaceOnUse"><feOffset dx="0" dy="1"/><feGaussianBlur result="l" stdDeviation=".3"/><feFlood flood-color="#000" flood-opacity=".2"/><feComposite in2="l" operator="in"/><feComposite in="SourceGraphic"/></filter></defs><g id="c"><g><rect class="o" y="0" width="124.7" height="124.7"/><g><ellipse id="d" class="p" cx="62.4" cy="61.3" rx="14.4" ry="3.7"/><ellipse id="e" class="n" cx="62.4" cy="61.3" rx="7.5" ry="3"/><path class="m" d="M59.4,0h6C66.1,0,66.6,.6,66.6,1.3V58.7c0,1.9-1.5,3.4-3.4,3.4h-1.8c-1.9,0-3.4-1.5-3.4-3.4V1.3C58.1,.6,58.7,0,59.4,0Z"/></g><path class="r" d="M68.4,46.8s-1.1,.7-5.8,.7-6.2-.7-6.2-.7v-14.7s.7-1,6.2-1,5.8,1,5.8,1v14.7Z"/><path class="q" d="M56.3,23.2s1.1,.7,5.8,.7,6.2-.7,6.2-.7V8.4s-.7-1-6.2-1-5.8,1-5.8,1v14.7Z"/></g></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="28.8" height="124.7"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28.8 124.7">
|
||||
<defs>
|
||||
<linearGradient id="f" x1="10.7" y1="94.9" x2="18.4" y2="94.9"
|
||||
gradientTransform="translate(0 126) scale(1 -1)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#989898" />
|
||||
<stop offset="0" stop-color="#a3a3a3" />
|
||||
<stop offset="0" 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="g" x1="728.5" y1="86.7" x2="740.4" y2="86.7"
|
||||
gradientTransform="translate(-720 126) scale(1 -1)" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#11627b" />
|
||||
<stop offset="0" stop-color="#0b788d" />
|
||||
<stop offset=".3" stop-color="#00a4b1" />
|
||||
<stop offset=".4" stop-color="#039aa9" />
|
||||
<stop offset=".5" stop-color="#068b9d" />
|
||||
<stop offset=".8" stop-color="#11627b" />
|
||||
</linearGradient>
|
||||
<linearGradient id="h" x1="-356.1" y1="110.3" x2="-368" y2="110.3"
|
||||
gradientTransform="translate(-347.8 126) rotate(-180)" xlink:href="#g" />
|
||||
</defs>
|
||||
<g id="c">
|
||||
<rect width="28.8" height="124.7" style="fill:rgba(83,90,96,0); stroke-width:0px;" />
|
||||
<ellipse id="d" cx="14.4" cy="61.3" rx="14.4" ry="3.7"
|
||||
style="fill:#262d34; isolation:isolate; opacity:.2; stroke-width:0px;" />
|
||||
<ellipse id="e" cx="14.4" cy="61.3" rx="7.5" ry="3"
|
||||
style="fill:#535a60; stroke-width:0px;" />
|
||||
<path
|
||||
d="m11.4,0h6c.7,0,1.2.6,1.2,1.3v57.4c0,1.9-1.5,3.4-3.4,3.4h-1.8c-1.9,0-3.4-1.5-3.4-3.4V1.3c.1-.7.7-1.3,1.4-1.3Z"
|
||||
style="fill:url(#f); stroke-width:0px;" />
|
||||
<path d="m20.4,46.8s-1.1.7-5.8.7-6.2-.7-6.2-.7v-14.7s.7-1,6.2-1,5.8,1,5.8,1v14.7Z"
|
||||
style="fill:url(#g); stroke-width:0px;" />
|
||||
<path d="m8.3,23.2s1.1.7,5.8.7,6.2-.7,6.2-.7v-14.8s-.7-1-6.2-1-5.8,1-5.8,1v14.7h0Z"
|
||||
style="fill:url(#h); stroke-width:0px;" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.6 KiB |
@ -1 +1,26 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="511.9" height="512" viewBox="0 0 511.9 512"><defs><style>.d,.e{fill:#fff;}.e{opacity:0;}</style></defs><g id="c"><g><rect class="e" width="170.6" height="512"/><rect class="e" width="42.7" height="512"/><rect class="e" x="128" width="42.7" height="512"/><rect class="d" x="42.7" width="85.3" height="512"/></g><g><rect class="e" x="170.6" width="170.6" height="512"/><rect class="e" x="170.6" width="42.7" height="512"/><rect class="e" x="298.6" width="42.7" height="512"/><rect class="d" x="213.3" width="85.3" height="512"/></g><g><rect class="e" x="341.3" width="170.6" height="512"/><rect class="e" x="341.3" width="42.7" height="512"/><rect class="e" x="469.2" width="42.7" height="512"/><rect class="d" x="383.9" width="85.3" height="512"/></g></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="511.9" height="512" viewBox="0 0 511.9 512">
|
||||
<defs>
|
||||
<style>.d,.e{fill:#fff;}.e{opacity:0;}</style>
|
||||
</defs>
|
||||
<g id="c">
|
||||
<g>
|
||||
<rect class="e" width="170.6" height="512" />
|
||||
<rect class="e" width="42.7" height="512" />
|
||||
<rect class="e" x="128" width="42.7" height="512" />
|
||||
<rect class="d" x="42.7" width="85.3" height="512" />
|
||||
</g>
|
||||
<g>
|
||||
<rect class="e" x="170.6" width="170.6" height="512" />
|
||||
<rect class="e" x="170.6" width="42.7" height="512" />
|
||||
<rect class="e" x="298.6" width="42.7" height="512" />
|
||||
<rect class="d" x="213.3" width="85.3" height="512" />
|
||||
</g>
|
||||
<g>
|
||||
<rect class="e" x="341.3" width="170.6" height="512" />
|
||||
<rect class="e" x="341.3" width="42.7" height="512" />
|
||||
<rect class="e" x="469.2" width="42.7" height="512" />
|
||||
<rect class="d" x="383.9" width="85.3" height="512" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 852 B After Width: | Height: | Size: 1.1 KiB |
@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs><style>.d{fill:none;}.e{fill:#3c4c56;}</style></defs><g id="c"><rect class="d" width="24" height="24"/><path class="e" d="M21.2,11.6L12.3,1.3c-.2-.2-.4-.2-.6,0L2.8,11.6c-.2,.2-.2,.5,0,.7l8.9,10.4c.2,.2,.4,.2,.6,0l8.9-10.4c.2-.2,.2-.5,0-.7Zm-2.7,.7l-6.2,7.3c-.2,.2-.4,.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2,.4-.2,.6,0l6.2,7.3c.2,.2,.2,.5,0,.7Z"/></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18.7" height="21.7" viewBox="0 0 18.7 21.7"><g id="c"><path d="m18.6,10.5L9.7.2c-.2-.2-.4-.2-.6,0L.2,10.5c-.2.2-.2.5,0,.7l8.9,10.4c.2.2.4.2.6,0l8.9-10.4c.2-.2.2-.5,0-.7Zm-2.7.7l-6.2,7.3c-.2.2-.4.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2.4-.2.6,0l6.2,7.3c.2.2.2.5,0,.7Z" style="fill:#3c4c56; stroke-width:0px;"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 419 B |
@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs><style>.d{fill:none;}.e{fill:#fff;}</style></defs><g id="c"><rect class="d" width="24" height="24"/><path class="e" d="M21.2,11.6L12.3,1.3c-.2-.2-.4-.2-.6,0L2.8,11.6c-.2,.2-.2,.5,0,.7l8.9,10.4c.2,.2,.4,.2,.6,0l8.9-10.4c.2-.2,.2-.5,0-.7Zm-2.7,.7l-6.2,7.3c-.2,.2-.4,.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2,.4-.2,.6,0l6.2,7.3c.2,.2,.2,.5,0,.7Z"/></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18.7" height="21.7" viewBox="0 0 18.7 21.7"><g id="c"><path d="m18.6,10.5L9.7.2c-.2-.2-.4-.2-.6,0L.2,10.5c-.2.2-.2.5,0,.7l8.9,10.4c.2.2.4.2.6,0l8.9-10.4c.2-.2.2-.5,0-.7Zm-2.7.7l-6.2,7.3c-.2.2-.4.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2.4-.2.6,0l6.2,7.3c.2.2.2.5,0,.7Z" style="fill:#fff; stroke-width:0px;"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 496 B After Width: | Height: | Size: 416 B |
@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs><style>.d{fill:none;}.e{fill:#ffc729;}</style></defs><g id="c"><rect class="d" width="24" height="24"/><path class="e" d="M21.2,11.6L12.3,1.3c-.2-.2-.4-.2-.6,0L2.8,11.6c-.2,.2-.2,.5,0,.7l8.9,10.4c.2,.2,.4,.2,.6,0l8.9-10.4c.2-.2,.2-.5,0-.7Zm-2.7,.7l-6.2,7.3c-.2,.2-.4,.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2,.4-.2,.6,0l6.2,7.3c.2,.2,.2,.5,0,.7Z"/></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18.7" height="21.7" viewBox="0 0 18.7 21.7"><g id="c"><path d="m18.6,10.5L9.7.2c-.2-.2-.4-.2-.6,0L.2,10.5c-.2.2-.2.5,0,.7l8.9,10.4c.2.2.4.2.6,0l8.9-10.4c.2-.2.2-.5,0-.7Zm-2.7.7l-6.2,7.3c-.2.2-.4.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2.4-.2.6,0l6.2,7.3c.2.2.2.5,0,.7Z" style="fill:#ffc729; stroke-width:0px;"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 419 B |
@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs><style>.d{fill:none;}.e{fill:#e2233a;}</style></defs><g id="c"><rect class="d" width="24" height="24"/><path class="e" d="M21.2,11.6L12.3,1.3c-.2-.2-.4-.2-.6,0L2.8,11.6c-.2,.2-.2,.5,0,.7l8.9,10.4c.2,.2,.4,.2,.6,0l8.9-10.4c.2-.2,.2-.5,0-.7Zm-2.7,.7l-6.2,7.3c-.2,.2-.4,.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2,.4-.2,.6,0l6.2,7.3c.2,.2,.2,.5,0,.7Z"/></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18.7" height="21.7" viewBox="0 0 18.7 21.7"><g id="c"><path d="m18.6,10.5L9.7.2c-.2-.2-.4-.2-.6,0L.2,10.5c-.2.2-.2.5,0,.7l8.9,10.4c.2.2.4.2.6,0l8.9-10.4c.2-.2.2-.5,0-.7Zm-2.7.7l-6.2,7.3c-.2.2-.4.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2.4-.2.6,0l6.2,7.3c.2.2.2.5,0,.7Z" style="fill:#e2233a; stroke-width:0px;"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 419 B |
@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs><style>.d{fill:none;}.e{fill:#6a30c6;}</style></defs><g id="c"><rect class="d" width="24" height="24"/><path class="e" d="M18.8,11.7l-6.6-7.7c-.1-.1-.3-.1-.5,0l-6.6,7.7c-.1,.1-.1,.4,0,.5l6.6,7.7c.1,.1,.3,.1,.5,0l6.6-7.7c.1-.1,.1-.4,0-.5Zm-2,.5l-4.6,5.4c-.1,.1-.3,.1-.4,0l-4.6-5.4c-.1-.1-.1-.4,0-.5l4.6-5.4c.1-.1,.3-.1,.4,0l4.6,5.4c.1,.1,.1,.4,0,.5Z"/><path class="e" d="M20.8,2.2c.6,0,1,.4,1,1V20.8c0,.6-.4,1-1,1H3.2c-.6,0-1-.4-1-1V3.2c0-.6,.4-1,1-1H20.8m0-1H3.2c-1.1,0-2,.9-2,2V20.8c0,1.1,.9,2,2,2H20.8c1.1,0,2-.9,2-2V3.2c0-1.1-.9-2-2-2h0Z"/></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="21.6" height="21.6" viewBox="0 0 21.6 21.6"><g id="c"><path d="m17.6,10.5l-6.6-7.7c-.1,0-.3,0-.5,0l-6.6,7.7c0,.1,0,.4,0,.5l6.6,7.7c.1.1.3.1.5,0l6.6-7.7c.1-.1.1-.4,0-.5Zm-2,.5l-4.6,5.4c-.1.1-.3.1-.4,0l-4.6-5.4c0-.1,0-.4,0-.5l4.6-5.4c.1,0,.3,0,.4,0l4.6,5.4c.1.1.1.4,0,.5Z" style="fill:#6a30c6; stroke-width:0px;"/><path d="m19.6,1c.6,0,1,.4,1,1v17.6c0,.6-.4,1-1,1H2c-.6,0-1-.4-1-1V2c0-.6.4-1,1-1h17.6m0-1H2C.9,0,0,.9,0,2v17.6c0,1.1.9,2,2,2h17.6c1.1,0,2-.9,2-2V2c0-1.1-.9-2-2-2h0Z" style="fill:#6a30c6; stroke-width:0px;"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 687 B After Width: | Height: | Size: 622 B |
@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><defs><style>.d{fill:none;}.e{fill:#053cd6;}</style></defs><g id="c"><rect class="d" width="24" height="24"/><path class="e" d="M21.2,11.6L12.3,1.3c-.2-.2-.4-.2-.6,0L2.8,11.6c-.2,.2-.2,.5,0,.7l8.9,10.4c.2,.2,.4,.2,.6,0l8.9-10.4c.2-.2,.2-.5,0-.7Zm-2.7,.7l-6.2,7.3c-.2,.2-.4,.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2,.4-.2,.6,0l6.2,7.3c.2,.2,.2,.5,0,.7Z"/></g></svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18.7" height="21.7" viewBox="0 0 18.7 21.7"><g id="c"><path d="m18.6,10.5L9.7.2c-.2-.2-.4-.2-.6,0L.2,10.5c-.2.2-.2.5,0,.7l8.9,10.4c.2.2.4.2.6,0l8.9-10.4c.2-.2.2-.5,0-.7Zm-2.7.7l-6.2,7.3c-.2.2-.4.2-.6,0l-6.2-7.3c-.2-.2-.2-.5,0-.7l6.2-7.3c.2-.2.4-.2.6,0l6.2,7.3c.2.2.2.5,0,.7Z" style="fill:#053cd6; stroke-width:0px;"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 419 B |
@ -29,6 +29,7 @@ import org.oscim.tiling.source.mvt.TileDecoder;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -69,19 +70,55 @@ public class OMDBDataDecoder extends TileDecoder {
|
||||
mTileX = tile.tileX / mTileScale;
|
||||
mTileY = tile.tileY / mTileScale;
|
||||
mTileScale *= Tile.SIZE;
|
||||
List<RenderEntity> list = new ArrayList<>();
|
||||
List<RenderEntity> traffList = new ArrayList<>();
|
||||
listResult.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {
|
||||
@Override
|
||||
public void accept(RenderEntity renderEntity) {
|
||||
|
||||
if (!(mapLevel < renderEntity.getZoomMin() || mapLevel > renderEntity.getZoomMax())) {
|
||||
Map<String, Object> properties = new HashMap<>(renderEntity.getProperties().size());
|
||||
properties.putAll(renderEntity.getProperties());
|
||||
parseGeometry(renderEntity.getTable(), renderEntity.getWkt(), properties);
|
||||
if (renderEntity.getCode().equals(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode())) {
|
||||
list.add(renderEntity);
|
||||
}else if (renderEntity.getCode().equals(DataCodeEnum.OMDB_TRAFFICLIGHT.getCode())) {
|
||||
traffList.add(renderEntity);
|
||||
} else {
|
||||
Map<String, Object> 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()+"==="+renderEntity.getEnable());
|
||||
}
|
||||
}
|
||||
});
|
||||
//增加交通标牌聚合显示
|
||||
List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 5.0);
|
||||
if(list1!=null&&list1.size()>0){
|
||||
Log.e("qj","聚合交通标牌转换开始"+list.size());
|
||||
list1.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {
|
||||
@Override
|
||||
public void accept(RenderEntity renderEntity) {
|
||||
Map<String, Object> properties = new HashMap<>(renderEntity.getProperties().size());
|
||||
properties.putAll(renderEntity.getProperties());
|
||||
parseGeometry(renderEntity.getTable(), renderEntity.getWkt(), properties);
|
||||
}
|
||||
});
|
||||
Log.e("qj","聚合交通标牌转换结束"+list1.size());
|
||||
}
|
||||
//增加交通标牌聚合显示
|
||||
List<RenderEntity> list2 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFICLIGHT.getCode(), traffList, 5.0);
|
||||
if(list2!=null&&list2.size()>0){
|
||||
Log.e("qj","聚合红绿灯转换开始"+traffList.size());
|
||||
list2.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {
|
||||
@Override
|
||||
public void accept(RenderEntity renderEntity) {
|
||||
Map<String, Object> properties = new HashMap<>(renderEntity.getProperties().size());
|
||||
properties.putAll(renderEntity.getProperties());
|
||||
parseGeometry(renderEntity.getTable(), renderEntity.getWkt(), properties);
|
||||
}
|
||||
});
|
||||
Log.e("qj","聚合红绿灯转换结束"+list2.size());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -118,14 +118,16 @@ public class OMDBTileDataSource implements ITileDataSource {
|
||||
} else {
|
||||
sql += " and enable>=0";
|
||||
}
|
||||
|
||||
realmQuery.rawPredicate(sql);
|
||||
|
||||
// 筛选不显示的数据
|
||||
//筛选不显示的数据
|
||||
if (Constant.HAD_LAYER_INVISIABLE_ARRAY != null && Constant.HAD_LAYER_INVISIABLE_ARRAY.length > 0) {
|
||||
realmQuery.beginGroup();
|
||||
for (String type : Constant.HAD_LAYER_INVISIABLE_ARRAY) {
|
||||
realmQuery.notEqualTo("table", type);
|
||||
}
|
||||
realmQuery.notEqualTo("table", "OMDB_TRAFFIC_SIGN");
|
||||
realmQuery.endGroup();
|
||||
}
|
||||
long time = System.currentTimeMillis();
|
||||
@ -143,10 +145,7 @@ public class OMDBTileDataSource implements ITileDataSource {
|
||||
// .filter((RenderEntity renderEntity) -> MercatorProjection.longitudeToTileX(viewport.fromScreenPoint(0,0).getLongitude(), (byte) Constant.DATA_ZOOM) == currentTileX || renderEntity.getTileX().stream().min(Integer::compare).get() == currentTileX)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
List<RenderEntity> list = GeometryTools.groupByDistance("3005", listResult, 5.0);
|
||||
|
||||
mThreadLocalDecoders.get().decode(tile.zoomLevel, tile, mapDataSink, list);
|
||||
|
||||
mThreadLocalDecoders.get().decode(tile.zoomLevel, tile, mapDataSink, listResult);
|
||||
mapDataSink.completed(QueryResult.SUCCESS);
|
||||
|
||||
} else {
|
||||
|
||||
@ -1581,7 +1581,7 @@ public class GeometryTools {
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
public static List<RenderEntity> groupByDistance(String code,List<RenderEntity> list, double disance) {
|
||||
public static synchronized List<RenderEntity> groupByDistance(String code, List<RenderEntity> list, double disance) {
|
||||
|
||||
if (list == null || disance <= 0) {
|
||||
return null;
|
||||
@ -1589,51 +1589,61 @@ public class GeometryTools {
|
||||
|
||||
List<RenderEntity> listReslut = new ArrayList<>();
|
||||
|
||||
java.util.Map<String, RenderEntity> calcMap = new HashMap<>();
|
||||
java.util.Map<String, String> calcMap = new HashMap<>();
|
||||
|
||||
int count = 0;
|
||||
Log.e("qj", listReslut.size() + "==判断开始==" + list.size() + "===" + calcMap.size());
|
||||
|
||||
//遍历开始
|
||||
for (RenderEntity renderEntity : list) {
|
||||
|
||||
if(!TextUtils.isEmpty(code)&&!renderEntity.getCode().equals(code)){
|
||||
listReslut.add(renderEntity);
|
||||
calcMap.put(renderEntity.getId(),renderEntity);
|
||||
continue;
|
||||
}
|
||||
int count = 0;
|
||||
|
||||
Log.e("qj", listReslut.size() + "==判断0000");
|
||||
|
||||
//计算过的不在进行遍历
|
||||
if (!calcMap.containsKey(renderEntity.getId())) {
|
||||
|
||||
//跟要素遍历对比，如果统一个点直接标记计算并记录在内，已经计算过不在二次计算
|
||||
for (RenderEntity renderEntityTemp : list) {
|
||||
|
||||
if (!calcMap.containsKey(renderEntity.getId())) {
|
||||
if (renderEntity.getId().equals(renderEntityTemp.getId())) {
|
||||
listReslut.add(renderEntityTemp);
|
||||
count++;
|
||||
Log.e("qj", "====计算间距" + count);
|
||||
calcMap.put(renderEntityTemp.getId(), renderEntityTemp);
|
||||
if (!calcMap.containsKey(renderEntityTemp.getId())) {
|
||||
|
||||
//非当前code不参与运算
|
||||
if (!TextUtils.isEmpty(code) && !renderEntityTemp.getCode().equals(code)) {
|
||||
listReslut.add(renderEntity);
|
||||
calcMap.put(renderEntityTemp.getId(), renderEntityTemp.getCode());
|
||||
Log.e("qj", listReslut.size() + "==判断1111");
|
||||
} else {
|
||||
GeoPoint geoPoint = createGeoPoint(renderEntity.getGeometry());
|
||||
GeoPoint geoPoint1 = createGeoPoint(renderEntityTemp.getGeometry());
|
||||
double dis = getDistance(geoPoint.getLatitude(), geoPoint.getLongitude(), geoPoint1.getLatitude(), geoPoint1.getLongitude());
|
||||
Log.e("qj", "====计算间距" + dis);
|
||||
if (geoPoint != null && geoPoint1 != null && dis <= disance) {
|
||||
//只取第一个坐标
|
||||
renderEntityTemp.setGeometry(renderEntity.getGeometry());
|
||||
//renderEntity.setProperties(renderEntity.getProperties());
|
||||
calcMap.put(renderEntityTemp.getId(), renderEntityTemp);
|
||||
listReslut.add(renderEntityTemp);
|
||||
count++;
|
||||
//只保留一条
|
||||
if (count == 1) {
|
||||
renderEntityTemp.getProperties().put("src", "assets:omdb/appendix/1105_00101_0.svg");
|
||||
listReslut.add(renderEntityTemp);
|
||||
Log.e("qj", listReslut.size() + "==判断3333");
|
||||
}
|
||||
calcMap.put(renderEntityTemp.getId(), renderEntityTemp.getCode());
|
||||
Log.e("qj", "====计算间距" + dis);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//增加同点位聚合个数统计
|
||||
if (listReslut.size() > 0) {
|
||||
if (count > 1) {
|
||||
listReslut.get(listReslut.size() - 1).getProperties().put("name", count + "");
|
||||
} else {
|
||||
listReslut.get(listReslut.size() - 1).getProperties().put("name", "");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Log.e("qj", listReslut.size()+"==判断后=="+list.size()+"==="+calcMap.size());
|
||||
Log.e("qj", listReslut.size() + "==判断结束==" + list.size() + "===" + calcMap.size());
|
||||
|
||||
return listReslut;
|
||||
}
|
||||
|
||||
2
vtm
2
vtm
@ -1 +1 @@
|
||||
Subproject commit a6787549efde8f445965faf41c17c9b58ddbd578
|
||||
Subproject commit 024159afee2b9e438dd6c2a6419e034df287a8db
|
||||
Loading…
x
Reference in New Issue
Block a user