From 5ae97eebd0dfcaad32e92f9df7b7f73caad922bf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 18:20:43 +0800
Subject: [PATCH] merge module
---
ruleserver/geoPolygon.go | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruleserver/geoPolygon.go b/ruleserver/geoPolygon.go
index bfe8efe..ae81c44 100644
--- a/ruleserver/geoPolygon.go
+++ b/ruleserver/geoPolygon.go
@@ -53,7 +53,11 @@
}
//GetLocation 灏嗕竴涓粰瀹氳捣濮嬪潗鏍囷紝瀹藉害闀垮害鐨勭煩褰㈠尯鍩熷潎鍒嗕负n鏂逛唤骞惰繑鍥炰腑蹇冨潗鏍囷紙n涓哄崟杈瑰钩鍒嗘暟鍊硷級鍜岄潰绉�
+<<<<<<< HEAD
func getLocation(rect structure.Rect, n int) ([]structure.Pointfloat, float64) {
+=======
+func getLocation(rect structure.Rect, n int) ([]Pointfloat, float64) {
+>>>>>>> master
xArr := make([]float64, n) // 鐢ㄥ垏鐗囦笉鐢ㄦ暟缁勶紝鏁扮粍涓嶈兘鐢ㄥ彉閲忓畾涔夐暱搴�
yArr := make([]float64, n)
pointArr := make([]structure.Pointfloat, 0, n*n)
@@ -86,7 +90,11 @@
}
//PgsInterPercent calculate percent of two polygon intersection 璁＄畻涓や釜澶氳竟褰㈢殑閲嶅彔鍗犳瘮
+<<<<<<< HEAD
func PgsInterPercent(pgpts []structure.Point, box structure.Rect, widthScale float64, heightScale float64) (percent float64) {
+=======
+func PgsInterPercent(pgpts []Point, box structure.Rect, widthScale float64, heightScale float64) (percent float64) {
+>>>>>>> master
areapts, areaBox := getLocation(box, 10)
var count = 0
--
Gitblit v1.8.0