[gnome-maps/wip/jonasdn/service-gnome-3-16: 1/2] Add MAPS_SERVICE environment override
- From: Jonas Danielsson <jonasdn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/jonasdn/service-gnome-3-16: 1/2] Add MAPS_SERVICE environment override
- Date: Sat, 20 Aug 2016 18:50:02 +0000 (UTC)
commit eb0fa7b0ce770260d8d7a510470abce5dd9fc83f
Author: Jonas Danielsson <jonas threetimestwo org>
Date: Sat Aug 20 20:34:29 2016 +0200
Add MAPS_SERVICE environment override
src/mapSource.js | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/src/mapSource.js b/src/mapSource.js
index 16fa99f..110758f 100644
--- a/src/mapSource.js
+++ b/src/mapSource.js
@@ -25,6 +25,7 @@ const Gtk = imports.gi.Gtk;
const GtkClutter = imports.gi.GtkClutter;
const Lang = imports.lang;
const Soup = imports.gi.Soup;
+const System = imports.system;
const Utils = imports.utils;
@@ -83,19 +84,31 @@ function _updateAttributionImage(source) {
let stream = Gio.MemoryInputStream.new_from_bytes(GLib.Bytes.new(data));
_attributionImage.pixbuf = GdkPixbuf.Pixbuf.new_from_stream(stream, null);
}
-
-function _createDefaultService() {
- let filename = GLib.build_filenamev([pkg.pkgdatadir,
- _DEFAULT_SERVICE_FILE]);
+
+function _getServiceFromFile(filename) {
let data = Utils.readFile(filename);
+ if (!data) {
+ log('Failed to open service file: ' + filename);
+ System.exit(1);
+ }
_tileService = JSON.parse(data).tiles;
return _tileService;
}
+function _createDefaultService() {
+ let filename = GLib.build_filenamev([pkg.pkgdatadir,
+ _DEFAULT_SERVICE_FILE]);
+ return _getServiceFromFile(filename);
+}
+
function _getTileService() {
if (_tileService)
return _tileService;
+ let serviceOverride = GLib.getenv('MAPS_SERVICE');
+ if (serviceOverride)
+ return _getServiceFromFile(serviceOverride);
+
let user_agent = 'gnome-maps/' + pkg.version;
let session = new Soup.Session({ user_agent : user_agent });
let msg = Soup.Message.new('GET', _TILE_SERVICE_URL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]