Fixed #1641 - Added cache param in Display layer properties

docma-config.json

@@ -63,12 +63,10 @@
                     "label": "Reference",
                     "items": [
                         { "label": "Framework", "href": "api/framework"},
-
                         { "separator": true },
                         { "label": "JavaScript API", "href": "api/jsapi" },
                         { "separator": true },
                         { "label": "Plugins", "href": "api/plugins" }
-
                     ]
                 },
                 {
@@ -105,7 +103,7 @@
     },
     "src": [
         {
-          "framework" : [
+          "framework": [
             "web/client/components/index.jsdoc",
             "web/client/components/buttons/FullScreenButton.jsx",
             "web/client/components/buttons/GlobeViewSwitcherButton.jsx",

web/client/components/TOC/fragments/settings/Display.jsx

@@ -9,7 +9,7 @@
 const React = require('react');
 
 const Slider = require('react-nouislider');
-const {Label} = require('react-bootstrap');
+const {Label, Checkbox} = require('react-bootstrap');
 const {DropdownList} = require('react-widgets');
 const Message = require('../../../I18N/Message');
 require('react-widgets/lib/less/react-widgets.less');
@@ -45,9 +45,15 @@ module.exports = React.createClass({
             <Label key="opacity-percent" >{Math.round(this.props.settings.options.opacity * 100) + "%"}</Label>
             </div>
             {this.props.element.type === "wms" ?
-                [(<div key="transparent-check"><input type="checkbox" key="transparent" checked={this.props.element && (this.props.element.transparent === undefined ? true : this.props.element.transparent)}
-                onChange={(event) => {this.props.onChange("transparent", event.target.checked); }}/>
-            <label key="transparent-label" className="control-label">Transparent</label></div>)] : null}
+                [(<div key="transparent-check">
+                    <Checkbox key="transparent" checked={this.props.element && (this.props.element.transparent === undefined ? true : this.props.element.transparent)} onChange={(event) => {this.props.onChange("transparent", event.target.checked); }}>
+                        <Message msgId="layerProperties.transparent"/></Checkbox>
+                    <Checkbox key="cache" value="tiled" key="tiled"
+                        onChange={(e) => this.props.onChange("tiled", e.target.checked)}
+                        checked={this.props.element && this.props.element.tiled !== undefined ? this.props.element.tiled : true} >
+                        <Message msgId="layerProperties.cached"/>
+                    </Checkbox>
+                </div>)] : null}
         </div>);
     }
 });

web/client/components/TOC/fragments/settings/__tests__/Display-test.jsx

@@ -68,7 +68,7 @@ describe('test Layer Properties Display module component', () => {
         expect(comp).toExist();
         const inputs = ReactTestUtils.scryRenderedDOMComponentsWithTag( comp, "input" );
         expect(inputs).toExist();
-        expect(inputs.length).toBe(1);
+        expect(inputs.length).toBe(2);
         inputs[0].click();
         expect(spy.calls.length).toBe(1);
     });

web/client/translations/data.de-DE

@@ -29,6 +29,8 @@
             "general": "Generell",
             "display": "Darstellung",
             "style": "Stil",
+            "transparent": "Transparent",
+            "cached": "Verwenden Sie Cache-Optionen",
             "styleCustom": "Stil \"{value}\" nutzen",
             "styleListLoadError": "Es gab einen Fehler beim Laden der Liste von Stilen",
             "stylesRefreshList": "Aktualisiere die Liste von Stilen",
@@ -40,6 +42,10 @@
             "featureTypeError": "Layerattribute können nicht geladen werden",
             "elevation": "Höhe"
         },
+        "globeswitcher": {
+            "tooltipDeactivate": "Beenden Sie den 3D-Modus",
+            "tooltipActivate": "Geben Sie den 3D-Modus ein"
+        },
         "background": "Hintergrund",
         "language": "Sprache",
         "mousePositionCoordinates": "Koordinatenanzeige",

web/client/translations/data.en-US

@@ -29,6 +29,8 @@
             "general": "General",
             "display": "Display",
             "style": "Style",
+            "transparent": "Transparent",
+            "cached": "Use cache options",
             "styleCustom": "Use style named \"{value}\"",
             "styleListLoadError": "There was an error loading the styles list",
             "stylesRefreshList": "Refresh Styles List",
@@ -40,6 +42,10 @@
             "featureTypeError": "Cannot load layer attributes",
             "elevation": "Elevation"
         },
+        "globeswitcher": {
+            "tooltipDeactivate": "Exit 3D Mode",
+            "tooltipActivate": "Enter 3D Mode"
+        },
         "background": "Background",
         "language": "Language",
         "mousePositionCoordinates": "Coordinates indicator",

web/client/translations/data.fr-FR

@@ -29,6 +29,8 @@
             "general": "Général",
             "display": "Affichage",
             "style": "Style",
+            "transparent": "Transparent",
+            "cached": "Utiliser les options de cache",
             "styleCustom": "Utilisez un style nommé \"{value} \"",
             "styleListLoadError": "Une erreur s'est produite lors du chargement de la liste de styles",
             "stylesRefreshList": "Actualiser la liste des styles",
@@ -40,6 +42,10 @@
             "featureTypeError": "Impossible de charger les attributs de calque",
             "elevation": "élévation"
         },
+        "globeswitcher": {
+            "tooltipDeactivate": "Sortie en mode 3D",
+            "tooltipActivate": "Entrez le mode 3D"
+        },
         "enable": "Activer",
         "background": "Fond de plan",
         "language": "langue",

web/client/translations/data.it-IT

@@ -29,6 +29,8 @@
             "general": "Generale",
             "display": "Visualizzazione",
             "style": "Stile",
+            "transparent": "Trasparenza",
+            "cached": "Usa la cache",
             "styleCustom": "Usa stile con nome \"{value}\"",
             "styleListLoadError": "Si è verificato un errore durante il caricamento della lista degli stili",
             "stylesRefreshList": "Aggiorna lista degli stili",
@@ -40,6 +42,10 @@
             "featureTypeError": "Impossibile caricare gli attributi del layer",
             "elevation": "Elevazione"
         },
+        "globeswitcher": {
+            "tooltipDeactivate": "Disattiva la modalità 3D",
+            "tooltipActivate": "Attiva la modalità 3D"
+        },
         "background": "Sfondo",
         "language": "Lingua",
         "mousePositionCoordinates": "Indicatore di coordinate",

web/client/utils/LayersUtils.js

@@ -193,6 +193,7 @@ var LayersUtils = {
             capabilitiesURL: layer.capabilitiesURL,
             title: layer.title,
             transparent: layer.transparent,
+            tiled: layer.tiled,
             type: layer.type,
             url: layer.url,
             bbox: layer.bbox,

web/client/utils/PluginsUtils.js

@@ -50,7 +50,7 @@ const parseExpression = (state = {}, context = {}, value) => {
 /*eslint-enable */
 /**
  * Parses a expression string "{some javascript}" and evaluate it.
- * The expression will be evalueted getting as parameters the state and the context and the request.
+ * The expression will be evaluated getting as parameters the state and the context and the request.
  * @memberof utils.PluginsUtils
  * @param  {object} state      the state context
  * @param  {object} context    the context element