Skip to content

Commit

Permalink
Merge pull request #25 from sigcorporativo-ja/develop
Browse files Browse the repository at this point in the history
Update Mapea v6.5.0 and Ionic v7.7.1
  • Loading branch information
alb-martinez authored Feb 15, 2024
2 parents 41b8f30 + 260add4 commit 4442e5a
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 111 deletions.
10 changes: 5 additions & 5 deletions lib/configuration-6.3.1.js → lib/configuration-6.5.0.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Mapea API
* Version 6.3.1
* Date 20-01-2023
* Version 6.5.0
* Date 23-01-2024
*/
(function(M) {
/**
Expand Down Expand Up @@ -137,7 +137,7 @@
* @public
* @api stable
*/
'urls': 'https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/mapa.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/hibrido.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/satelite.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/context_cdau_callejero.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/context_cdau_hibrido.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/context_cdau_satelite.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/contextCallejeroCache.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/contextCallejero.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/contextIDEA.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/contextOrtofoto2009.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/callejero2011cache.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/ortofoto2011cache.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/hibrido2011cache.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/contextOrtofoto.xml'.split(',').map(e => e),
'urls': 'https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/mapa.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/hibrido.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/satelite.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/context_cdau_callejero.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/context_cdau_hibrido.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/context_cdau_satelite.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/contextCallejeroCache.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/contextCallejero.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/callejero2011cache.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/ortofoto2011cache.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/hibrido2011cache.xml,https://mapea4-sigc.juntadeandalucia.es/mapea/files/wmc/contextOrtofoto.xml'.split(',').map(e => e),

/**
* WMC predefined names
Expand All @@ -146,7 +146,7 @@
* @public
* @api stable
*/
'predefinedNames': 'mapa,hibrido,satelite,cdau,cdau_hibrido,cdau_satelite,callejerocacheado,callejero,idea,ortofoto09,callejero2011cache,ortofoto2011cache,hibrido2011cache,ortofoto'.split(','),
'predefinedNames': 'mapa,hibrido,satelite,cdau,cdau_hibrido,cdau_satelite,callejerocacheado,callejero,callejero2011cache,ortofoto2011cache,hibrido2011cache,ortofoto'.split(','),

/**
* WMC context names
Expand All @@ -155,7 +155,7 @@
* @public
* @api stable
*/
'names': 'Mapa,Hibrido,Satelite,Callejero,Hibrido,Satelite,mapa callejero cache,mapa del callejero,mapa idea,mapa ortofoto09,Callejero,Ortofoto,Híbrido,mapa ortofoto'.split(',')
'names': 'Mapa,Hibrido,Satelite,Callejero,Hibrido,Satelite,mapa callejero cache,mapa del callejero,Callejero,Ortofoto,Híbrido,mapa ortofoto'.split(',')
});

/**
Expand Down
1 change: 0 additions & 1 deletion lib/mapea-6.3.1.ol.min.css

This file was deleted.

99 changes: 0 additions & 99 deletions lib/mapea-6.3.1.ol.min.js

This file was deleted.

2 changes: 2 additions & 0 deletions lib/mapea-6.5.0.ol.min.css

Large diffs are not rendered by default.

92 changes: 92 additions & 0 deletions lib/mapea-6.5.0.ol.min.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="https://cdn.jsdelivr.net/npm/@ionic/core@7.6.3/css/ionic.bundle.css" rel="stylesheet" />
<link type="text/css" rel="stylesheet" href="../lib/mapea-6.4.0.ol.min.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/npm/@ionic/core@7.7.1/css/ionic.bundle.css" rel="stylesheet" />
<link type="text/css" rel="stylesheet" href="../lib/mapea-6.5.0.ol.min.css" rel="stylesheet" />
<style>
/* fix mapea styles bugs */
.m-scale-container {
Expand Down Expand Up @@ -80,10 +80,10 @@
</ion-app>
<ion-menu-controller></ion-menu-controller>
<script type="text/javascript" src="cordova.js"></script>
<script type="module" src="https://cdn.jsdelivr.net/npm/@ionic/core@7.6.3/dist/ionic/ionic.esm.js"></script>
<script nomodule src="https://cdn.jsdelivr.net/npm/@ionic/core@7.6.3/dist/ionic/ionic.js"></script>
<script type="text/javascript" src="../lib/mapea-6.4.0.ol.min.js"></script>
<script type="text/javascript" src="../lib/configuration-6.4.0.js"></script>
<script type="module" src="https://cdn.jsdelivr.net/npm/@ionic/core@7.7.1/dist/ionic/ionic.esm.js"></script>
<script nomodule src="https://cdn.jsdelivr.net/npm/@ionic/core@7.7.1/dist/ionic/ionic.js"></script>
<script type="text/javascript" src="../lib/mapea-6.5.0.ol.min.js"></script>
<script type="text/javascript" src="../lib/configuration-6.5.0.js"></script>
<script></script>
</body>

Expand Down

0 comments on commit 4442e5a

Please sign in to comment.