Merge pull request #59 from sigcorporativo-ja/develop

v3.1.0

dist/api.json

@@ -22,8 +22,8 @@
     "name": "stylemanager",
     "description": "Gestión del estilo de la simbología de las capas vectoriales del mapa",
     "text": "Plugin de Mapea para la gestión de la simbología de las capas vectoriales del mapa.",
-    "version": "2.0.5",
-    "date": "Marzo, 2021",
+    "version": "3.0.0",
+    "date": "Junio, 2020",
     "author": "",
     "org": "Consejería de Hacienda, Industria y Energía. Junta de Andalucía",
     "tags": "mapea,plugin",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "StyleManager",
-  "version": "2.0.5",
+  "version": "3.1.0",
   "description": "",
   "keywords": [
     "map",

src/api.json

@@ -22,8 +22,8 @@
     "name": "stylemanager",
     "description": "Gestión del estilo de la simbología de las capas vectoriales del mapa",
     "text": "Plugin de Mapea para la gestión de la simbología de las capas vectoriales del mapa.",
-    "version": "2.0.5",
-    "date": "Marzo, 2021",
+    "version": "3.0.0",
+    "date": "Junio, 2020",
     "author": "",
     "org": "Consejería de Hacienda, Industria y Energía. Junta de Andalucía",
     "tags": "mapea,plugin",

src/facade/assets/css/stylemanager.css

@@ -251,21 +251,29 @@ input[type="checkbox"].m-input+label.check-inactive:before {
 }
 
 .m-stylemanager-container-select[open-select] .m-stylemanager-buttons-wrap #m-stylemanager-select {
-    margin-left: -35%;
+    /* margin-left: -35%; */
 }
 
 .m-stylemanager-container-select .m-stylemanager-buttons-wrap #m-stylemanager-select {
-    margin-left: -10%;
+    /* margin-left: -10%; */
 }
 
 .m-stylemanager-simple-section .subtitle {
     color: #e5008a;
     font-size: 14px;
     width: 100%;
     border-bottom: 0;
-    height: 30px;
-    line-height: 2.2;
+    height: 40px;
+    line-height: 2.7;
     justify-content: center;
+    font-weight: bold;
+}
+
+.m-stylemanager-simple-section .subtitle>span {
+    position: relative;
+    top: 1px;
+    font-size: 12px;
+    margin-left: 5px;
 }
 
 .m-stylemanager-control li div {
@@ -385,6 +393,13 @@ input[type="checkbox"].m-input+label.check-inactive:before {
     margin-bottom: 5px;
 }
 
+.style-col-0>span,
+.style-col-1>span,
+.style-col-2>span {
+    position: relative;
+    top: 3px;
+}
+
 .style-col-0 {
     float: left;
     width: 100%;
@@ -1038,6 +1053,7 @@ select:disabled {
     grid-template-columns: auto auto auto auto auto;
     overflow-x: hidden;
 }
+
 .style-grid-item {
     background: #f4f4f4;
     border-radius: 3px;
@@ -1053,21 +1069,32 @@ select:disabled {
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
 }
+
 .style-grid-item:hover {
     background: #e3e3e3;
     line-height: 28px;
 }
+
 .style-grid-item.selected {
     border: 1px solid #e5008a;
     line-height: 28px;
 }
-.style-grid-container.active{
+
+.style-grid-container.active {
     display: grid;
 }
 
-#select-icon{
+#select-icon {
     display: none;
     width: 29px;
     height: 29px;
     padding: 0;
+}
+
+.content-row-hidden {
+    display: none;
+}
+
+.content-row-show {
+    display: block;
 }

src/facade/js/binding/categorybinding.js

@@ -305,7 +305,7 @@ export class CategoryBinding extends Binding {
     });
 
     let otherCategory = categoriesStyle == null ? null : categoriesStyle["other"];
-    this.styleCategories_["other"] = new SimpleCategoryBinding(stylesimple, this.htmlTemplate_, "stylesimple", otherCategory, this.layer_, this);
+    this.styleCategories_["other"] = new SimpleCategoryBinding(simpleoptions, this.htmlTemplate_, "stylesimple", otherCategory, this.layer_, this);
     this.styleCategories_["other"].compilePromise_.then(() => {
       this.styleCategories_["other"].refreshLegend("other", true);
     });
@@ -595,4 +595,4 @@ export class CategoryBinding extends Binding {
   static get MAXNUMBER_CATEGORIES() {
     return 30;
   }
-}
+}

src/facade/js/binding/clusterbinding.js

@@ -38,6 +38,7 @@ export class ClusterBinding extends Binding {
     this.querySelectorAllForEach("[data-style-options]", element => {
       let prop = element.dataset["styleOptions"];
       let value = element.value;
+
       if (element.type === "checkbox") {
         value = element.checked;
       }
@@ -225,6 +226,7 @@ export class ClusterBinding extends Binding {
     ranges.forEach((element, index) => {
       options["pages"].push(element);
     });
+
     return options;
   }
 }

src/facade/js/binding/heatmapbinding.js

@@ -3,6 +3,9 @@ import {
 }
 from './binding';
 
+import * as htmlgradient from '../../../templates/gradientheatmap'
+import * as chroma from 'chroma-js';
+
 export class HeatmapBinding extends Binding {
   constructor(html, htmlParent, styleType, styleParams, layer) {
     super(html, htmlParent, styleType, styleParams, layer);
@@ -49,18 +52,17 @@ export class HeatmapBinding extends Binding {
   addGradientListener() {
     let parent = this.querySelector("[data-parent='gradient']");
     this.querySelector("[data-add]").addEventListener('click', () => {
-      this.compileTemplate("gradientheatmap.html", {}).then((html) => {
+      this.compileTemplate(htmlgradient, {}).then((htmlgradient) => {
         if (this.numberAddedColors_ < HeatmapBinding.MAX_NUMBER_COLORS) {
-          parent.appendChild(html);
-          this.setRandomColor(html);
-          html.querySelector('.m-close').addEventListener('click', () => {
-            let rootElement = html.parentElement;
-            rootElement.removeChild(html);
+          parent.appendChild(htmlgradient);
+          this.setRandomColor(htmlgradient);
+          htmlgradient.querySelector('.m-close').addEventListener('click', () => {
+            let rootElement = htmlgradient.parentElement;
+            rootElement.removeChild(htmlgradient);
             this.numberAddedColors_--;
           });
           this.numberAddedColors_++;
-        }
-        else {
+        } else {
           M.dialog.info("Ha llegado al número máximo de colores permitidos", "Información");
         }
       });