diff --git a/app/lib/widgets/choropleth_map.dart b/app/lib/widgets/choropleth_map.dart index 61245999a8e55db726d32c74eb18b2cc72f0080a..d55e79ca1ffa7feb64484991b8144386c8790f1a 100644 --- a/app/lib/widgets/choropleth_map.dart +++ b/app/lib/widgets/choropleth_map.dart @@ -20,10 +20,10 @@ class ChoroplethMap extends StatefulWidget { final void Function(int _selectedIndex) onSelectionChanged; @override - _ChoroplethMapState createState() => _ChoroplethMapState(); + ChoroplethMapState createState() => ChoroplethMapState(); } -class _ChoroplethMapState extends State<ChoroplethMap> { +class ChoroplethMapState extends State<ChoroplethMap> { int _selectedIndex = -1; // Subdivision/map tile index late MapShapeSource _dataSource; late final MapZoomPanBehavior _zoomPanBehavior = MapZoomPanBehavior(); @@ -78,7 +78,6 @@ class _ChoroplethMapState extends State<ChoroplethMap> { @override Widget build(BuildContext context) { - print("Map built!"); return Stack( children: [ SfMapsTheme( diff --git a/app/lib/widgets/graph_data/bar_data.dart b/app/lib/widgets/graph_data/bar_data.dart index 668d86e7009e221e3d46847a5ef243d413cd2239..65d6d0cc6d053555612d3cb0b5ac3d6669d13765 100644 --- a/app/lib/widgets/graph_data/bar_data.dart +++ b/app/lib/widgets/graph_data/bar_data.dart @@ -160,16 +160,6 @@ class _BarDataState extends State<BarData> { reservedSize: 30, interval: totalHeight/5, ), - topTitles: SideTitles( - showTitles: true, - getTextStyles: (value) => const TextStyle(color: Colors.white60), - margin: 0, - reservedSize: 10, - getTitles: (value) { - // Return "cm" for a specific value (e.g., 0) and empty string for others - return value == 0 ? 'cm' : ''; - }, - ), ), groupsSpace: 14, gridData: FlGridData( diff --git a/app/lib/widgets/main_layout.dart b/app/lib/widgets/main_layout.dart index 5b6706e608900f59ba5fe8ebfe3f63ec43a52e9b..5b77d99291a23092d53752cb41a23bd50fcb8e6a 100644 --- a/app/lib/widgets/main_layout.dart +++ b/app/lib/widgets/main_layout.dart @@ -30,7 +30,6 @@ class MapContainerWidget extends StatefulWidget { } class _MapContainerWidgetState extends State<MapContainerWidget> { - bool isMinimized = true; // Quick view box state tacker bool satLayer = false; // Satellite layer visibility state diff --git a/server/map_handler/__pycache__/add_new_lake.cpython-311.pyc b/server/map_handler/__pycache__/add_new_lake.cpython-311.pyc index 3621c56f8f0aa53d3939698e297a41ad6ed5d955..2dd5256a7332fa522151b53a7fdf5b50ce92e391 100644 Binary files a/server/map_handler/__pycache__/add_new_lake.cpython-311.pyc and b/server/map_handler/__pycache__/add_new_lake.cpython-311.pyc differ diff --git a/server/map_handler/__pycache__/get_lake_relation.cpython-311.pyc b/server/map_handler/__pycache__/get_lake_relation.cpython-311.pyc index 294c637b24273dcb00009482d00701ef9d496399..10e932a35eb3d05275315063cb616a7d1a838c67 100644 Binary files a/server/map_handler/__pycache__/get_lake_relation.cpython-311.pyc and b/server/map_handler/__pycache__/get_lake_relation.cpython-311.pyc differ diff --git a/server/map_handler/add_new_lake.py b/server/map_handler/add_new_lake.py index f7ebb9bc40711ff71ab6790c1c250b4bda5e8bf1..9ef7dc7503eb2e8163d9d139a9e05456a5d5ceda 100644 --- a/server/map_handler/add_new_lake.py +++ b/server/map_handler/add_new_lake.py @@ -152,7 +152,8 @@ def write_json_to_file(lake_name: str, json_data: dict): data.append(lake_name) with open(LAKE_RELATIONS_PATH + 'all_lake_names.json', 'w') as file: - json.dump(data, file, indent=2) + # json.dump(data, file, indent=2) + json.dump(data, file, ensure_ascii=False, indent=2) def plot_map(divided_map): diff --git a/server/map_handler/lake_relations/all_lake_names.json b/server/map_handler/lake_relations/all_lake_names.json index c317f7955d6359c6e084fd7d772697d62095cd11..939b10a49233538e2b3f640e1bfe95d354ad51a7 100644 --- a/server/map_handler/lake_relations/all_lake_names.json +++ b/server/map_handler/lake_relations/all_lake_names.json @@ -1,5 +1,4 @@ [ "Mj\u00c3\u00b8sa", - "Skumsj\u00c3\u00b8en", - "Skumsj\u00f8en" + "Skumsj\u00c3\u00b8en" ] \ No newline at end of file