@steedos/standard-object-database 2.5.10 → 2.5.11-beta.10

package/main/default/client/coordtransform.client.js

@@ -0,0 +1,153 @@
+/**
+ * Created by Wandergis on 2015/7/8.
+ * 提供了百度坐标（BD-09）、国测局坐标（火星坐标，GCJ-02）、和 WGS-84 坐标系之间的转换
+ */
+// UMD 魔法代码
+// if the module has no dependencies, the above pattern can be simplified to
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define([], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like environments that support module.exports,
+    // like Node.
+    module.exports = factory();
+  } else {
+    // Browser globals (root is window)
+    root.coordtransform = factory();
+  }
+}(window, function () {
+  // 定义一些常量
+  var x_PI = 3.14159265358979324 * 3000.0 / 180.0;
+  var PI = 3.1415926535897932384626;
+  var a = 6378245.0;
+  var ee = 0.00669342162296594323;
+  /**
+   * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02) 的转换
+   * 即 百度 转 谷歌、高德
+   * @param bd_lng
+   * @param bd_lat
+   * @returns {*[]}
+   */
+  var bd09togcj02 = function bd09togcj02(bd_lng, bd_lat) {
+    var bd_lng = +bd_lng;
+    var bd_lat = +bd_lat;
+    var x = bd_lng - 0.0065;
+    var y = bd_lat - 0.006;
+    var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_PI);
+    var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_PI);
+    var gg_lng = z * Math.cos(theta);
+    var gg_lat = z * Math.sin(theta);
+    return [gg_lng, gg_lat]
+  };
+
+  /**
+   * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+   * 即 谷歌、高德 转 百度
+   * @param lng
+   * @param lat
+   * @returns {*[]}
+   */
+  var gcj02tobd09 = function gcj02tobd09(lng, lat) {
+    var lat = +lat;
+    var lng = +lng;
+    var z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * x_PI);
+    var theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * x_PI);
+    var bd_lng = z * Math.cos(theta) + 0.0065;
+    var bd_lat = z * Math.sin(theta) + 0.006;
+    return [bd_lng, bd_lat]
+  };
+
+  /**
+   * WGS-84 转 GCJ-02
+   * @param lng
+   * @param lat
+   * @returns {*[]}
+   */
+  var wgs84togcj02 = function wgs84togcj02(lng, lat) {
+    var lat = +lat;
+    var lng = +lng;
+    if (out_of_china(lng, lat)) {
+      return [lng, lat]
+    } else {
+      var dlat = transformlat(lng - 105.0, lat - 35.0);
+      var dlng = transformlng(lng - 105.0, lat - 35.0);
+      var radlat = lat / 180.0 * PI;
+      var magic = Math.sin(radlat);
+      magic = 1 - ee * magic * magic;
+      var sqrtmagic = Math.sqrt(magic);
+      dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+      dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+      var mglat = lat + dlat;
+      var mglng = lng + dlng;
+      return [mglng, mglat]
+    }
+  };
+
+  /**
+   * GCJ-02 转换为 WGS-84
+   * @param lng
+   * @param lat
+   * @returns {*[]}
+   */
+  var gcj02towgs84 = function gcj02towgs84(lng, lat) {
+    var lat = +lat;
+    var lng = +lng;
+    if (out_of_china(lng, lat)) {
+      return [lng, lat]
+    } else {
+      var dlat = transformlat(lng - 105.0, lat - 35.0);
+      var dlng = transformlng(lng - 105.0, lat - 35.0);
+      var radlat = lat / 180.0 * PI;
+      var magic = Math.sin(radlat);
+      magic = 1 - ee * magic * magic;
+      var sqrtmagic = Math.sqrt(magic);
+      dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+      dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+      var mglat = lat + dlat;
+      var mglng = lng + dlng;
+      return [lng * 2 - mglng, lat * 2 - mglat]
+    }
+  };
+
+  var transformlat = function transformlat(lng, lat) {
+    var lat = +lat;
+    var lng = +lng;
+    var ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
+    ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+    ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
+    ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
+    return ret
+  };
+
+  var transformlng = function transformlng(lng, lat) {
+    var lat = +lat;
+    var lng = +lng;
+    var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
+    ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+    ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
+    ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0;
+    return ret
+  };
+
+  /**
+   * 判断是否在国内，不在国内则不做偏移
+   * @param lng
+   * @param lat
+   * @returns {boolean}
+   */
+  var out_of_china = function out_of_china(lng, lat) {
+    var lat = +lat;
+    var lng = +lng;
+    // 纬度 3.86~53.55, 经度 73.66~135.05 
+    return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55);
+  };
+
+  return {
+    bd09togcj02: bd09togcj02,
+    gcj02tobd09: gcj02tobd09,
+    wgs84togcj02: wgs84togcj02,
+    gcj02towgs84: gcj02towgs84
+  }
+}));

