Merge branch 'master' of http://192.168.0.115:3000/4dkankan/laser_v1

js/popindoorAPI2.7.1.js

@@ -574,12 +574,14 @@ var LookupGeoLocation = function(main_view, main_scene, map_view) {
             geo_name: '本地坐标',
             geo_proj4: 'local'
         }, {
-            geo_name: 'Wgs84坐标',
+            geo_name: '大地2000坐标',
             geo_proj4: 'world'
-        }, {
-            geo_name: 'EPSG 4549:CGCS2000 / 3-degree Gauss-Kruger CM 120E',
-            geo_proj4: '+proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs'
-        }];
+        }
+        // , {
+        //     geo_name: 'EPSG 4549:CGCS2000 / 3-degree Gauss-Kruger CM 120E',
+        //     geo_proj4: '+proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs'
+        // }
+    ];
     }
     IV.custom.init_coord = function() {
 
@@ -1016,10 +1018,10 @@ var Setting = function() {
             var highlightSiteModelLayer = new HighlightSiteModelLayer(main_view, main_scene, map_view, map_scene);
             map_view.addToScene(highlightSiteModelLayer);
         }
-        //if(general_setting.map){
-        var myMap = new addMinMap(main_view, main_scene, map_view, map_scene);
-        main_view.addToScene(myMap);
-        //}
+        if(userService.isAdmin()){
+            var myMap = new addMinMap(main_view, main_scene, map_view, map_scene);
+            main_view.addToScene(myMap);
+        }
     }
     IV.custom.settingSave = function(e) {
         general_setting.subArea = document.getElementById("setting_sitemodel").checked;