flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject git commit: [flex-asjs] [refs/heads/core_js_to_as] - Work in progress for GoogleMaps.
Date Mon, 14 Dec 2015 21:59:24 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/core_js_to_as 5f4274856 -> f5ec157c6


Work in progress for GoogleMaps.


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f5ec157c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f5ec157c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f5ec157c

Branch: refs/heads/core_js_to_as
Commit: f5ec157c60c29a24110f419f4530add714888275
Parents: 5f42748
Author: Peter Ent <pent@apache.org>
Authored: Mon Dec 14 16:59:20 2015 -0500
Committer: Peter Ent <pent@apache.org>
Committed: Mon Dec 14 16:59:20 2015 -0500

----------------------------------------------------------------------
 examples/flexjs/MapSearch/build.xml             |   4 +-
 .../flexjs/MapSearch/src/MyInitialView.mxml     |  15 +-
 .../projects/GoogleMaps/compile-asjs-config.xml |  10 +-
 .../projects/GoogleMaps/compile-config.xml      |   4 -
 .../projects/GoogleMaps/google-manifest.xml     |   2 +-
 .../src/org/apache/flex/maps/google/Geometry.js |  50 ---
 .../src/org/apache/flex/maps/google/LatLng.js   |  53 ---
 .../js/src/org/apache/flex/maps/google/Map.js   | 360 -------------------
 .../src/org/apache/flex/maps/google/Marker.js   |  63 ----
 .../js/src/org/apache/flex/maps/google/Place.js |  93 -----
 .../apache/flex/maps/google/beads/MapView.js    |  67 ----
 .../apache/flex/maps/google/models/MapModel.js  | 108 ------
 12 files changed, 18 insertions(+), 811 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/examples/flexjs/MapSearch/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/build.xml b/examples/flexjs/MapSearch/build.xml
index 9516e96..77f0596 100644
--- a/examples/flexjs/MapSearch/build.xml
+++ b/examples/flexjs/MapSearch/build.xml
@@ -62,6 +62,8 @@
     
     <property name="AIR_HOME" value="${env.AIR_HOME}"/>
     
+    <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
+    
     
     <condition property="adl" value="adl.exe">
         <os family="windows"/>
@@ -81,7 +83,7 @@
 
     <include file="${basedir}/../../build_example.xml" />
 
-    <target name="main" depends="clean,build_example.compileair,build_example.compilejsair"
description="Clean build of ${example}">
+    <target name="main" depends="clean,build_example.compilejsair" description="Clean
build of ${example}">
     </target>
     
     <target name="clean">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/examples/flexjs/MapSearch/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/src/MyInitialView.mxml b/examples/flexjs/MapSearch/src/MyInitialView.mxml
