Merge pull request #187 from fgpv-vpgf/develop

Update master to v1.1.4
fgpv-vpgf · Mar 15, 2017 · a1f7ffb · a1f7ffb
2 parents eee3bb8 + 95f2ad1
commit a1f7ffb
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "geoApi",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "",
   "main": "dist/geoapi.js",
   "dependencies": {

diff --git a/src/symbology.js b/src/symbology.js
@@ -755,6 +755,38 @@ function mapServerLegendToRenderer(serverLegend, layerIndex) {
     };
 }
 
+/**
+  * Our symbology engine works off of renderers. When dealing with layers with no renderers,
+  * we need to take server-side legend and convert it to a fake renderer, which lets us
+  * leverage all the existing symbology code.
+  *
+  * Same as mapServerLegendToRenderer function but combines all layer renderers.
+  *
+  * @function mapServerLegendToRendererAll
+  * @private
+  * @param {Object} serverLegend legend json from an esri map server
+  * @returns {Object} a fake unique value renderer based off the legend
+  */
+
+function mapServerLegendToRendererAll(serverLegend) {
+
+    const layerRenders = serverLegend.layers.map(layer =>
+        layer.legend.map(layerLegend => ({
+            label: layerLegend.label,
+            symbol: {
+                type: 'esriPMS',
+                imageData: layerLegend.imageData,
+                contentType: layerLegend.contentType
+            }
+        }))
+    );
+
+    return {
+        type: 'uniqueValue',
+        uniqueValueInfos: [].concat(...layerRenders)
+    };
+}
+
 function buildMapServerToLocalLegend(esriBundle, geoApi) {
     /**
      * Orchestrator function that will:
@@ -765,15 +797,17 @@ function buildMapServerToLocalLegend(esriBundle, geoApi) {
      *
      * @function mapServerToLocalLegend
      * @param {String}    mapServerUrl  service url (root service, not indexed endpoint)
-     * @param {Integer}   layerIndex    the index of the layer in the legend we are interested in
+     * @param {Integer}   [layerIndex]    the index of the layer in the legend we are interested in. If not provided, all layers will be collapsed into a single legend
      * @returns {Promise} resolves in a viewer-compatible legend for the given server and layer index
      *
      */
     return (mapServerUrl, layerIndex) => {
         // get esri legend from server
         return getMapServerLegend(mapServerUrl, esriBundle).then(serverLegendData => {
             // derive renderer for specified layer
-            const fakeRenderer = mapServerLegendToRenderer(serverLegendData, layerIndex);
+            const fakeRenderer = typeof layerIndex === 'undefined' ?
+                mapServerLegendToRendererAll(serverLegendData) :
+                mapServerLegendToRenderer(serverLegendData, layerIndex);
 
             // convert renderer to viewer specific legend
             return geoApi.symbology.rendererToLegend(fakeRenderer);

diff --git a/test/testTileLegend.html b/test/testTileLegend.html
@@ -0,0 +1,24 @@
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Test Page</title>
+    <style>
+        .layerTile { position: absolute; }
+    </style>
+</head>
+<body>
+    <p id="mess" />
+    <script src="../dist/geoapi.js"></script>
+    <script>
+        // http://localhost:6002/test/testServerLegend.html
+        geoapi('http://js.arcgis.com/3.14/', window).then(function (api) {
+            var mahLegendPromise = api.symbology.mapServerToLocalLegend('http://ec.gc.ca/arcgis/rest/services/Basemaps/OilSandsBasemap/MapServer');
+            mahLegendPromise.then(function (legend) {
+                console.log('this is my legend result', legend);
+            });
+        });
+</script>
+</body>
+</html>