Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
09af936f
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
09af936f
编写于
4月 21, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MySQL GIS data types: invert coordinates
Former-commit-id:
b3d9db45
上级
7d6618e0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
9 deletion
+33
-9
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java
...ss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java
+19
-3
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GeometryConverter.java
...rg/jkiss/dbeaver/data/gis/handlers/GeometryConverter.java
+13
-5
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/data/MySQLValueHandlerProvider.java
...iss/dbeaver/ext/mysql/data/MySQLValueHandlerProvider.java
+1
-1
未找到文件。
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GISGeometryValueHandler.java
浏览文件 @
09af936f
...
...
@@ -34,7 +34,15 @@ import java.sql.SQLException;
*/
public
class
GISGeometryValueHandler
extends
JDBCAbstractValueHandler
{
public
static
final
GISGeometryValueHandler
INSTANCE
=
new
GISGeometryValueHandler
();
private
boolean
invertCoordinates
;
public
GISGeometryValueHandler
()
{
this
(
false
);
}
public
GISGeometryValueHandler
(
boolean
invertCoordinates
)
{
this
.
invertCoordinates
=
invertCoordinates
;
}
@Override
protected
Object
fetchColumnValue
(
DBCSession
session
,
JDBCResultSet
resultSet
,
DBSTypedObject
type
,
int
index
)
throws
DBCException
,
SQLException
{
...
...
@@ -70,9 +78,17 @@ public class GISGeometryValueHandler extends JDBCAbstractValueHandler {
}
else
if
(
object
instanceof
Geometry
)
{
return
new
DBGeometry
((
Geometry
)
object
);
}
else
if
(
object
instanceof
byte
[])
{
return
new
DBGeometry
(
GeometryConverter
.
getInstance
().
from
((
byte
[])
object
));
Geometry
geometry
=
GeometryConverter
.
getInstance
().
from
((
byte
[])
object
);
if
(
invertCoordinates
)
{
geometry
.
apply
(
GeometryConverter
.
INVERT_COORDINATE_FILTER
);
}
return
new
DBGeometry
(
geometry
);
}
else
if
(
object
instanceof
String
)
{
return
new
DBGeometry
(
GeometryConverter
.
getInstance
().
from
((
String
)
object
));
Geometry
geometry
=
GeometryConverter
.
getInstance
().
from
((
String
)
object
);
if
(
invertCoordinates
)
{
geometry
.
apply
(
GeometryConverter
.
INVERT_COORDINATE_FILTER
);
}
return
new
DBGeometry
(
geometry
);
}
else
{
throw
new
DBCException
(
"Unsupported geometry value: "
+
object
);
}
...
...
plugins/org.jkiss.dbeaver.data.gis/src/org/jkiss/dbeaver/data/gis/handlers/GeometryConverter.java
浏览文件 @
09af936f
package
org.jkiss.dbeaver.data.gis.handlers
;
import
com.vividsolutions.jts.geom.CoordinateSequenceFactory
;
import
com.vividsolutions.jts.geom.Geometry
;
import
com.vividsolutions.jts.geom.GeometryFactory
;
import
com.vividsolutions.jts.geom.PrecisionModel
;
import
com.vividsolutions.jts.geom.*
;
import
com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory
;
import
com.vividsolutions.jts.io.*
;
...
...
@@ -19,6 +16,7 @@ import java.io.IOException;
* of byte[] because of codegen.
*/
public
class
GeometryConverter
{
public
static
final
InvertCoordinateFilter
INVERT_COORDINATE_FILTER
=
new
InvertCoordinateFilter
();
/**
* Little endian or Big endian
*/
...
...
@@ -60,7 +58,9 @@ public class GeometryConverter {
// Read Geometry
WKBReader
wkbReader
=
new
WKBReader
(
geometryFactory
);
return
wkbReader
.
read
(
new
InputStreamInStream
(
inputStream
));
Geometry
geometry
=
wkbReader
.
read
(
new
InputStreamInStream
(
inputStream
));
return
geometry
;
}
catch
(
IOException
|
ParseException
e
)
{
throw
new
IllegalArgumentException
(
e
);
}
...
...
@@ -95,4 +95,12 @@ public class GeometryConverter {
}
}
private
static
class
InvertCoordinateFilter
implements
CoordinateFilter
{
public
void
filter
(
Coordinate
coord
)
{
double
oldX
=
coord
.
x
;
coord
.
x
=
coord
.
y
;
coord
.
y
=
oldX
;
}
}
}
\ No newline at end of file
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/data/MySQLValueHandlerProvider.java
浏览文件 @
09af936f
...
...
@@ -43,7 +43,7 @@ public class MySQLValueHandlerProvider implements DBDValueHandlerProvider {
}
else
if
(
typedObject
.
getTypeName
().
equalsIgnoreCase
(
MySQLConstants
.
TYPE_JSON
))
{
return
JDBCContentValueHandler
.
INSTANCE
;
}
else
if
(
typedObject
.
getTypeName
().
equalsIgnoreCase
(
MySQLConstants
.
TYPE_GEOMETRY
))
{
return
GISGeometryValueHandler
.
INSTANCE
;
return
new
GISGeometryValueHandler
(
true
)
;
}
else
{
return
null
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录