serve test

gbrits · Aug 23, 2018 · d7ec0cf · d7ec0cf
1 parent beafc3c
commit d7ec0cf
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 41 deletions.
diff --git a/config.xml b/config.xml
@@ -82,8 +82,8 @@
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
     <plugin name="cordova-plugin-ionic-webview" spec="^2.0.2" />
     <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
-    <plugin name="cordova-plugin-googlemaps" spec="/Users/masashi/Documents/workspace2/cordova-plugin-googlemaps">
-        <variable name="API_KEY_FOR_BROWSER" value="AIzaSyBzTWTKaMEeABaeBSa3_E6ZMxseK4xXl4k" />
+    <plugin name="cordova-plugin-googlemaps" spec="https://github.com/mapsplugin/cordova-plugin-googlemaps#experimental">
+        <variable name="API_KEY_FOR_BROWSER" value="AIzaSyBZamoub9SCWL2GriEBRSgLGVVrF0QPakk" />
     </plugin>
     <engine name="android" spec="^7.1.1" />
     <engine name="ios" spec="^4.5.5" />

diff --git a/docs/1.4e6165a9504297a4b5fc.js b/docs/1.4e6165a9504297a4b5fc.js
diff --git a/docs/1.e26deaa5d20f241f53be.js b/docs/1.e26deaa5d20f241f53be.js
diff --git a/docs/config.xml b/docs/config.xml
@@ -20,5 +20,5 @@
     <preference name="SplashShowOnlyFirstTime" value="false" />
     <preference name="SplashScreen" value="assets/imgs/screen.png" />
     <preference name="SplashScreenDelay" value="3000" />
-<preference name="API_KEY_FOR_BROWSER" value="AIzaSyBZamoub9SCWL2GriEBRSgLGVVrF0QPakk" />
+    <preference name="API_KEY_FOR_BROWSER" value="AIzaSyBZamoub9SCWL2GriEBRSgLGVVrF0QPakk" />
 </widget>
diff --git a/docs/cordova_plugins.js b/docs/cordova_plugins.js
@@ -359,11 +359,11 @@ module.exports.metadata =
     "com.googlemaps.ios": "2.7.0",
     "cordova-plugin-device": "2.0.2",
     "cordova-plugin-ionic-keyboard": "2.1.2",
-    "cordova-plugin-ionic-webview": "2.0.2",
+    "cordova-plugin-ionic-webview": "2.0.3",
     "cordova-plugin-splashscreen": "5.0.2",
     "cordova-plugin-statusbar": "2.4.2",
     "cordova-plugin-whitelist": "1.3.3",
-    "cordova-plugin-googlemaps": "2.3.12-ext-20180822-1038"
+    "cordova-plugin-googlemaps": "2.3.12-ext-20180822-1610"
 }
 // BOTTOM OF METADATA
 });
diff --git a/docs/index.html b/docs/index.html
@@ -2,15 +2,15 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>Ionic App</title>
+  <title>@ionic-native/google-maps demo</title>
 
-  <base href="/" />
+  <base href="./" />
 
   <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
   <meta name="format-detection" content="telephone=no">
   <meta name="msapplication-tap-highlight" content="no">
 
-  <link rel="icon" type="image/png" href="assets/icon/favicon.png">
+  <link rel="icon" type="image/png" href="assets/imgs/screen.png">
 
   <!-- add to homescreen for ios -->
   <meta name="apple-mobile-web-app-capable" content="yes">
@@ -19,5 +19,5 @@
 <link rel="stylesheet" href="styles.8e2d0868b92e42ab9e24.css"></head>
 <body>
   <app-root></app-root>
-<script type="text/javascript" src="runtime.6897ff8b8ab2f4fc3ef7.js"></script><script type="text/javascript" src="polyfills.c51286684955b9005cee.js"></script><script type="text/javascript" src="cordova.be00a3c9f5babbb22844.js"></script><script type="text/javascript" src="main.a02fa1faee7b85d41f43.js"></script></body>
+<script type="text/javascript" src="runtime.1adf239fd9191ee56f20.js"></script><script type="text/javascript" src="polyfills.c51286684955b9005cee.js"></script><script type="text/javascript" src="cordova.be00a3c9f5babbb22844.js"></script><script type="text/javascript" src="main.a02fa1faee7b85d41f43.js"></script></body>
 </html>
