Merge branch 'masashi_dev2' of github.com:wf9a5m75/phonegap-googlemaps-plugin into masashi_dev2

Author: wf9a5m75

README.md

@@ -8,12 +8,12 @@ Both [PhoneGap](http://phonegap.com/) and [Apache Cordova](http://cordova.apache
 
 
 ###Example
-You can see an example here. [phonegap-googlemaps-plugin-v1.2.2.apk](http://goo.gl/EJ67sm)
+You can see an example here. [phonegap-googlemaps-plugin-v1.2.5.apk](https://googledrive.com/host/0B1ECfqTCcLE8TXlUQUJXMmJpNGs/phonegap-googlemaps-plugin-v1.2.5.apk)
 ```bash
-$> adb install phonegap-googlemaps-plugin-v1.2.2.apk
+$> adb install phonegap-googlemaps-plugin-v1.2.5.apk
 ```
 
-![image](https://googledrive.com/host/0B1ECfqTCcLE8ZVQ1djlWNThISEE/example-v1.2.0_v2.gif)
+![image](https://googledrive.com/host/0B1ECfqTCcLE8ZVQ1djlWNThISEE/example-v1.2.5.gif)
 
 ### Join the official community
 New versions will be announced through the official community. Stay tuned!
@@ -22,8 +22,16 @@ New versions will be announced through the official community. Stay tuned!
 
 ###What's up?
 
-v1.2.4
-- Bug fixes
+v1.2.5
+- Add : The `opacity` and `tileSize` properties has been added to `map.addTileOverlay()`
+- Add : Add marker animations: `DROP` and `BOUNCE`
+- Add : Add INDOOR_BUILDING_FOCUSED & INDOOR_LEVEL_ACTIVATED events for indoor map events.
+- Add plugin.google.maps.geometry.encoding.decodePath() & plugin.google.maps.geometry.encoding.encodePath()
+- Update : v1.2.5 uses Google Play Services version 23.
+- Added settings for watchdogtimer / complete rewrite of remote marker downloads
+- The `icon` property of the `map.addMarker()` accepts `file://` & `cdvfile://` protocol, and also the absolute file path.
+- Loading KML files from `file://` & `cdvfile://` protocol.
+- And many bugs are fixed.
 
 Check out the [release notes](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/wiki/Release-Notes).
 
@@ -46,7 +54,7 @@ Check out the [release notes](https://github.com/wf9a5m75/phonegap-googlemaps-pl
     * [How to upgrade the Google Maps SDK for iOS to the latest version?](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/wiki/How-to-upgrade-the-Google-Maps-SDK-for-iOS-to-the-latest-version%3F)
 * [Terms of Services](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/wiki/Terms-of-Services)
 * [Map](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/wiki/Map)
-  * ![img](https://raw.github.com/wf9a5m75/phonegap-googlemaps-plugin/Images/screencapture/animateCamera.gif) 
+  * ![img](https://raw.github.com/wf9a5m75/phonegap-googlemaps-plugin/Images/screencapture/animateCamera.gif)
   * Create a map
   * Create a map with initialize options
   * Change the map type
@@ -56,7 +64,7 @@ Check out the [release notes](https://github.com/wf9a5m75/phonegap-googlemaps-pl
   * Get my location
   * Map Class Reference
 * [Marker](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/wiki/Marker)
-  * ![img](https://googledrive.com/host/0B1ECfqTCcLE8LUxUWmhsQmgxVVU/marker5.gif) 
+  * ![img](https://googledrive.com/host/0B1ECfqTCcLE8LUxUWmhsQmgxVVU/marker5.gif)
   * Add a Marker
   * Show InfoWindow
   * Add a marker with multiple line
@@ -114,14 +122,14 @@ Check out the [release notes](https://github.com/wf9a5m75/phonegap-googlemaps-pl
 * [Location](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/wiki/Location)
   * Location Class Reference
 * [Geocoder](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/wiki/Geocoder)
-  * <img src="https://googledrive.com/host/0B1ECfqTCcLE8MU1CbUtNVUs3TEE/geocoding.gif" height="250"> 
+  * <img src="https://googledrive.com/host/0B1ECfqTCcLE8MU1CbUtNVUs3TEE/geocoding.gif" height="250">
   * Geocoding
   * Reverse geocoding
   * Geocoder Class Reference
 * [BaseClass](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/wiki/BaseClass)
   * BaseClass Reference
 * [External Service](https://github.com/wf9a5m75/phonegap-googlemaps-plugin/wiki/External-Service)
-  * <img src="https://googledrive.com/host/0B1ECfqTCcLE8MU1CbUtNVUs3TEE/direction.gif" height="250"> 
+  * <img src="https://googledrive.com/host/0B1ECfqTCcLE8MU1CbUtNVUs3TEE/direction.gif" height="250">
   * Launch the navigation application
 
 

example/DemoApp2/www/css/app.css

@@ -0,0 +1,45 @@
+html, body, #map_canvas {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  left: 0;
+  top: 0;
+}
+pre.prettyprint {
+  display: block;
+  background-color: rgba(200, 200, 200, 0.75);
+}
+button {
+  position: fixed;
+  border: 0 none #ffffff;
+  background-color: #4285F4;
+  border-radius: 3px;
+  left: 10%;
+  color: white;
+  bottom: 10%;
+  width: 80%;
+  height: 10%;
+  z-index: 2;
+  font-size: 150%;
+}
+.container {
+  position: fixed;
+  left: 5%;
+  top: 5%; 
+  right: 5%;
+  background-color: rgba(255, 255, 255, .7);
+  border:1px solid black;
+  padding: 1%;
+  font-size: 150%;
+  display: inline-block;
+  overflow: scroll;
+}
+
+button#nextBtn {
+  display: none;
+}
+strong {
+  font-size: 150%;
+  font-weight: bold;
+}

example/DemoApp2/www/index.html

@@ -6,56 +6,14 @@
     <title>Google Maps Plugin for Cordova</title>
     <link rel="stylesheet" type="text/css" href="css/animate.css" />
     <link href="css/prettify.css" type="text/css" rel="stylesheet" />
+    <link href="css/app.css" type="text/css" rel="stylesheet" />
     <script type="text/javascript" src="cordova.js"></script>
     <script type="text/javascript" src="js/prettify.js"></script>
     <script type="text/javascript" src="js/jquery.min.js"></script>
+    <script type="text/javascript" src="js/jquery.fittext.js"></script>
     <script type="text/javascript" src="js/example.js"></script>
-    <style type="text/css">
-    html, body, #map_canvas {
-      width: 100%;
-      height: 100%;
-      margin: 0;
-      padding: 0;
-      position: absolute;
-      left: 0;
-      top: 0;
-    }
-    pre.prettyprint {
-      display: block;
-      overflow: scroll;
-      position: absolute;
-      left: 2%;
-      right: 2%;
-      bottom: 15%;
-      top: 20%;
-      background-color: rgba(200, 200, 200, 0.75);
-    }
-    button {
-      position: fixed;
-      border: 0 none #ffffff;
-      background-color: #4285F4;
-      border-radius: 3px;
-      left: 10%;
-      right: 10%;
-      height: 10%;
-      color: white;
-      bottom: 10%;
-    }
-    .container {
-      position: fixed;
-      left: 5%;
-      top: 5%;
-      bottom: 5%;
-      right: 5%;
-      background-color: rgba(255, 255, 255, .7);
-      border:1px solid black;
-      overflow: hidden;
-      padding: 1% 1% 15% 1%;
-      display: scroll;
-    }
-    </style>
   </head>
   <body>
     <div id="map_canvas" ></div>
   </body>
-</html>
+</html>