package/main/default/objectTranslations/object_fields.en/object_fields.en.objectTranslation.yml

@@ -65,6 +65,8 @@ fields:
         value: url
       - label: Email
         value: email
+      - label: Location
+        value: location
       - label: Image
         value: image
       - label: File
@@ -86,6 +88,10 @@ fields:
     label: Group
     help: 
     description: 
+  coordinatesType:
+    label: Coordinates Type
+    help: 
+    description: 
   reference_to:
     label: Reference to
     help: 

package/main/default/objectTranslations/object_fields.zh-CN/object_fields.zh-CN.objectTranslation.yml

@@ -62,6 +62,8 @@ fields:
         value: url
       - label: 邮件地址
         value: email
+      - label: 地理位置
+        value: location
       - label: 图片
         value: image
       - label: 附件
@@ -79,6 +81,10 @@ fields:
     label: 字段分组
     help: 
     description: 
+  coordinatesType:
+    label: 坐标类型
+    help: 
+    description: 
   reference_to:
     label: 引用对象
     help: 

package/main/default/objects/object_fields.object.yml

@@ -86,6 +86,8 @@ fields:
         value: url
       - label: Email
         value: email
+      - label: Location
+        value: location
       - label: Image
         value: image
       - label: File
@@ -210,6 +212,12 @@ fields:
     type: text
     label: Group
     sort_no: 170
+  coordinatesType:
+    type: text
+    label: 坐标类型
+    sort_no: 175
+    defaultValue: bd09
+    visible_on: "{{['location'].indexOf(formData.type) > -1 ? true: false}}"
   reference_to:
     type: lookup
     label: Reference to

package/main/default/objects/object_layouts.object.yml

@@ -84,7 +84,7 @@ fields:
     type: grid
     blackbox: true
     is_wide: true
-    hidden: true
+    hidden: false
   field_groups.$.group_name:
     type: text
   fields:

package/main/default/triggers/object_fields.trigger.js

@@ -373,5 +373,36 @@ module.exports = {
         if( ["parent","children"].indexOf(field.name) > -1 && enable_tree ){
             throw new Meteor.Error(500, "启用树状结构显示记录的对象不能删除parent、children字段。");
         }
+    },
+
+    afterInsert: async function () {
+        const { doc } = this;
+        const { type, name, object: objectName } = doc;
+        // 如果是地理位置字段，则需立即创建索引，否则mongodb查询地理位置字段时会报错 'unable to find index for $geoNear query' on server'
+        if (type === 'location') {
+            const defaultAdapter = objectql.getDataSource('default').adapter
+            await defaultAdapter.connect();
+            const collection = defaultAdapter.collection(objectName);
+
+            try {
+                const indexInfo = {
+                    key: {
+                        [`${name}.wgs84`]: "2dsphere"
+                    },
+                    name: `c2_${name}_wgs84`,
+                    unique: false,
+                    sparse: false,
+                    background: true
+                }
+                const key = indexInfo.key;
+                try {
+                    await collection.createIndex(key, indexInfo)
+                } catch (error) {
+                    // DO NOTHING
+                }
+            } catch (error) {
+                console.error(error)
+            }
+        }
     }
 }

package/main/default/triggers/object_listviews.trigger.js

@@ -1,6 +1,7 @@
 const InternalData = require('@steedos/standard-objects').internalData;
 const util = require('@steedos/standard-objects').util;
 const objectql = require('@steedos/objectql');
+const auth = require("@steedos/auth");
 
 const getInternalListviews = async function(sourceListviews, filters, is_system){
     let collection = await objectql.getObject("object_listviews");
@@ -21,6 +22,16 @@ const getInternalListviews = async function(sourceListviews, filters, is_system)
 
 module.exports = {
     beforeInsert: async function () {
+        const { userId, spaceId } = this;
+        if(userId && spaceId){
+            const userSession = await auth.getSessionByUserId(userId, spaceId);
+            if(userSession){
+                const { allowCreateListViews } = await objectql.getObject("object_listviews").getUserObjectPermission(userSession, false);
+                if(!allowCreateListViews){
+                    throw new Error('没有权限创建视图')
+                }
+            }
+        }
         if (!this.doc.name) {
             this.doc.name = 'listview_' + this.doc._id.toLowerCase();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.5.10",
+    "version": "2.5.11-beta.10",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -15,5 +15,5 @@
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "b918b6237fcf33152033429f055d5707d3cf0e02"
+    "gitHead": "15896005ccd3119b38ed36350900d28fd6e75e35"
 }