diff --git a/docs/plugins/cordova-plugin-googlemaps/src/browser/CordovaGoogleMaps.js b/docs/plugins/cordova-plugin-googlemaps/src/browser/CordovaGoogleMaps.js
@@ -37,7 +37,7 @@ document.addEventListener("load_googlemaps", function() {
     //-----------------
     // Read XML file
     //-----------------
-    var xhr = createCORSRequest('GET', '/config.xml', true);
+    var xhr = createCORSRequest('GET', './config.xml', true);
     if (xhr) {
       xhr.onreadystatechange = function() {
         try {

diff --git a/docs/plugins/cordova-plugin-googlemaps/src/browser/PluginKmlOverlay.js b/docs/plugins/cordova-plugin-googlemaps/src/browser/PluginKmlOverlay.js
@@ -1,4 +1,4 @@
-cordova.define("cordova-plugin-googlemaps.PluginKmlOverlay", function(require, exports, module) {
+cordova.define("cordova-plugin-googlemaps.PluginKmlOverlay", function(require, exports, module) { 
 var InlineWorker = require('cordova-plugin-googlemaps.InlineWorker');
 
 function PluginKmlOverlay(pluginMap) {
@@ -18,6 +18,7 @@ PluginKmlOverlay.prototype._create = function(onSuccess, onError, args) {
   //-------------------------------------
   var worker = new InlineWorker(loadKml);
   worker.onmessage = function(evt) {
+    console.log('host message', evt.data);
     worker.terminate();
     onSuccess(evt.data);
   };
@@ -250,6 +251,7 @@ function loadKml(self) {
         // merge attributes and child nodes
         if (typeof attributes === 'object') {
           object = attributes;
+          object.line=198;
         } else {
           object = {};
         }
@@ -267,7 +269,8 @@ function loadKml(self) {
         if ("string" === typeof child) {
           object = {
             'tagName': elem.n,
-            'value': child
+            'value': child,
+            'line': 215
           };
         } else {
           object = toObject(child, reviver);
@@ -276,15 +279,17 @@ function loadKml(self) {
               'tagName': elem.n,
               'value': {
                 'children': [object]
-              }
+              },
+              'line': 227
             };
           }
         }
       } else {
         // the node has no attribute nor child node
         object = {
           'tagName': elem.n,
-          'value': ''
+          'value': '',
+          'line': 233
         };
       }
 
@@ -309,12 +314,14 @@ function loadKml(self) {
       } else {
         object.value.children.push({
           'tagName': key,
-          'value': val
+          'value': val,
+          'line': 258
         });
       }
     }
 
     return function(text, reviver) {
+      text = text.replace(/<\?xml[^>]+>/i, "");
       var xmlTree = parseXML(text);
       var result = toObject(xmlTree, reviver);
       result.tagName = "document";
@@ -495,6 +502,7 @@ function loadKml(self) {
       //-----------------
       // Read XML file
       //-----------------
+console.log(params);
       var xhr = createCORSRequest('GET', params.url, true);
       if (xhr) {
         xhr.onreadystatechange = function() {
@@ -517,8 +525,6 @@ function loadKml(self) {
       //-----------------
       // Parse it
       //-----------------
-      xmlTxt = xmlTxt.replace(/<\?xml[^>]+>/i, "");
-      xmlTxt = xmlTxt.replace(/(<!--).*?(-->)/g, "");
       var doc = fromXML(xmlTxt);
       var parser = new KmlParserClass();
       var root = parser.parseXml(doc);

diff --git a/docs/plugins/cordova-plugin-googlemaps/src/browser/PluginMap.js b/docs/plugins/cordova-plugin-googlemaps/src/browser/PluginMap.js
@@ -1,4 +1,4 @@
-cordova.define("cordova-plugin-googlemaps.PluginMap", function(require, exports, module) {
+cordova.define("cordova-plugin-googlemaps.PluginMap", function(require, exports, module) { 
 
 
 var utils = require('cordova/utils'),
@@ -452,6 +452,8 @@ PluginMap.prototype.setTrafficEnabled = function(onSuccess, onError, args) {
 
 };
 
+
+
 PluginMap.prototype.fromLatLngToPoint = function(onSuccess, onError, args) {
   var self = this;
   var map = self.get("map");

diff --git a/docs/plugins/cordova-plugin-googlemaps/src/browser/PluginMarker.js b/docs/plugins/cordova-plugin-googlemaps/src/browser/PluginMarker.js
@@ -1,6 +1,4 @@
-cordova.define("cordova-plugin-googlemaps.PluginMarker", function(require, exports, module) {
-
-
+cordova.define("cordova-plugin-googlemaps.PluginMarker", function(require, exports, module) { 
 var utils = require('cordova/utils'),
   event = require('cordova-plugin-googlemaps.event'),
   BaseClass = require('cordova-plugin-googlemaps.BaseClass'),

diff --git a/docs/plugins/cordova-plugin-googlemaps/src/browser/PluginStreetViewPanorama.js b/docs/plugins/cordova-plugin-googlemaps/src/browser/PluginStreetViewPanorama.js
@@ -1,4 +1,4 @@
-cordova.define("cordova-plugin-googlemaps.PluginStreetViewPanorama", function(require, exports, module) {
+cordova.define("cordova-plugin-googlemaps.PluginStreetViewPanorama", function(require, exports, module) { 
 var utils = require('cordova/utils'),
   event = require('cordova-plugin-googlemaps.event'),
   BaseClass = require('cordova-plugin-googlemaps.BaseClass'),

diff --git a/docs/plugins/cordova-plugin-googlemaps/www/BaseClass.js b/docs/plugins/cordova-plugin-googlemaps/www/BaseClass.js
@@ -62,9 +62,6 @@ BaseClass.prototype = {
     var listeners = this[SUBSCRIPTIONS_FIELD][eventName];
     var i = listeners.length;
     var args = Array.prototype.slice.call(arguments, 1);
-    listeners = listeners.filter(function(listener) {
-      return !!listener;
-    });
 
     while (i--) {
       listeners[i].apply(this, args);

diff --git a/docs/plugins/cordova-plugin-googlemaps/www/HtmlInfoWindow.js b/docs/plugins/cordova-plugin-googlemaps/www/HtmlInfoWindow.js
@@ -1,4 +1,4 @@
-cordova.define("cordova-plugin-googlemaps.HtmlInfoWindow", function(require, exports, module) {
+cordova.define("cordova-plugin-googlemaps.HtmlInfoWindow", function(require, exports, module) { 
  var utils = require('cordova/utils'),
   event = require('./event'),
   common = require('./Common'),
@@ -337,6 +337,7 @@ var HTMLInfoWindow = function () {
   };
 
   self._hook.on(self, "infoPosition_changed", function (ignore, point) {
+    if (!point) return;
     var x = point.x + self.get("offsetX");
     var y = point.y + self.get("offsetY");
     anchorDiv.style['-webkit-transform'] = "translate3d(" + x + "px, " + y + "px, 0px)";

diff --git a/docs/plugins/cordova-plugin-googlemaps/www/KmlLoader.js b/docs/plugins/cordova-plugin-googlemaps/www/KmlLoader.js
@@ -58,9 +58,7 @@ KmlLoader.prototype.parseKmlFile = function(callback) {
   var self = this;
 
   self.exec.call(self.map, function(kmlData) {
-    // debug
-    // console.log(JSON.parse(JSON.stringify(kmlData)));
-
+    var rawKmlData = JSON.parse(JSON.stringify(kmlData));
     Object.defineProperty(self, "kmlStyles", {
       value: kmlData.styles,
       writable: false
@@ -84,6 +82,7 @@ KmlLoader.prototype.parseKmlFile = function(callback) {
         return !!overlay;
       });
       var result = placeMarkOverlays.shift();
+      //result.set('kmlData', rawKmlData);
       callback.call(self, self.camera, result);
     });
   }, self.map.errorHandler, self.map.id, 'loadPlugin', ['KmlOverlay', {

diff --git a/docs/plugins/cordova-plugin-googlemaps/www/KmlOverlay.js b/docs/plugins/cordova-plugin-googlemaps/www/KmlOverlay.js
@@ -182,9 +182,7 @@ var KmlOverlay = function(map, kmlId, camera, kmlData, kmlOverlayOptions) {
         styles = parseBalloonStyle(overlay.get("balloonstyle"));
       }
       styles = styles || {};
-      if (cordova.platformId !== 'browser') {
-        styles.overflow = "scroll";
-      }
+      styles.overflow = "scroll";
       styles["max-width"] = (map.getDiv().offsetWidth * 0.8) + "px";
       styles["max-height"] = (map.getDiv().offsetHeight * 0.6) + "px";
 

diff --git a/docs/plugins/cordova-plugin-googlemaps/www/Map.js b/docs/plugins/cordova-plugin-googlemaps/www/Map.js
@@ -1,4 +1,4 @@
-cordova.define("cordova-plugin-googlemaps.Map", function(require, exports, module) {
+cordova.define("cordova-plugin-googlemaps.Map", function(require, exports, module) { 
 var utils = require('cordova/utils'),
   cordova_exec = require('cordova/exec'),
   common = require('./Common'),
@@ -1019,7 +1019,6 @@ Map.prototype.addKmlOverlay = function(kmlOverlayOptions, callback) {
 };
 
 
-
 //-------------
 // Ground overlay
 //-------------

diff --git a/docs/plugins/cordova-plugin-googlemaps/www/js_CordovaGoogleMaps-for-browser.js b/docs/plugins/cordova-plugin-googlemaps/www/js_CordovaGoogleMaps-for-browser.js
@@ -1,4 +1,4 @@
-cordova.define("cordova-plugin-googlemaps.js_CordovaGoogleMaps", function(require, exports, module) {
+cordova.define("cordova-plugin-googlemaps.js_CordovaGoogleMaps", function(require, exports, module) { 
 
 var utils = require('cordova/utils'),
   common = require('cordova-plugin-googlemaps.Common'),