index 3199f1e..bf302fa 100644
--- a/examples/flexjs/MapSearch/src/MyInitialView.mxml
+++ b/examples/flexjs/MapSearch/src/MyInitialView.mxml
@@ -24,12 +24,11 @@ limitations under the License.
 				initComplete="initControls()">
 	<fx:Script>
 		<![CDATA[		
-			import org.apache.flex.maps.google.models.MapModel;
-			import models.MyModel;
-			
+			import models.MyModel;			
 			import org.apache.flex.events.Event;
-			import org.apache.flex.maps.google.Place;
-			import org.apache.flex.maps.google.Marker;
+			
+			import google.maps.places.PlaceResult;
+			import google.maps.Marker;
 			
 			private function initControls() : void
 			{
@@ -102,7 +101,7 @@ limitations under the License.
 			 */
 			private function onSearchResults(event:org.apache.flex.events.Event):void
 			{
-				var searchResults:Array = MapModel(map.model).searchResults;
+				var searchResults:Array = map.searchResults;
 				MyModel(applicationModel).searchResults = searchResults;
 			}
 			
@@ -115,7 +114,7 @@ limitations under the License.
 			{
 				var marker:Marker = map.selectedMarker;
 				map.setZoom(12);
-				map.setCenter(marker.position);
+				map.setCenter(marker.getPosition());
 			}
 			
 		]]>
@@ -183,7 +182,7 @@ limitations under the License.
 								dataProvider="{MyModel(applicationModel).cities}" />
 		</js:Container>
 		
-		<google:Map id="map" width="450" height="300" className="MainMap"
+		<google:GoogleMap id="map" width="450" height="300" className="MainMap"
 				   token="AIzaSyDkQgg2iojLCYeuW6hK7DkuAHD-SwJJhdE" 
 				   ready="onMapReady()"/>
 		

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/compile-asjs-config.xml b/frameworks/projects/GoogleMaps/compile-asjs-config.xml
index eba22e4..e17db6a 100644
--- a/frameworks/projects/GoogleMaps/compile-asjs-config.xml
+++ b/frameworks/projects/GoogleMaps/compile-asjs-config.xml
@@ -21,9 +21,6 @@
     <compiler>
         <accessible>false</accessible>
         
-        <external-library-path>
-            <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
-        </external-library-path>
         
 		<mxml>
 			<children-as-data>true</children-as-data>
@@ -49,6 +46,13 @@
             <path-element>../../externs/Core.swc</path-element>
         </library-path>
         
+        <namespaces>
+            <namespace>
+                <uri>library://ns.apache.org/flexjs/google</uri>
+                <manifest>google-manifest.xml</manifest>
+            </namespace>
+        </namespaces>
+        
         <source-path>
             <path-element>as/src</path-element>
         </source-path>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/compile-config.xml b/frameworks/projects/GoogleMaps/compile-config.xml
index eb300fe..243f679 100644
--- a/frameworks/projects/GoogleMaps/compile-config.xml
+++ b/frameworks/projects/GoogleMaps/compile-config.xml
@@ -64,10 +64,6 @@
         <name>defaults.css</name>
         <path>as/defaults.css</path>
     </include-file>
-    <include-file>
-        <name>js/src/*</name>
-        <path>js/src/*</path>
-    </include-file>
 
     <include-classes>
         <class>GoogleMapsClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/google-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/google-manifest.xml b/frameworks/projects/GoogleMaps/google-manifest.xml
index f843c0c..a9138df 100644
--- a/frameworks/projects/GoogleMaps/google-manifest.xml
+++ b/frameworks/projects/GoogleMaps/google-manifest.xml
@@ -20,5 +20,5 @@
 
 
 <componentPackage>
-    <component id="Map" class="org.apache.flex.maps.google.GoogleMap" />
+    <component id="GoogleMap" class="org.apache.flex.maps.google.GoogleMap" />
 </componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Geometry.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Geometry.js
b/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Geometry.js
deleted file mode 100644
index 2ee1201..0000000
--- a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Geometry.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.maps.google.Geometry');
-
-goog.require('org.apache.flex.maps.google.LatLng');
-
-
-// IMPORTANT:
-// In order to use this class, the Google MAP API must be downloaded
-// from the <head> section of the main HTML file.
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.maps.google.Geometry = function() {
-  this.location = new org.apache.flex.maps.google.LatLng();
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.maps.google.Geometry.prototype.
-FLEXJS_CLASS_INFO =
-{ names: [{ name: 'Geometry',
-           qName: 'org.apache.flex.maps.google.Geometry' }],
-    interfaces: [] };
-
-
-/**
- * @type {Object} The current location
- */
-org.apache.flex.maps.google.Geometry.prototype.location = null;
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/LatLng.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/LatLng.js b/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/LatLng.js
deleted file mode 100644
index 23fac04..0000000
--- a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/LatLng.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.maps.google.LatLng');
-
-
-// IMPORTANT:
-// In order to use this class, the Google MAP API must be downloaded
-// from the <head> section of the main HTML file.
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.maps.google.LatLng = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.maps.google.LatLng.prototype.
-FLEXJS_CLASS_INFO =
-{ names: [{ name: 'LatLng',
-           qName: 'org.apache.flex.maps.google.LatLng' }],
-    interfaces: [] };
-
-
-/**
- * @type {number} The latitude
- */
-org.apache.flex.maps.google.LatLng.prototype.lat = 0;
-
-
-/**
- * @type {number} The longitude
- */
-org.apache.flex.maps.google.LatLng.prototype.lng = 0;
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Map.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Map.js b/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Map.js
deleted file mode 100644
index c53abd5..0000000
--- a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Map.js
+++ /dev/null
@@ -1,360 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.maps.google.Map');
-
-goog.require('org.apache.flex.core.IBeadModel');
-goog.require('org.apache.flex.maps.google.Geometry');
-goog.require('org.apache.flex.maps.google.LatLng');
-goog.require('org.apache.flex.maps.google.Marker');
-goog.require('org.apache.flex.maps.google.Place');
-goog.require('org.apache.flex.maps.google.models.MapModel');
-
-
-// IMPORTANT:
-// In order to use this class, the Google MAP API must be downloaded
-// from the <head> section of the main HTML file.
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.maps.google.Map = function() {
-  org.apache.flex.maps.google.Map.base(this, 'constructor');
-  this.initialized = false;
-};
-goog.inherits(org.apache.flex.maps.google.Map,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.maps.google.Map.prototype.
-FLEXJS_CLASS_INFO =
-{ names: [{ name: 'Map',
-           qName: 'org.apache.flex.maps.google.Map' }],
-    interfaces: [] };
-
-
-/**
- *
- */
-org.apache.flex.maps.google.Map.prototype.searchResults = null;
-
-
-/**
- * @private
- */
-org.apache.flex.maps.google.Map.prototype.token_ = null;
-
-
-/**
- * @override
- * @protected
- * @return {Object} The actual element to be parented.
- */
-org.apache.flex.maps.google.Map.prototype.createElement =
-    function() {
-
-  var model = new org.apache.flex.maps.google.models.MapModel();
-  this.addBead(model);
-
-  this.element = document.createElement('div');
-  this.className = 'Map';
-
-  this.positioner = this.element;
-  this.positioner.style.position = 'relative';
-  this.element.flexjs_wrapper = this;
-
-  return this.element;
-};
-
-
-Object.defineProperties(org.apache.flex.maps.google.Map.prototype, {
-    /** @export */
-    token: {
-        /** @this {org.apache.flex.maps.google.Map} */
-        set: function(value) {
-            this.token_ = value;
-        },
-        /** @this {org.apache.flex.maps.google.Map} */
-        get: function() {
-            return this.token_;
-        }
-    },
-    /** @export */
-    selectedMarker: {
-        /** @this {org.apache.flex.maps.google.Map} */
-        get: function() {
-            return this._selectedMarker;
-        }
-    }
-});
-
-
-/**
- */
-org.apache.flex.maps.google.Map.prototype.finishInitalization = function() {
-  this.loadMap(37.333, -121.900, 12);
-  this.initialized = true;
-  this.dispatchEvent('ready');
-};
-
-
-/**
- * @export
- * @param {number} centerLat center latitude.
- * @param {number} centerLong center longitude.
- * @param {number} zoom zoom level.
- */
-org.apache.flex.maps.google.Map.prototype.loadMap =
-    function(centerLat, centerLong, zoom) {
-  if (!this.initialized) {
-    this.currentCenter = new window['google']['maps']['LatLng'](centerLat, centerLong);
-    var mapOptions = {};
-    mapOptions['center'] = this.currentCenter;
-    mapOptions['zoom'] = zoom;
-    this.map = new window['google']['maps']['Map'](this.element, mapOptions);
-    this.geocoder = null;
-    google.maps.event.addListener(this.map, 'center_changed', goog.bind(this.centerChangeHandler,
this));
-    google.maps.event.addListener(this.map, 'bounds_changed', goog.bind(this.boundsChangeHandler,
this));
-    google.maps.event.addListener(this.map, 'zoom_changed', goog.bind(this.zoomChangeHandler,
this));
-  }
-};
-
-
-/**
- * @export
- * @param {Number} zoomLevel The level of magnification.
- */
-org.apache.flex.maps.google.Map.prototype.setZoom =
-    function(zoomLevel) {
-  if (this.initialized) {
-    this.map.setZoom(zoomLevel);
-  }
-};
-
-
-/**
- * @export
- * @param {string} address The new center of the map.
- */
-org.apache.flex.maps.google.Map.prototype.centerOnAddress = function(address) {
-  if (!this.geocoder) this.geocoder = new window['google']['maps']['Geocoder']();
-  this.geocoder.geocode({ 'address': address}, goog.bind(this.positionHandler, this));
-};
-
-
-/**
- * @export
- * @param {Object} location The new center of the map.
- */
-org.apache.flex.maps.google.Map.prototype.setCenter = function(location) {
-  this.currentCenter = new window['google']['maps']['LatLng'](location.lat, location.lng);
-  this.map.setCenter(this.currentCenter);
-};
-
-
-/**
- * @export
- */
-org.apache.flex.maps.google.Map.prototype.markCurrentLocation = function() {
-  this.createMarker(this.currentCenter);
-};
-
-
-/**
- * @export
- * @param {string} address The address to locate and mark on the map.
- */
-org.apache.flex.maps.google.Map.prototype.markAddress =
-    function(address) {
-  if (this.initialized) {
-    if (!this.geocoder) this.geocoder = new window['google']['maps']['Geocoder']();
-    this.geocoder.geocode({ 'address': address}, goog.bind(this.geoCodeHandler, this));
-  }
-};
-
-
-/**
- * @export
- * @param {Object} location A LatLng that denotes the position of the marker.
- * @return {Object} A marker object.
- */
-org.apache.flex.maps.google.Map.prototype.createMarker =
-    function(location) {
-  var marker = new window['google']['maps']['Marker']({
-    map: this.map,
-    position: location
-  });
-  google.maps.event.addListener(marker, 'click', goog.bind(this.markerClicked, this, marker));
-  return marker;
-};
-
-
-/**
- * @export
- * @param {string} placeName A place to search for.
- */
-org.apache.flex.maps.google.Map.prototype.nearbySearch =
-    function(placeName) {
-  if (this.markers == null) this.markers = [];
-  this.service = new window['google']['maps']['places']['PlacesService'](this.map);
-  this.service.nearbySearch({'location': this.currentCenter,
-    'radius': 5000,
-    'name': placeName}, goog.bind(this.searchResultHandler, this));
-};
-
-
-/**
- * @export
- */
-org.apache.flex.maps.google.Map.prototype.clearSearchResults =
-function() {
-  if (this.markers) {
-    for (var i = 0; i < this.markers.length; i++) {
-      this.markers[i]['setMap'](null);
-    }
-    this.markers = null;
-  }
-};
-
-
-/**
- * @param {Object} marker The marker that was clicked.
- * @param {Object} event The mouse event for the marker click.
- */
-org.apache.flex.maps.google.Map.prototype.markerClicked =
-function(marker, event) {
-  var newMarker = new org.apache.flex.maps.google.Marker();
-  newMarker.position.lat = marker.position.lat();
-  newMarker.position.lng = marker.position.lng();
-  newMarker.title = marker.title;
-  newMarker.map = this;
-
-  this._selectedMarker = newMarker;
-
-  var newEvent = new org.apache.flex.events.Event('markerClicked');
-  newEvent.marker = newMarker;
-  this.dispatchEvent(newEvent);
-};
-
-
-/**
- * @param {Array} results The found location(s).
- * @param {string} status Status of the call.
- */
-org.apache.flex.maps.google.Map.prototype.positionHandler =
-    function(results, status) {
-  if (status == window['google']['maps']['GeocoderStatus']['OK']) {
-    this.currentCenter = results[0]['geometry']['location'];
-    this.map['setCenter'](this.currentCenter);
-
-    var newEvent = document.createEvent('Event');
-    newEvent.initEvent('mapCentered', true, true);
-    window.dispatchEvent(newEvent);
-  } else {
-    alert('Geocode was not successful for the following reason: ' + status);
-  }
-};
-
-
-/**
- * @param {Array} results The found location(s).
- * @param {string} status Status of the call.
- */
-org.apache.flex.maps.google.Map.prototype.geoCodeHandler =
-    function(results, status) {
-  if (status == window['google']['maps']['GeocoderStatus']['OK']) {
-    this.currentCenter = results[0]['geometry']['location'];
-    this.map['setCenter'](this.currentCenter);
-    var marker = new window['google']['maps']['Marker']({
-      map: this.map,
-      position: this.currentCenter
-    });
-  } else {
-    alert('Geocode was not successful for the following reason: ' + status);
-  }
-};
-
-
-/**
- * @param {Array} results The result of the search.
- * @param {string} status Status of the search.
- */
-org.apache.flex.maps.google.Map.prototype.searchResultHandler =
-function(results, status) {
-  this.searchResults = [];
-  if (status == window['google']['maps']['places']['PlacesServiceStatus']['OK']) {
-    for (var i = 0; i < results.length; i++) {
-      var place = new org.apache.flex.maps.google.Place();
-      place.geometry.location.lat = results[i]['geometry']['location']['lat'];
-      place.geometry.location.lng = results[i]['geometry']['location']['lng'];
-      place.icon = results[i]['icon'];
-      place.id = results[i]['id'];
-      place.name = results[i]['name'];
-      place.reference = results[i]['reference'];
-      place.vicinity = results[i]['vicinity'];
-      this.searchResults.push(place);
-
-      var marker = this.createMarker(results[i]['geometry']['location']);
-      marker.title = place.name;
-
-      this.markers.push(marker);
-    }
-    var model = this.model;
-    model.searchResults = this.searchResults;
-  }
-};
-
-
-/**
- * Handles changes in map center
- */
-org.apache.flex.maps.google.Map.prototype.centerChangeHandler =
-    function() {
-  this.currentCenter = this.map['getCenter']();
-
-  var newEvent = new org.apache.flex.events.Event('centered');
-  this.dispatchEvent(newEvent);
-};
-
-
-/**
- * Handles changes in map bounds
- */
-org.apache.flex.maps.google.Map.prototype.boundsChangeHandler =
-    function() {
-  this.currentCenter = this.map['getCenter']();
-
-  var newEvent = new org.apache.flex.events.Event('boundsChanged');
-  this.dispatchEvent(newEvent);
-};
-
-
-/**
- * Handles changes in map bounds
- */
-org.apache.flex.maps.google.Map.prototype.zoomChangeHandler =
-    function() {
-  this.currentCenter = this.map['getCenter']();
-
-  var newEvent = new org.apache.flex.events.Event('zoomChanged');
-  this.dispatchEvent(newEvent);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Marker.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Marker.js b/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Marker.js
deleted file mode 100644
index 1332b24..0000000
--- a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Marker.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.maps.google.Marker');
-
-goog.require('org.apache.flex.maps.google.LatLng');
-
-
-
-// IMPORTANT:
-// In order to use this class, the Google MAP API must be downloaded
-// from the <head> section of the main HTML file.
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.maps.google.Marker = function() {
-  this.position = new org.apache.flex.maps.google.LatLng();
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.maps.google.Marker.prototype.
-FLEXJS_CLASS_INFO =
-{ names: [{ name: 'Marker',
-           qName: 'org.apache.flex.maps.google.Marker' }],
-    interfaces: [] };
-
-
-/**
- * @type {Object} The marker's location.
- */
-org.apache.flex.maps.google.Marker.prototype.position = null;
-
-
-/**
- * @type {String} The title for the marker.
- */
-org.apache.flex.maps.google.Marker.prototype.title = null;
-
-
-/**
- * @type {Object} The map to which the marker belongs.
- */
-org.apache.flex.maps.google.Marker.prototype.map = null;
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Place.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Place.js b/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Place.js
deleted file mode 100644
index 9014958..0000000
--- a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/Place.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.maps.google.Place');
-
-goog.require('org.apache.flex.maps.google.Geometry');
-
-
-// IMPORTANT:
-// In order to use this class, the Google MAP API must be downloaded
-// from the <head> section of the main HTML file.
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.maps.google.Place = function() {
-  this.geometry = new org.apache.flex.maps.google.Geometry();
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.maps.google.Place.prototype.
-FLEXJS_CLASS_INFO =
-{ names: [{ name: 'Place',
-           qName: 'org.apache.flex.maps.google.Place' }],
-    interfaces: [] };
-
-
-/**
- * @type {Object} The current location
- */
-org.apache.flex.maps.google.Place.prototype.geometry = null;
-
-
-/**
- * @type {String} The icon representing the place.
- */
-org.apache.flex.maps.google.Place.prototype.icon = null;
-
-
-/**
- * @type {String} A unique identifier for the place.
- */
-org.apache.flex.maps.google.Place.prototype.id = null;
-
-
-/**
- * @type {string} The name of the place.
- */
-org.apache.flex.maps.google.Place.prototype.name = '';
-
-
-/**
- * @type {string} A reference identifier.
- */
-org.apache.flex.maps.google.Place.prototype.reference = '';
-
-
-/**
- * @type {string} A description of the area of the place.
- */
-org.apache.flex.maps.google.Place.prototype.vicinity = '';
-
-
-/**
- * @override
- * @return {string} A description of the area of the place.
- */
-org.apache.flex.maps.google.Place.prototype.toString = function PlaceToString() {
-  /** @type {string} The result of the function call. */
-  var results = '';
-  if (this.name) results = this.name;
-  if (this.vicinity) results += ' ' + this.vicinity;
-  return results;
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/beads/MapView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/beads/MapView.js
b/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/beads/MapView.js
deleted file mode 100644
index dbb7ecb..0000000
--- a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/beads/MapView.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* MapView isn't really the view, but is a bead used to trigger
-   the loading of the map JS files */
-
-goog.provide('org.apache.flex.maps.google.beads.MapView');
-
-goog.require('org.apache.flex.core.IBeadView');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.maps.google.beads.MapView = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.maps.google.beads.MapView.prototype.
-FLEXJS_CLASS_INFO =
-{ names: [{ name: 'MapView',
-           qName: 'org.apache.flex.maps.google.beads.MapView' }],
-    interfaces: [org.apache.flex.core.IBeadView] };
-
-
-Object.defineProperties(org.apache.flex.maps.google.beads.MapView.prototype, {
-    /** @export */
-    strand: {
-        /** @this {org.apache.flex.maps.google.beads.MapView} */
-        set: function(value) {
-            this.strand_ = value;
-
-            var token = this.strand_.token;
-            var src = 'https://maps.googleapis.com/maps/api/js?v=3.exp';
-            if (token)
-              src += '&key=' + token;
-            src += '&libraries=places&sensor=false&callback=mapInit';
-
-            var script = document.createElement('script');
-            script.type = 'text/javascript';
-            script.src = src;
-
-            window.mapView = this;
-            window['mapInit'] = function() {
-                this.mapView.strand_.finishInitalization();
-            };
-            document.head.appendChild(script);
-        }
-    }
-});
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f5ec157c/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/models/MapModel.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/models/MapModel.js
b/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/models/MapModel.js
deleted file mode 100644
index 7b0dd48..0000000
--- a/frameworks/projects/GoogleMaps/js/src/org/apache/flex/maps/google/models/MapModel.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.maps.google.models.MapModel');
-
-goog.require('org.apache.flex.core.IBeadModel');
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-// IMPORTANT:
-// In order to use this class, the Google MAP API must be downloaded
-// from the <head> section of the main HTML file.
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- * @implements {org.apache.flex.core.IBeadModel}
- */
-org.apache.flex.maps.google.models.MapModel = function() {
-  org.apache.flex.maps.google.models.MapModel.base(this, 'constructor');
-};
-goog.inherits(
-    org.apache.flex.maps.google.models.MapModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.maps.google.models.MapModel.prototype.
-FLEXJS_CLASS_INFO =
-{ names: [{ name: 'MapModel',
-           qName: 'org.apache.flex.maps.google.models.MapModel' }],
-    interfaces: [org.apache.flex.core.IBeadModel] };
-
-
-Object.defineProperties(org.apache.flex.maps.google.models.MapModel.prototype, {
-    /** @export */
-    strand: {
-        /** @this {org.apache.flex.maps.google.models.MapModel} */
-        set: function(value) {
-           this.strand_ = value;
-        }
-    },
-    /** @export */
-    searchResults: {
-        /** @this {org.apache.flex.maps.google.models.MapModel} */
-        get: function() {
-            return this._searchResults;
-        },
-        /** @this {org.apache.flex.maps.google.models.MapModel} */
-        set: function(value) {
-            this._searchResults = value;
-            this.dispatchEvent('searchResultsChanged');
-        }
-    },
-    /** @export */
-    zoom: {
-        /** @this {org.apache.flex.maps.google.models.MapModel} */
-        get: function() {
-            return this._zoom;
-        },
-        /** @this {org.apache.flex.maps.google.models.MapModel} */
-        set: function(value) {
-            this._zoom = value;
-            this.dispatchEvent('zoomChanged');
-        }
-    },
-    /** @export */
-    selectedMarker: {
-        /** @this {org.apache.flex.maps.google.models.MapModel} */
-        get: function() {
-            return this._selectedMarker;
-        },
-        /** @this {org.apache.flex.maps.google.models.MapModel} */
-        set: function(value) {
-            this._selectedMarker = value;
-            this.dispatchEvent('selectedMarkerChanged');
-        }
-    },
-    /** @export */
-    currentLocation: {
-        /** @this {org.apache.flex.maps.google.models.MapModel} */
-        get: function() {
-            return this._currentLocation;
-        },
-        /** @this {org.apache.flex.maps.google.models.MapModel} */
-        set: function(value) {
-            this._currentLocation = value;
-            this.dispatchEvent('currentLocationChanged');
-        }
-    }
-});


Mime
View raw message