Merge remote-tracking branch 'origin/15.12'

GFI-Informatique · Apr 6, 2016 · c6a1d2f · c6a1d2f
2 parents d55c615 + 6da46fd
commit c6a1d2f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/config/configurations/template b/config/configurations/template
diff --git a/mapfishapp/src/main/webapp/app/js/GEOR_config.js b/mapfishapp/src/main/webapp/app/js/GEOR_config.js
@@ -47,22 +47,6 @@ GEOR.config = (function() {
          */
         HEADER_HEIGHT: getCustomParameter("HEADER_HEIGHT", 90),
 
-        /**
-         * Method: DEFAULT_WMC
-         * runtime method to get the current default WMC
-         */
-        DEFAULT_WMC: function() {
-            if (GEOR.config.CONTEXTS &&
-                GEOR.config.CONTEXTS[0] &&
-                GEOR.config.CONTEXTS[0]["wmc"]) {
-                return GEOR.config.CONTEXTS[0]["wmc"];
-            }
-            alert("Administrator: "+
-                "GEOR.config.CONTEXTS is not configured as expected !");
-            // should not happen:
-            return "default.wmc";
-        },
-
         /**
          * Constant: ANONYMOUS
          * Whether a user is logged in or not: can be overriden

diff --git a/mapfishapp/src/main/webapp/app/js/GEOR_mapinit.js b/mapfishapp/src/main/webapp/app/js/GEOR_mapinit.js
@@ -451,7 +451,7 @@ GEOR.mapinit = (function() {
             // and finally we're running our global success callback:
             cb.call();
         } else {
-            updateStoreFromWMC(GEOR.config.DEFAULT_WMC());
+            updateStoreFromWMC(GEOR.config.DEFAULT_WMC);
         }
     };
 
@@ -524,6 +524,16 @@ GEOR.mapinit = (function() {
             layerStore = ls;
             tr = OpenLayers.i18n;
             cb = callback || OpenLayers.Util.Void;
+
+            // the default WMC is either the one provided by the admin in GEOR.custom,
+            // or the first one publicized by mapfishapp's ContextController.java 
+            // in GEOR.config.CONTEXTS
+            GEOR.config.DEFAULT_WMC = GEOR.custom.DEFAULT_WMC ||
+                // first context publicized by ContextController:
+                (GEOR.config.CONTEXTS[0] && GEOR.config.CONTEXTS[0]["wmc"]) ||
+                // this last one should not happen
+                "context/default.wmc";
+
             var url;
             // POSTing a content to the app (which results in GEOR.initstate
             // being set) has priority over everything else:
@@ -589,7 +599,7 @@ GEOR.mapinit = (function() {
                 // this is so that the map object and fake base layer are
                 // properly configured when adding the other layers
                 // to the map
-                updateStoreFromWMC(GEOR.config.DEFAULT_WMC(), {
+                updateStoreFromWMC(GEOR.config.DEFAULT_WMC, {
                     success: function() {
                         loadLayers(initState);
                     }
+12 −0		mapfishapp/app/js/GEOR_custom.js
+12 −6		mapfishapp/contexts/default.wmc
+ −		mapfishapp/contexts/images/default.png