Skip to content

Commit bfb22e7

Browse files
change map size y default
1 parent bec24d7 commit bfb22e7

File tree

14 files changed

+32
-25
lines changed

14 files changed

+32
-25
lines changed

app/mutations/devices/seeders/abstract_genesis.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def settings_default_map_size_x
174174
end
175175

176176
def settings_default_map_size_y
177-
device.web_app_config.update!(map_size_y: 1_400)
177+
device.web_app_config.update!(map_size_y: 1_230)
178178
end
179179

180180
def pin_bindings_button_1

app/mutations/devices/seeders/genesis_xl_one_five.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def settings_default_map_size_x
1616
end
1717

1818
def settings_default_map_size_y
19-
device.web_app_config.update!(map_size_y: 2_900)
19+
device.web_app_config.update!(map_size_y: 2_730)
2020
end
2121

2222
def tool_slots_slot_7

app/mutations/devices/seeders/genesis_xl_one_four.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def settings_default_map_size_x
1616
end
1717

1818
def settings_default_map_size_y
19-
device.web_app_config.update!(map_size_y: 2_900)
19+
device.web_app_config.update!(map_size_y: 2_730)
2020
end
2121
end
2222
end

app/mutations/devices/seeders/genesis_xl_one_seven.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def settings_default_map_size_x
1616
end
1717

1818
def settings_default_map_size_y
19-
device.web_app_config.update!(map_size_y: 2_900)
19+
device.web_app_config.update!(map_size_y: 2_730)
2020
end
2121

2222
def peripherals_rotary_tool

app/mutations/devices/seeders/genesis_xl_one_six.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def settings_default_map_size_x
1616
end
1717

1818
def settings_default_map_size_y
19-
device.web_app_config.update!(map_size_y: 2_900)
19+
device.web_app_config.update!(map_size_y: 2_730)
2020
end
2121

2222
def peripherals_rotary_tool
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class ChangeMapSizeYDefault < ActiveRecord::Migration[6.1]
2+
def change
3+
change_column_default(:web_app_configs, :map_size_y, from: 1400, to: 1230)
4+
end
5+
end

db/structure.sql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
SET statement_timeout = 0;
22
SET lock_timeout = 0;
33
SET idle_in_transaction_session_timeout = 0;
4+
SET transaction_timeout = 0;
45
SET client_encoding = 'UTF8';
56
SET standard_conforming_strings = on;
67
SELECT pg_catalog.set_config('search_path', '', false);
@@ -2005,7 +2006,7 @@ CREATE TABLE public.web_app_configs (
20052006
show_pins boolean DEFAULT false,
20062007
disable_emergency_unlock_confirmation boolean DEFAULT true,
20072008
map_size_x integer DEFAULT 2900,
2008-
map_size_y integer DEFAULT 1400,
2009+
map_size_y integer DEFAULT 1230,
20092010
expand_step_options boolean DEFAULT false,
20102011
hide_sensors boolean DEFAULT false,
20112012
confirm_plant_deletion boolean DEFAULT true,
@@ -3979,6 +3980,7 @@ INSERT INTO "schema_migrations" (version) VALUES
39793980
('20240405171128'),
39803981
('20240625195838'),
39813982
('20241203194030'),
3982-
('20241203211516');
3983+
('20241203211516'),
3984+
('20250221191831');
39833985

39843986

frontend/__test_support__/fake_state/resources.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ export function fakeWebAppConfig(): TaggedWebAppConfig {
389389
default_plant_depth: 5,
390390
disable_emergency_unlock_confirmation: false,
391391
map_size_x: 2900,
392-
map_size_y: 1400,
392+
map_size_y: 1230,
393393
user_interface_read_only_mode: false,
394394
["three_d_garden" as BooleanConfigKey]: false,
395395
["dark_mode" as BooleanConfigKey]: false,

frontend/farm_designer/__tests__/index_test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe("<FarmDesigner />", () => {
8888
expect(legendProps.imageAgeInfo).toEqual({ newestDate: "", toOldest: 1 });
8989
const gardenMapProps = wrapper.find(GardenMap).props();
9090
expect(gardenMapProps.mapTransformProps.gridSize.x).toEqual(2900);
91-
expect(gardenMapProps.mapTransformProps.gridSize.y).toEqual(1400);
91+
expect(gardenMapProps.mapTransformProps.gridSize.y).toEqual(1230);
9292
});
9393

9494
it("loads image info", () => {
@@ -199,7 +199,7 @@ describe("<FarmDesigner />", () => {
199199
describe("getDefaultAxisLength()", () => {
200200
it("returns axis lengths", () => {
201201
const axes = getDefaultAxisLength(() => false);
202-
expect(axes).toEqual({ x: 2900, y: 1400, z: 400 });
202+
expect(axes).toEqual({ x: 2900, y: 1230, z: 400 });
203203
});
204204
});
205205

@@ -212,7 +212,7 @@ describe("getGridSize()", () => {
212212
y: { value: 200, isDefault: false },
213213
z: { value: 400, isDefault: true },
214214
});
215-
expect(grid).toEqual({ x: 2900, y: 1400 });
215+
expect(grid).toEqual({ x: 2900, y: 1230 });
216216
});
217217

218218
it("returns custom grid size", () => {

frontend/farm_designer/__tests__/state_to_props_test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ describe("botSize()", () => {
190190
const state = fakeState();
191191
expect(botSize(state)).toEqual({
192192
x: { value: 2900, isDefault: true },
193-
y: { value: 1400, isDefault: true },
193+
y: { value: 1230, isDefault: true },
194194
z: { value: 400, isDefault: true },
195195
});
196196
});

0 commit comments

Comments
 (0)