From 6f1ae979d13028006ccdca01e310d2b5d2d53c5c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 15 八月 2019 16:27:44 +0800
Subject: [PATCH] 把数据定义模块儿提取出来
---
ruleserver/geoPolygon.go | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/ruleserver/geoPolygon.go b/ruleserver/geoPolygon.go
index a87fb54..bfe8efe 100644
--- a/ruleserver/geoPolygon.go
+++ b/ruleserver/geoPolygon.go
@@ -2,6 +2,7 @@
import (
"math"
+ "ruleprocess/structure"
)
func min(num1 float64, num2 float64) float64 {
@@ -19,30 +20,10 @@
return num1
}
-//Point 鍧愭爣鐐�
-type Point struct {
- X float64 `json:"x"`
- Y float64 `json:"y"`
-}
-
-//Rect 妫�娴嬬洰鏍�
-type Rect struct {
- X float64
- Y float64
- Width float64
- Height float64
-}
-
-//Pointfloat 鍧愭爣鐐�
-type Pointfloat struct {
- X float64 `json:"x"`
- Y float64 `json:"y"`
-}
-
//PintIsInPolygon 鍒ゆ柇鐐规槸鍚﹀湪澶氳竟褰㈠唴閮�
//point涓鸿鍒ゆ柇鐨勫潗鏍囩偣
//polygon鏄杈瑰舰鍚勭偣鏁扮粍
-func pintIsInPolygon(point Pointfloat, polygon []Point, widthScale float64, heightScale float64) bool {
+func pintIsInPolygon(point structure.Pointfloat, polygon []structure.Point, widthScale float64, heightScale float64) bool {
var nCross int = 0
for i := 0; i < len(polygon); i++ {
@@ -72,17 +53,17 @@
}
//GetLocation 灏嗕竴涓粰瀹氳捣濮嬪潗鏍囷紝瀹藉害闀垮害鐨勭煩褰㈠尯鍩熷潎鍒嗕负n鏂逛唤骞惰繑鍥炰腑蹇冨潗鏍囷紙n涓哄崟杈瑰钩鍒嗘暟鍊硷級鍜岄潰绉�
-func getLocation(rect Rect, n int) ([]Pointfloat, float64) {
+func getLocation(rect structure.Rect, n int) ([]structure.Pointfloat, float64) {
xArr := make([]float64, n) // 鐢ㄥ垏鐗囦笉鐢ㄦ暟缁勶紝鏁扮粍涓嶈兘鐢ㄥ彉閲忓畾涔夐暱搴�
yArr := make([]float64, n)
- pointArr := make([]Pointfloat, 0, n*n)
+ pointArr := make([]structure.Pointfloat, 0, n*n)
for i := 0; i < n; i++ {
xArr[i] = rect.X + (rect.Width/float64(2*n))*float64(2*i+1)
yArr[i] = rect.Y + (rect.Height/float64(2*n))*float64(2*i+1)
}
for i := 0; i < n; i++ {
for j := 0; j < n; j++ {
- point := Pointfloat{X: xArr[i], Y: yArr[j]}
+ point := structure.Pointfloat{X: xArr[i], Y: yArr[j]}
pointArr = append(pointArr, point)
}
}
@@ -91,7 +72,7 @@
}
//ComputePolygonArea 璁＄畻浠绘剰澶氳竟褰㈤潰绉�
-func computePolygonArea(polygon []Point) float64 {
+func computePolygonArea(polygon []structure.Point) float64 {
pointNum := len(polygon)
var s float64 = 0
if pointNum < 3 {
@@ -105,7 +86,7 @@
}
//PgsInterPercent calculate percent of two polygon intersection 璁＄畻涓や釜澶氳竟褰㈢殑閲嶅彔鍗犳瘮
-func PgsInterPercent(pgpts []Point, box Rect, widthScale float64, heightScale float64) (percent float64) {
+func PgsInterPercent(pgpts []structure.Point, box structure.Rect, widthScale float64, heightScale float64) (percent float64) {
areapts, areaBox := getLocation(box, 10)
var count = 0
@@ -120,7 +101,7 @@
perInterPg := areaInter / areaPg // 閲嶅悎闈㈢Н鍗犲杈瑰舰鍖哄煙鐨勬瘮渚�
// 鍝釜鍗犵殑姣斾緥澶ф寜鍝釜璁＄畻
if perInterBox > perInterPg {
- return perInterBox
+ return (perInterBox*100)
}
return (perInterPg*100)
}
--
Gitblit v1.8.0