Merge pull request #6 from sigcorporativo-ja/develop

v1.0.1
sigcorporativo-ja · May 10, 2021 · 319249c · 319249c
2 parents 6dd2c50 + a5860c2
commit 319249c
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+/src/index.js
diff --git a/dist/api.json b/dist/api.json
@@ -44,12 +44,13 @@
     "name": "Transparency",
     "description": "Efecto transparencia sobre capa",
     "text": "Plugin que permite realizar un efecto de transparencia sobre una capa. En caso de indicar varias capas, se realizará el efecto sobre la capa seleccionada en el selector. ",
-    "version": "1.0.0",
-    "date": "Junio, 2020",
+    "version": "1.0.1",
+    "date": "Mayo, 2021",
     "author": "",
     "org": "Consejería de Hacienda, Industria y Energía. Junta de Andalucía.",
     "tags": "mapea,plugin",
     "icon": "./facade/assets/icons/icons.svg",
-    "centralized": true
+    "centralized": true,
+    "compatibility": ["5","6"]
   }
 }
diff --git a/dist/transparency.ol.min.js b/dist/transparency.ol.min.js
diff --git a/dist/transparency.ol.min.js.map b/dist/transparency.ol.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Transparency",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "keywords": [
     "map",

diff --git a/src/api.json b/src/api.json
@@ -44,12 +44,13 @@
     "name": "Transparency",
     "description": "Efecto transparencia sobre capa",
     "text": "Plugin que permite realizar un efecto de transparencia sobre una capa. En caso de indicar varias capas, se realizará el efecto sobre la capa seleccionada en el selector. ",
-    "version": "1.0.0",
-    "date": "Junio, 2020",
+    "version": "1.0.1",
+    "date": "Mayo, 2021",
     "author": "",
     "org": "Consejería de Hacienda, Industria y Energía. Junta de Andalucía.",
     "tags": "mapea,plugin",
     "icon": "./facade/assets/icons/icons.svg",
-    "centralized": true
+    "centralized": true,
+    "compatibility": ["5","6"]
   }
 }
diff --git a/src/impl/ol/js/TransparentInteraction.js b/src/impl/ol/js/TransparentInteraction.js
@@ -55,6 +55,8 @@ export default class TransparentInteraction extends ol.interaction.Pointer {
       for (i = 0; i < this.layers_.length; i += 1) {
         this.layers_[i].precompose = this.layers_[i].on('precompose', this.precompose_.bind(this));
         this.layers_[i].postcompose = this.layers_[i].on('postcompose', this.postcompose_.bind(this));
+        this.layers_[i].precompose = this.layers_[i].on('prerender', this.precompose_.bind(this));
+        this.layers_[i].postcompose = this.layers_[i].on('postrender', this.postcompose_.bind(this));
       }
       map.renderSync();
     }
@@ -78,6 +80,8 @@ export default class TransparentInteraction extends ol.interaction.Pointer {
       if (this.getMap()) {
         l.precompose = layers[i].on('precompose', this.precompose_.bind(this));
         l.postcompose = layers[i].on('postcompose', this.postcompose_.bind(this));
+        l.precompose = layers[i].on('prerender', this.precompose_.bind(this));
+        l.postcompose = layers[i].on('postrender', this.postcompose_.bind(this));
         this.getMap().renderSync();
       }
       this.layers_.push(layers[i]);

diff --git a/test/dev.html b/test/dev.html
@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="mapea" content="yes">
     <title>Transparency TEST</title>
-    <link href="http://mapea4-sigc.juntadeandalucia.es/mapea/assets/css/mapea-5.1.0.ol.min.css" rel="stylesheet" />
+    <link href="http://mapea4-sigc.juntadeandalucia.es/mapea/assets/css/mapea-6.0.0.ol.min.css" rel="stylesheet" />
 
 
     <style rel="stylesheet">
@@ -24,8 +24,8 @@
 
 <body>
     <div id="mapjs" class="container"></div>
-    <script type="text/javascript" src="http://mapea4-sigc.juntadeandalucia.es/mapea/js/mapea-5.1.0.ol.min.js"></script>
-    <script type="text/javascript" src="http://mapea4-sigc.juntadeandalucia.es/mapea/js/configuration-5.1.0.js"></script>
+    <script type="text/javascript" src="http://mapea4-sigc.juntadeandalucia.es/mapea/js/mapea-6.0.0.ol.min.js"></script>
+    <script type="text/javascript" src="http://mapea4-sigc.juntadeandalucia.es/mapea/js/configuration-6.0.0.js"></script>
 
     <script type="text/javascript" src="/main.js"></script>
 </body>

diff --git a/test/prod.html b/test/prod.html
@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="mapea" content="yes">
     <title>Transparency Production TEST</title>
-    <link href="http://mapea4-sigc.juntadeandalucia.es/mapea/assets/css/mapea-5.1.0.ol.min.css" rel="stylesheet" />
+    <link href="http://mapea4-sigc.juntadeandalucia.es/mapea/assets/css/mapea-6.0.0.ol.min.css" rel="stylesheet" />
     <link href="../dist/transparency.ol.min.css" rel="stylesheet" />
     <style rel="stylesheet">
         html,
@@ -23,8 +23,8 @@
 
 <body>
     <div id="mapjs" class="container"></div>
-    <script type="text/javascript" src="http://mapea4-sigc.juntadeandalucia.es/mapea/js/mapea-5.1.0.ol.min.js"></script>
-    <script type="text/javascript" src="http://mapea4-sigc.juntadeandalucia.es/mapea/js/configuration-5.1.0.js"></script>
+    <script type="text/javascript" src="http://mapea4-sigc.juntadeandalucia.es/mapea/js/mapea-6.0.0.ol.min.js"></script>
+    <script type="text/javascript" src="http://mapea4-sigc.juntadeandalucia.es/mapea/js/configuration-6.0.0.js"></script>
     <script type="text/javascript" src="../dist/transparency.ol.min.js"></script>
     <script type="text/javascript">
         const map = M.map({