Merge pull request #399 from sigcorporativo-ja/develop

v6.2.0

mapea-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mapea",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "Herramienta para desarrollo de mapas interactivos de forma sencilla",
   "keywords": [
     "map",
@@ -65,7 +65,7 @@
     "handlebars": "4.5.2",
     "jsdoc": "^3.6.4",
     "jsts": "^2.0.2",
-    "ol": "6.9.0",
+    "ol": "6.14.1",
     "proj4": "^2.4.4"
   },
   "scripts": {

mapea-js/pom.xml

@@ -6,7 +6,7 @@
    <parent>
       <groupId>es.juntadeandalucia.mapea</groupId>
       <artifactId>mapea-parent</artifactId>
-      <version>6.1.0</version>
+      <version>6.2.0</version>
       <relativePath>../mapea-parent/pom.xml</relativePath>
    </parent>
    <licenses>

mapea-js/src/configuration.js

@@ -427,4 +427,12 @@
    * @type {String}
    */
   M.config('ATTRIBUTETABLE_PAGES', '${attributetable.pages}');
+
+  /**
+   * Zoom levels
+   *
+   * @private
+   * @type {Number}
+   */
+  M.config('ZOOM_LEVELS', '${zoom.levels}');
 })(window.M);

mapea-js/src/facade/assets/css/controls/scale.css

@@ -1,26 +1,31 @@
 .m-scale-container {
-   margin: 0;
-   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
-   padding: 5px;
-   right: 0;
-   font-weight: bold;
-   bottom: 2em;
-   display: block;
-   font-size: smaller;
-   background-color: rgba(0, 60, 136, .5);
-   font-weight: normal;
-   border-top-left-radius: 2px;
-   border-bottom-left-radius: 2px;
-   /*   min-width: 132px;*/
+    margin: 0;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+    padding: 5px;
+    right: 0;
+    font-weight: bold;
+    bottom: 2em;
+    display: block;
+    font-size: smaller;
+    background-color: rgba(0, 60, 136, .5);
+    font-weight: normal;
+    border-top-left-radius: 2px;
+    border-bottom-left-radius: 2px;
+    /*   min-width: 132px;*/
 }
 
-.m-scale-container > .m-unit {
-   font-family: 'Muli' !important;
+.m-scale-container>.m-unit {
+    font-family: 'Muli' !important;
+    line-height: normal;
 }
 
-.m-scale-container > .m-unit:before {
-   font-family: 'g-cartografia' !important;
-   color: #a35d38;
-   font-size: 12px !important;
-   margin-right: 5px;
+.m-scale-container>.m-scale {
+    line-height: normal;
+}
+
+.m-scale-container>.m-unit:before {
+    font-family: 'g-cartografia' !important;
+    color: #a35d38;
+    font-size: 12px !important;
+    margin-right: 5px;
 }

mapea-js/src/facade/js/Label.js

@@ -44,11 +44,12 @@ class Label extends Base {
    * @public
    * @function
    * @param {M.Map} map - Facade map
+   * @param { Boolean } removePrevious - remove previous labels
    * @api
    * @export
    */
-  show(map) {
-    this.getImpl().show(map);
+  show(map, removePrevious) {
+    this.getImpl().show(map, removePrevious);
   }
 
   /**