Add flags to disable map support at build time.

Signed-off-by: Katharine Berry <[email protected]>

Author: Katharine

app/src/c/assistant.c

@@ -40,7 +40,9 @@ static void prv_init(void) {
   consent_migrate();
   settings_init();
   conversation_manager_init();
+#if ENABLE_FEATURE_IMAGE_MANAGER
   image_manager_init();
+#endif
   events_app_message_open();
   alarm_manager_init();
 }
@@ -49,7 +51,9 @@ static void prv_deinit(void) {
   if (s_root_window) {
     root_window_destroy(s_root_window);
   }
+#ifdef ENABLE_FEATURE_IMAGE_MANAGER
   image_manager_deinit();
+#endif
 }
 
 int main(void) {

app/src/c/converse/conversation.c

@@ -18,6 +18,7 @@
 #include "../image_manager/image_manager.h"
 #include "../util/memory/malloc.h"
 #include "../util/logging.h"
+#include "../features.h"
 
 struct ConversationEntry {
   EntryType type;
@@ -131,9 +132,11 @@ void prv_destroy_entry(ConversationEntry *entry) {
             free(entry->content.widget->widget.number.unit);
           }
           break;
+#if ENABLE_FEATURE_MAPS
         case ConversationWidgetTypeMap:
           image_manager_destroy_image(entry->content.widget->widget.map.image_id);
           break;
+#endif
       }
       free(entry->content.widget);
       break;

app/src/c/converse/conversation.h

@@ -18,6 +18,7 @@
 #define CONVERSATION_H
 
 #include <pebble.h>
+#include "../features.h"
 
 typedef struct Conversation Conversation;
 typedef struct ConversationEntry ConversationEntry;
@@ -37,7 +38,9 @@ typedef enum {
   ConversationWidgetTypeWeatherMultiDay,
   ConversationWidgetTypeTimer,
   ConversationWidgetTypeNumber,
+#if ENABLE_FEATURE_MAPS
   ConversationWidgetTypeMap,
+#endif
 } ConversationWidgetType;
 
 typedef struct {

app/src/c/converse/conversation_manager.c

@@ -41,7 +41,9 @@ static void prv_handle_app_message_inbox_dropped(AppMessageResult result, void *
 static void prv_process_weather_widget(int widget_type, DictionaryIterator *iter, ConversationManager *manager);
 static void prv_process_timer_widget(int widget_type, DictionaryIterator *iter, ConversationManager *manager);
 static void prv_process_highlight_widget(int widget_type, DictionaryIterator *iter, ConversationManager *manager);
+#if ENABLE_FEATURE_MAPS
 static void prv_process_map_widget(int widget_type, DictionaryIterator *iter, ConversationManager *manager);
+#endif
 static bool prv_handle_memory_pressure(void *context);
 
 static ConversationManager* s_conversation_manager;
@@ -212,10 +214,12 @@ static void prv_handle_app_message_inbox_received(DictionaryIterator *iter, void
       conversation_complete_response(manager->conversation);
       prv_conversation_updated(manager, false);
       prv_process_highlight_widget(tuple->value->int32, iter, manager);
+#if ENABLE_FEATURE_MAPS
     } else if (tuple->key == MESSAGE_KEY_MAP_WIDGET) {
       conversation_complete_response(manager->conversation);
       prv_conversation_updated(manager, false);
       prv_process_map_widget(tuple->value->int32, iter, manager);
+#endif
     }
   }
 }
@@ -365,7 +369,7 @@ static void prv_process_highlight_widget(int widget_type, DictionaryIterator *it
   prv_conversation_updated(manager, true);
 }
 
-
+#if ENABLE_FEATURE_MAPS
 static void prv_process_map_widget(int widget_type, DictionaryIterator *iter, ConversationManager *manager) {
   if (widget_type != 1) {
     return;
@@ -384,6 +388,7 @@ static void prv_process_map_widget(int widget_type, DictionaryIterator *iter, Co
   conversation_add_widget(manager->conversation, &widget);
   prv_conversation_updated(manager, true);
 }
+#endif
 
 static void prv_handle_app_message_inbox_dropped(AppMessageResult reason, void *context) {
   BOBBY_LOG(APP_LOG_LEVEL_WARNING, "Received message dropped: %d", reason);

app/src/c/converse/segments/segment_layer.c

@@ -26,6 +26,7 @@
 #include "widgets/map.h"
 #include "../../util/memory/sdk.h"
 #include "../../util/logging.h"
+#include "../../features.h"
 
 #include <pebble.h>
 
@@ -43,7 +44,9 @@ typedef enum {
   SegmentTypeWeatherMultiDayWidget,
   SegmentTypeTimerWidget,
   SegmentTypeNumberWidget,
+#if ENABLE_FEATURE_MAPS
   SegmentTypeMapWidget,
+#endif
 } SegmentType;
 
 typedef struct {
@@ -62,7 +65,9 @@ typedef struct {
     WeatherMultiDayWidget* weather_multi_day_widget;
     TimerWidget* timer_widget;
     NumberWidget* number_widget;
+#if ENABLE_FEATURE_MAPS
     MapWidget* map_widget;
+#endif
   };
 } SegmentLayerData;
 
@@ -106,9 +111,11 @@ SegmentLayer* segment_layer_create(GRect rect, ConversationEntry* entry, bool as
     case SegmentTypeNumberWidget:
       data->number_widget = number_widget_create(child_frame, entry);
       break;
+#if ENABLE_FEATURE_MAPS
     case SegmentTypeMapWidget:
       data->map_widget = map_widget_create(child_frame, entry);
       break;
+#endif
   }
   layer_add_child(layer, data->layer);
   GSize child_size = layer_get_frame(data->layer).size;
@@ -147,9 +154,11 @@ void segment_layer_destroy(SegmentLayer* layer) {
     case SegmentTypeNumberWidget:
       number_widget_destroy(data->number_widget);
       break;
+#if ENABLE_FEATURE_MAPS
     case SegmentTypeMapWidget:
       map_widget_destroy(data->map_widget);
       break;
+#endif
   }
   if (data->assistant_label_layer) {
     text_layer_destroy(data->assistant_label_layer);
@@ -188,9 +197,11 @@ void segment_layer_update(SegmentLayer* layer) {
     case SegmentTypeNumberWidget:
       number_widget_update(data->number_widget);
       break;
+#if ENABLE_FEATURE_MAPS
     case SegmentTypeMapWidget:
       map_widget_update(data->map_widget);
       break;
+#endif
   }
   GSize child_size = layer_get_frame(data->layer).size;
   GPoint origin = layer_get_frame(layer).origin;
@@ -224,8 +235,10 @@ static SegmentType prv_get_segment_type(ConversationEntry* entry) {
           return SegmentTypeTimerWidget;
         case ConversationWidgetTypeNumber:
           return SegmentTypeNumberWidget;
+#if ENABLE_FEATURE_MAPS
         case ConversationWidgetTypeMap:
           return SegmentTypeMapWidget;
+#endif
       }
       break;
   }

app/src/c/features.h

@@ -18,3 +18,14 @@
 
 // If true, instead of using dictation input, the app will just use a fixed prompt.
 #define ENABLE_FEATURE_FIXED_PROMPT 0
+
+// IFTTT: if you change this, you need to update the corresponding feature in src/pkjs/features.js.
+// If true, maps will be available.
+#define ENABLE_FEATURE_MAPS 1
+
+// If true, the image manager will be available (required for maps to function)
+#define ENABLE_FEATURE_IMAGE_MANAGER 1
+
+#if ENABLE_FEATURE_MAPS && !ENABLE_FEATURE_IMAGE_MANAGER
+#error "ENABLE_FEATURE_MAPS requires ENABLE_FEATURE_IMAGE_MANAGER to be enabled."
+#endif

app/src/pkjs/features.js

@@ -0,0 +1,18 @@
+/**
+ * Copyright 2025 Google LLC
+ *
+ * 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.
+ */
+
+// IFTTT: if you change this, you need to update the corresponding feature in src/c/features.h.
+exports.FEATURE_MAP_WIDGET = true;

app/src/pkjs/session.js

@@ -21,6 +21,7 @@ var config = require('./config');
 var actions = require('./actions');
 var widgets = require('./widgets');
 var messageQueue = require('./lib/message_queue').Queue;
+var features = require('./features');
 
 var API_URL = require('./urls').QUERY_URL;
 var package_json = require('package.json');
@@ -54,7 +55,10 @@ Session.prototype.run = function() {
     // negate this because JavaScript does it backwards for some reason.
     url += '&tzOffset=' + (-(new Date()).getTimezoneOffset());
     url += '&actions=' + actions.getSupportedActions().join(',');
-    url += '&widgets=weather,timer,number,map';
+    url += '&widgets=weather,timer,number';
+    if (features.FEATURE_MAP_WIDGET) {
+        url += ',map';
+    }
     var settings = getSettings();
     url += '&units=' + settings['UNIT_PREFERENCE'] || '';
     url += '&lang=' + settings['LANGUAGE_CODE'] || '';

app/src/pkjs/widgets/index.js

@@ -18,16 +18,20 @@ var map = require('./map');
 var weather = require('./weather');
 var timer = require('./timer');
 var highlights = require('./highlights');
+var features = require('../features');
 
 var widgetMap = {
-    'map': map.map,
     'timer': timer.timer,
     'number': highlights.number,
     'weather-single-day': weather.singleDay,
     'weather-current': weather.current,
     'weather-multi-day': weather.multiDay
 }
 
+if (features.FEATURE_MAP_WIDGET) {
+    widgetMap['map'] = map.map;
+}
+
 exports.handleWidget = function(session, widgetString) {
     var params = JSON.parse(widgetString);
     var name = params['type'];