Move geocoder code to location related path. This CL only moves files, no functional change.
R=hansmuller@google.com, hansmuller@chromium.org
BUG=
Review URL: https://codereview.chromium.org/985123002
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 298e444..da57535 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -21,7 +21,6 @@
"//examples/ganesh_app",
"//examples/http_handler",
"//examples/indirect_service",
- "//examples/js/maps",
"//examples/nesting_app",
"//examples/png_viewer",
"//examples/recipes",
diff --git a/examples/js/README.md b/examples/js/README.md
index 5322128..24cfed7 100644
--- a/examples/js/README.md
+++ b/examples/js/README.md
@@ -12,5 +12,3 @@
- share_echo.js, share_echo_target.js - Peer to peer service sharing.
- show_image.js - Simple use of the window_manager interface.
-
-- maps/demo.js - Demo the Google Gecoder and Maps APIs
diff --git a/examples/js/maps/BUILD.gn b/examples/js/maps/BUILD.gn
deleted file mode 100644
index d10a973..0000000
--- a/examples/js/maps/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-group("maps") {
- deps = [
- ":bindings",
- ]
-}
-
-mojom("bindings") {
- sources = [
- "geocoder.mojom",
- ]
-}
diff --git a/examples/js/maps/demo.js b/examples/location/geocoder_demo.js
similarity index 85%
rename from examples/js/maps/demo.js
rename to examples/location/geocoder_demo.js
index aa6e783..5442be4 100644
--- a/examples/js/maps/demo.js
+++ b/examples/location/geocoder_demo.js
@@ -7,17 +7,18 @@
define("main", [
"console",
- "examples/js/maps/geocoder.mojom",
"mojo/public/js/core",
"mojo/public/js/unicode",
+ "mojo/services/location/public/interfaces/geocoder.mojom",
+ "mojo/services/location/public/interfaces/location.mojom",
"mojo/services/public/js/application",
"third_party/js/url",
-], function(console, geocoder, core, unicode, application, url) {
+], function(console, core, unicode, geocoder, location, application, url) {
const Application = application.Application;
const Geocoder = geocoder.Geocoder;
const Result = geocoder.Result;
- const Location = geocoder.Location;
+ const Location = location.Location;
const Status = geocoder.Status;
const Options = geocoder.Options;
const URL = url.URL;
@@ -68,7 +69,9 @@
class Demo extends Application {
initialize() {
- var geocoderURL = new URL(this.url).resolve("geocoder_service.js");
+ // TODO(alhaad): See if there is a better way to do this.
+ var geocoderURL = new URL(this.url).resolve(
+ "../../services/location/geocoder_service.js");
geocoderService = this.shell.connectToService(geocoderURL, Geocoder);
demoAddressToLocation();
}
diff --git a/mojo/services/location/public/interfaces/BUILD.gn b/mojo/services/location/public/interfaces/BUILD.gn
index 5fee011..62cb394 100644
--- a/mojo/services/location/public/interfaces/BUILD.gn
+++ b/mojo/services/location/public/interfaces/BUILD.gn
@@ -7,6 +7,7 @@
mojom("interfaces") {
sources = [
+ "geocoder.mojom",
"location.mojom",
"location_service.mojom",
]
diff --git a/examples/js/maps/geocoder.mojom b/mojo/services/location/public/interfaces/geocoder.mojom
similarity index 93%
rename from examples/js/maps/geocoder.mojom
rename to mojo/services/location/public/interfaces/geocoder.mojom
index d7cbe4c..20a2371 100644
--- a/examples/js/maps/geocoder.mojom
+++ b/mojo/services/location/public/interfaces/geocoder.mojom
@@ -6,12 +6,9 @@
// "Google Maps JavaScript API v3" defined here:
// https://developers.google.com/maps/documentation/javascript/geocoding
-module geocoder;
+module mojo;
-struct Location {
- float latitude;
- float longitude;
-};
+import "location/public/interfaces/location.mojom";
struct LocationType {
const string ROOFTOP = "ROOFTOP";
@@ -26,7 +23,7 @@
};
struct ComponentRestrictions {
- string? administrative_area;
+ string? administrative_area;
string? country;
string? locality;
string? postal_code;
diff --git a/examples/js/maps/geocoder_service.js b/services/location/geocoder_service.js
similarity index 92%
rename from examples/js/maps/geocoder_service.js
rename to services/location/geocoder_service.js
index 351a460..1373081 100644
--- a/examples/js/maps/geocoder_service.js
+++ b/services/location/geocoder_service.js
@@ -2,20 +2,22 @@
define("main", [
"console",
- "examples/js/maps/geocoder.mojom",
"mojo/public/js/core",
"mojo/public/js/unicode",
+ "mojo/services/location/public/interfaces/geocoder.mojom",
+ "mojo/services/location/public/interfaces/location.mojom",
"mojo/services/public/js/application",
"mojo/services/network/public/interfaces/network_service.mojom",
"mojo/services/network/public/interfaces/url_loader.mojom",
"third_party/js/url",
-], function(console, geocoder, core, unicode, application, network, loader, url) {
+], function(console, core, unicode, geocoder, location, application, network,
+ loader, url) {
const Application = application.Application;
const Bounds = geocoder.Bounds;
const Geocoder = geocoder.Geocoder;
const Geometry = geocoder.Geometry;
- const Location = geocoder.Location;
+ const Location = location.Location;
const NetworkService = network.NetworkService;
const Result = geocoder.Result;
const Status = geocoder.Status;
