Fix crs list

level2-gis · Sep 12, 2019 · 8ecf80c · 8ecf80c
1 parent 527445a
commit 8ecf80c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/client/site/js/GUI.js b/client/site/js/GUI.js
@@ -376,7 +376,7 @@ MyViewportUi = Ext.extend(Ext.Viewport, {
                             //value: projectData.crsComboStore()[0][1],
                             listeners: {
                                 "select": function(combo, record, index) {
-                                    Eqwc.currentMapProjection = projectData.getProjectionsList(record.data.code);
+                                    Eqwc.currentMapProjection = projectData.getProjectionsList(record.data.code)[0];
                                 }
                                 //"render": function(c) {
                                 //    new Ext.ToolTip({

diff --git a/client/site/js/LoadAppProjectData.js b/client/site/js/LoadAppProjectData.js
@@ -251,7 +251,7 @@ projectData.getProjectionsList = function(code) {
         }
     }
 
-    return ret.length == 1 ? ret[0] : ret;
+    return ret;
 };
 
 projectData.crsComboStore = function() {

diff --git a/client/site/js/WebgisInit_functions.js b/client/site/js/WebgisInit_functions.js
@@ -652,14 +652,14 @@ function postLoading() {
             //initial CRS to display coordinates. Take setting if exists or first item crsComboStore which is QGIS project CRS.
             var value = this.data.itemAt(0).data.code;
             if(projectData.defaultCoordinatesCrsCode) {
-                var test = projectData.getProjectionsList('EPSG:'+projectData.defaultCoordinatesCrsCode);
-                if(test.length>0) {
+                var test = projectData.getProjectionsList('EPSG:'+projectData.defaultCoordinatesCrsCode)[0];
+                if(test && test.length>0) {
                     value = test[0];
                 }
             }
 
             rightStatusText.setValue(value);
-            Eqwc.currentMapProjection = projectData.getProjectionsList(value);
+            Eqwc.currentMapProjection = projectData.getProjectionsList(value)[0];
         });
         rightStatusText.store.loadData(projectData.crsComboStore());
 

diff --git a/client_common/load.php b/client_common/load.php
@@ -142,5 +142,12 @@
     }
 };
 
+//put crs into crs_list if it doesn't exist
+if(projectData.crs_list.indexOf(projectData.crs) == -1)
+{
+    projectData.crs_list.unshift(projectData.crs);
+}
+
+
 //TODO use in css!
 var userLogoImg = projectData.gis_projects.path + 'admin/resources/images/user_gray.png';