From dc9a3b0e1d7444e2883d08673462a43d1c54813d Mon Sep 17 00:00:00 2001 From: Levi Lesches Date: Wed, 2 Apr 2025 15:39:57 -0400 Subject: [PATCH] Function client to send `GET /path` to server (#4) * Created default project * Added client to .vscode/launch.json * Ignore .vscode/settings.json * Some data scraping * Client skeleton * Client data types and fromJson() functions * Final touches on JSON * Added ApiService * ApiService changes * Prototype for stops * ViewModel and UI * Basic client UI --- .gitignore | 1 + .vscode/cspell.json | 14 + .vscode/launch.json | 22 + src/client/.gitignore | 45 + src/client/.metadata | 33 + src/client/README.md | 16 + src/client/analysis_options.yaml | 52 + src/client/bin/occt.dart | 132 ++ src/client/data/routes.json | 442 ++++ src/client/data/stops.json | 2082 +++++++++++++++++ src/client/lib/data.dart | 4 + src/client/lib/main.dart | 27 + src/client/lib/models.dart | 31 + src/client/lib/pages.dart | 22 + src/client/lib/services.dart | 27 + src/client/lib/src/data/path.dart | 15 + src/client/lib/src/data/stop.dart | 13 + src/client/lib/src/data/trip.dart | 71 + src/client/lib/src/data/utils.dart | 30 + src/client/lib/src/models/model.dart | 17 + src/client/lib/src/pages/home.dart | 86 + src/client/lib/src/services/api.dart | 53 + src/client/lib/src/services/service.dart | 7 + src/client/lib/src/view_models/home.dart | 34 + .../lib/src/view_models/view_model.dart | 54 + .../src/widgets/generic/reactive_widget.dart | 80 + src/client/lib/view_models.dart | 3 + src/client/lib/widgets.dart | 20 + src/client/pubspec.lock | 266 +++ src/client/pubspec.yaml | 22 + src/client/test/widget_test.dart | 30 + src/client/web/favicon.png | Bin 0 -> 917 bytes src/client/web/icons/Icon-192.png | Bin 0 -> 5292 bytes src/client/web/icons/Icon-512.png | Bin 0 -> 8252 bytes src/client/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes src/client/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes src/client/web/index.html | 38 + src/client/web/manifest.json | 35 + src/client/windows/.gitignore | 17 + src/client/windows/CMakeLists.txt | 108 + src/client/windows/flutter/CMakeLists.txt | 109 + .../flutter/generated_plugin_registrant.cc | 11 + .../flutter/generated_plugin_registrant.h | 15 + .../windows/flutter/generated_plugins.cmake | 23 + src/client/windows/runner/CMakeLists.txt | 40 + src/client/windows/runner/Runner.rc | 121 + src/client/windows/runner/flutter_window.cpp | 71 + src/client/windows/runner/flutter_window.h | 33 + src/client/windows/runner/main.cpp | 43 + src/client/windows/runner/resource.h | 16 + .../windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes src/client/windows/runner/runner.exe.manifest | 14 + src/client/windows/runner/utils.cpp | 65 + src/client/windows/runner/utils.h | 19 + src/client/windows/runner/win32_window.cpp | 288 +++ src/client/windows/runner/win32_window.h | 102 + 56 files changed, 4919 insertions(+) create mode 100644 .gitignore create mode 100644 .vscode/cspell.json create mode 100644 .vscode/launch.json create mode 100644 src/client/.gitignore create mode 100644 src/client/.metadata create mode 100644 src/client/README.md create mode 100644 src/client/analysis_options.yaml create mode 100644 src/client/bin/occt.dart create mode 100644 src/client/data/routes.json create mode 100644 src/client/data/stops.json create mode 100644 src/client/lib/data.dart create mode 100644 src/client/lib/main.dart create mode 100644 src/client/lib/models.dart create mode 100644 src/client/lib/pages.dart create mode 100644 src/client/lib/services.dart create mode 100644 src/client/lib/src/data/path.dart create mode 100644 src/client/lib/src/data/stop.dart create mode 100644 src/client/lib/src/data/trip.dart create mode 100644 src/client/lib/src/data/utils.dart create mode 100644 src/client/lib/src/models/model.dart create mode 100644 src/client/lib/src/pages/home.dart create mode 100644 src/client/lib/src/services/api.dart create mode 100644 src/client/lib/src/services/service.dart create mode 100644 src/client/lib/src/view_models/home.dart create mode 100644 src/client/lib/src/view_models/view_model.dart create mode 100644 src/client/lib/src/widgets/generic/reactive_widget.dart create mode 100644 src/client/lib/view_models.dart create mode 100644 src/client/lib/widgets.dart create mode 100644 src/client/pubspec.lock create mode 100644 src/client/pubspec.yaml create mode 100644 src/client/test/widget_test.dart create mode 100644 src/client/web/favicon.png create mode 100644 src/client/web/icons/Icon-192.png create mode 100644 src/client/web/icons/Icon-512.png create mode 100644 src/client/web/icons/Icon-maskable-192.png create mode 100644 src/client/web/icons/Icon-maskable-512.png create mode 100644 src/client/web/index.html create mode 100644 src/client/web/manifest.json create mode 100644 src/client/windows/.gitignore create mode 100644 src/client/windows/CMakeLists.txt create mode 100644 src/client/windows/flutter/CMakeLists.txt create mode 100644 src/client/windows/flutter/generated_plugin_registrant.cc create mode 100644 src/client/windows/flutter/generated_plugin_registrant.h create mode 100644 src/client/windows/flutter/generated_plugins.cmake create mode 100644 src/client/windows/runner/CMakeLists.txt create mode 100644 src/client/windows/runner/Runner.rc create mode 100644 src/client/windows/runner/flutter_window.cpp create mode 100644 src/client/windows/runner/flutter_window.h create mode 100644 src/client/windows/runner/main.cpp create mode 100644 src/client/windows/runner/resource.h create mode 100644 src/client/windows/runner/resources/app_icon.ico create mode 100644 src/client/windows/runner/runner.exe.manifest create mode 100644 src/client/windows/runner/utils.cpp create mode 100644 src/client/windows/runner/utils.h create mode 100644 src/client/windows/runner/win32_window.cpp create mode 100644 src/client/windows/runner/win32_window.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c6f9a44 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode/settings.json diff --git a/.vscode/cspell.json b/.vscode/cspell.json new file mode 100644 index 0000000..fce6274 --- /dev/null +++ b/.vscode/cspell.json @@ -0,0 +1,14 @@ +{ + "version": "0.2", + "ignorePaths": [ + "src/client/data/**" + ], + "dictionaryDefinitions": [], + "dictionaries": [], + "words": [ + "dotw", + "Occt" + ], + "ignoreWords": [], + "import": [] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..953f9e6 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,22 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "client (windows)", + "cwd": "src\\client", + "request": "launch", + "type": "dart", + "args": ["-d", "windows"] + }, + { + "name": "client (web)", + "cwd": "src\\client", + "request": "launch", + "type": "dart", + "args": ["-d", "chrome"] + }, + ] +} \ No newline at end of file diff --git a/src/client/.gitignore b/src/client/.gitignore new file mode 100644 index 0000000..79c113f --- /dev/null +++ b/src/client/.gitignore @@ -0,0 +1,45 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/src/client/.metadata b/src/client/.metadata new file mode 100644 index 0000000..6c20bbe --- /dev/null +++ b/src/client/.metadata @@ -0,0 +1,33 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "3e493a3e4d0a5c99fa7da51faae354e95a9a1abe" + channel: "beta" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe + base_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe + - platform: web + create_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe + base_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe + - platform: windows + create_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe + base_revision: 3e493a3e4d0a5c99fa7da51faae354e95a9a1abe + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/src/client/README.md b/src/client/README.md new file mode 100644 index 0000000..2a43b57 --- /dev/null +++ b/src/client/README.md @@ -0,0 +1,16 @@ +# client + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/src/client/analysis_options.yaml b/src/client/analysis_options.yaml new file mode 100644 index 0000000..0abb6fe --- /dev/null +++ b/src/client/analysis_options.yaml @@ -0,0 +1,52 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. See the following for docs: +# https://dart.dev/guides/language/analysis-options +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. +include: package:very_good_analysis/analysis_options.yaml # has more lints + +analyzer: + language: + # Strict casts isn't helpful with null safety. It only notifies you on `dynamic`, + # which happens all the time in JSON. + # + # See https://github.com/dart-lang/language/blob/main/resources/type-system/strict-casts.md + strict-casts: false + + # Don't let any types be inferred as `dynamic`. + # + # See https://github.com/dart-lang/language/blob/main/resources/type-system/strict-inference.md + strict-inference: true + + # Don't let Dart infer the wrong type on the left side of an assignment. + # + # See https://github.com/dart-lang/language/blob/main/resources/type-system/strict-raw-types.md + strict-raw-types: true + + exclude: + - lib/generated/**.dart + - test/**.dart + - example/**.dart + +linter: + rules: + # Rules NOT in package:very_good_analysis + prefer_double_quotes: true + prefer_expression_function_bodies: true + + # Rules to be disabled from package:very_good_analysis + prefer_single_quotes: false # prefer_double_quotes + lines_longer_than_80_chars: false # lines should be at most 100 chars + sort_pub_dependencies: false # Sort dependencies by function + use_key_in_widget_constructors: false # not in Flutter apps + directives_ordering: false # sort dart, then flutter, then package imports + always_use_package_imports: false # not when importing sibling files + sort_constructors_first: false # final properties, then constructor + avoid_dynamic_calls: false # this lint takes over errors in the IDE + one_member_abstracts: false # abstract classes are good for interfaces + cascade_invocations: false # cascades are often harder to read + + # Temporarily disabled until we are ready to document + public_member_api_docs: false diff --git a/src/client/bin/occt.dart b/src/client/bin/occt.dart new file mode 100644 index 0000000..5d2976d --- /dev/null +++ b/src/client/bin/occt.dart @@ -0,0 +1,132 @@ +// Entrypoints can print +// ignore_for_file: avoid_print + +import "dart:convert"; +import "dart:io"; +import "package:http/http.dart"; +import "package:html/parser.dart"; + +typedef Json = Map; + +extension on List { + Iterable<(int, E)> enumerate() sync* { + for (var i = 0; i < length; i++) { + yield (i, this[i]); + } + } +} + +final spotClient = Client(); + +class OcctStop { + static final Map stopsById = {}; + static final Map stopsByName = {}; + + static Future readStops() async { + final file = File("data/stops.json"); + final json = jsonDecode(await file.readAsString()) as List; + for (final stopJson in json.cast()) { + final name = stopJson["name"] as String; + final id = stopJson["id"] as int; + final routeId = stopJson["rid"] as int; + var stop = stopsById[id]; + if (stop == null) { + stop = OcctStop(id, name); + stopsById[id] = stop; + stopsByName[name] = stop; + } + stop.routes.add(routeId); + } + } + + final String name; + final int id; + final List routes = []; + OcctStop(this.id, this.name); +} + +class OcctRoute { + final int id; + final String name; + final String abbr; + final List stops = []; + final String encodedLine; + final String hexColor; + + OcctRoute.fromJson(Json json) : + id = json["id"], + name = json["name"], + abbr = json["abbr"], + encodedLine = json["encLine"], + hexColor = json["color"]; +} + +class OcctRouteStop { + final int id; + final String name; + final List times = []; + + OcctRouteStop(this.id, this.name); +} + +/* +{ + "route_id": "int", + "stops": [ + { + "stop_id": "int", + "stop_name": "string", + "times": [ "HH:MM PM" ] + } + ] +} +*/ + +String getStopName(String text) { + final regex = RegExp("(?:Returns to|Arrives at|Leaves)? ?(?:the )?(.+)"); + const stopNameSubstitutions = { + "Binghamton University": "University Union", + "Innovative Tech Complex": "Innovative Technology Center", + "UClub / University Plaza": "UCLUB", + }; + print("Trying to find stop name in [$text]"); + final match = regex.firstMatch(text)!; + final name = match.group(1)!; + return stopNameSubstitutions[name] ?? name; +} + +void main() async { + await OcctStop.readStops(); + final uri = Uri.parse("https://occtransport.org/pages/routes/iu.html"); + final response = await get(uri); + if (response.statusCode != 200) { + print("Got non-200 status: "); + print(response.body); + return; + } + final html = parse(response.body); + final table = html.getElementsByTagName("tbody").first; + print(table.children.first.innerHtml); + final numStops = table.children.first.children.length; + print("There are $numStops stops"); + + final stopsHtml = html.getElementsByClassName("sch-notes").first; + final routeStops = []; + for (final stopHtml in stopsHtml.children) { + final sourceName = stopHtml.text.substring(2); // eg, 1 Leaves Mohawk + final name = getStopName(sourceName); + final id = OcctStop.stopsByName[name]?.id; + if (id == null) { + print("Could not find a stop with the name: $name"); + return; + } + routeStops.add(OcctRouteStop(id, name)); + } + for (final row in table.children) { + for (final (index, timeHtml) in row.children.enumerate()) { + final time = timeHtml.innerHtml; + routeStops[index].times.add(time); + } + } + print(routeStops); +} diff --git a/src/client/data/routes.json b/src/client/data/routes.json new file mode 100644 index 0000000..30a6a6e --- /dev/null +++ b/src/client/data/routes.json @@ -0,0 +1,442 @@ +[ + { + "id": 1, + "name": "Westside Outbound", + "abbr": "WS O", + "stops": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 132, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21 + ], + "vType": "Bus", + "encLine": "wb{_GhitnMBAFh@LZ@nCO~CIfA??IpAUjBM|@AVSbA_@`B??e@|Ao@rA}@lAm@f@??o@PSCy@?aAAy@O??eAYi@W??WWkA|Be@v@??eBjBy@l@s@b@??YNuBv@gB`@??aCd@SRUb@iAO??s@?}DNBwA??D{CTcAPk@V_@??`CeDRi@Fc@?YA_@EUM]W_@OKe@M??cIS??sHU??mCOsC]??mD}@iA_@??yCkAyB_A??iH{C??mGoCUY??oAm@g@[g@k@u@iA??e@q@Q]GYCWAe@B]NWBg@CUWMMaA??i@iGI]E{@??m@wK??s@kL??u@kL??u@mL??QoCo@qG??]gD[_E??s@qJ??YkDUqA??Qw@cB{F??w@eB]a@kAmA??_CiB~@iC??rA_EdAgC??`E}I??`EcJ??`DgH^u@??fAwBdCuF??nD_I??rCmG??nBkE??nBiE??pBmE??pBkE??rBkE??xByE??nAuC`@sA??tAqG??^aBTuAXyB??dAeJ??`A_J??n@cGDwB??FwK??@aAlCf@PFTA??XGPIV[Re@F[L{A~B^????|Dv@", + "color": "#191970", + "type": "INBOUND", + "order": 1, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 2, + "name": "Westside Inbound", + "abbr": "WS I", + "stops": [ + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 32, + 118, + 1, + 61 + ], + "vType": "Bus", + "encLine": "qv|_G`_jnMA?iDq@_@S}B_@??y@OSFM`BSn@Y^OJ[J??]LmCg@AxA??IrMCb@]xC??UdCiBhP??a@nDg@~C_BjH??k@~Bs@fB{@jB??wE`K??uE~J??uEbK??uEdK??uEbK??w@fBgBlD{@nB??wEfK??wEhK??gB|D_C|G????i@zA??A@zBdBh@h@bAhAVf@??f@lAzAjF\\zA??RlBfAxN@?TbDnA`M??pA|S??pA~S??~@bP?r@??DxAR|C@|@OHCHCLA\\D\\PJFR??Fp@HzAD`@Lp@Zn@X`@XRl@T~Ab@??j@RRBhGhC??pInD??vFfC|Aj@??d@PfBVfBRrBN??~CLzA?`BH@?|IV??d@BTJPNLRL`@Db@?RGf@Sd@ST??QHa@FYCWOSWOc@CU?a@???]EUNcJ??J{K??BcAPo@DIRMXGjAH??dAH~ATpBd@??p@R|@f@jBxA??NTxAjEFh@??^|Cf@|Bb@`B??BXHTp@xAv@|@~@l@??r@Xh@JfAF|@A??XANERKn@Q^WRU??v@gAXg@^_A^uA??h@_CDY@WTaB??LgARyCJaCB]ZOHIBa@?{@???qAGeB????g@DC@Ij@Cd@", + "color": "#191970", + "type": "INBOUND", + "order": 2, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 3, + "name": "Downtown Center Leroy Outbound", + "abbr": "DCL O", + "stops": [ + 1, + 2, + 3, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42 + ], + "vType": "Bus", + "encLine": "sb{_GlitnM??Fb@LZ@nCO~CMhB??[zCM|@AVq@|C??]pA_@~@Yf@_ApA??k@b@o@PSCy@?aAAo@K??oA]i@Y??WUkA|Bg@z@??cBfBy@l@mAr@a@P??sAd@mAXuCj@??YTUb@o@Ka@Ek@@{BH??aADHsFTcAJ[??DOT]bCgDL[FUDk@??Ai@Kc@O[OSOKSIQC{BE??gJY??eFQ{@G}AS??q@ImAYcBc@{Ag@??gCcA{DaB??{IwD??yCqASWqAo@q@e@??i@q@oAkBWk@EYA[Bq@NWXKr@Mb@OTM??ROd@e@nBsCL]h@q@??lFqG??vCsDlAeB??Zo@hCsDr@kA??vEwH??l@eARe@H[L}@ZiD??z@sL??~@eM??LmAVcBtAgG??d@mBVw@pCmG??fFmL??r@gBTo@tAkG?AlAoFfAkE??dD}K@?pBuIVkA??fAqFd@oD??^kDsA?kBL??{EX??iDRKcE??SuJ??SuJ??SwJ??SmK???cA^{I??`@eL????L{C~A`@??lJ|B??nAZc@uI??e@qJ??k@qJ??e@yH??E]@YM@u@IiFcA??GAIIi@K", + "color": "#D2042D", + "type": "INBOUND", + "order": 3, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 4, + "name": "Downtown Center Leroy Inbound", + "abbr": "DCL I", + "stops": [ + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 118, + 61, + 1 + ], + "vType": "Bus", + "encLine": "iy|_Gz~inM?A??xB`@H@JClCf@??bB\\t@HJVTpC??`AxP??RrDOFIBS?{EkA??gCo@QxA??_AtIG|@??i@pN??a@bK?z@??TxL??VhM??TnK??PfI??D`B|CQ??~DU??rCSj@???f@?c@`E]hC??Y|AsAlG??qArFk@zB??qCdJ??gAjEcApE??_BjHUn@a@bA??{D~I??_E|I??g@xAoBnI??YxAS|Am@hI??eAzN??g@|FGd@Kh@KXq@pA??uErH??}@xAqBtC??W\\a@x@_CzC??oEtF??gD`Ec@`@??yBfC]Z]R??c@RQ@UCYI??[QY?WLGV?j@BNPJDNJ`A??FnAL`AXt@`@j@??XTXJbD`A??NBjEhB??rElB??~EtB??dF|B??pBr@|B\\@?nALjCRX@??nFJ??tGT??`BBhAFJDZTLRL`@D^??Cj@Kf@U^[Pa@FYCa@YIMKY??G_@?_AEUNaJ??L{M??Ru@DIRMXG|CT??rAR|@RdBd@b@T??p@`@rAhANTf@tA??`@rAN`@V`CL|@??h@dCb@`BBXb@hA??Vd@dAhAj@^n@V`@J??xAJl@?\\A??ZGRKn@Q^Wn@u@??Zg@n@sATq@f@oB??ZaB@WL}@TkBNwB??RaETK??NMBa@?eD??IoA??@Bk@DIj@CZ", + "color": "#D2042D", + "type": "INBOUND", + "order": 4, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 8, + "name": "Campus Shuttle", + "abbr": "CS", + "stops": [ + 61, + 117, + 62, + 63, + 64, + 65, + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 1 + ], + "vType": "Bus", + "encLine": "{a{_GdptnM?u@??A_A??AgA??CiA?AAe@Ee@??GkA??KgA??MaAQ{@??g@kBy@uB??aAqBm@y@??MKg@Ye@IS?A?UBe@Pg@ZGL??[f@Sj@M`A??IhB?jB??LtD??@LgAl@WNY\\??_@j@s@vA??e@v@{@x@??GFI@g@Tg@L??a@JWLWDMLEJEZ??B^LP`AtC??Vt@????V`CMj@??I`C??IdCEn@??WxB?jA??J`Av@tB??FRbBgB??f@{@t@{A?ADEx@j@n@V??^JtAJ??p@???RpHA?nAE??nCO??dCU??pAGr@M??bC]??bC]??bC]H?AhASjB??WfAYv@o@pA??s@~@cAdA??cBdB??q@r@]j@??q@CG@]zB?h@`@?@I??TqAV{@??b@w@`AcA??|B_C??|@eAj@cA??Rc@Xw@XoA?AJaAFw@AqAEg@??Gm@Mq@Qk@g@oAKShB{C??|BgE??v@eBp@mB??HW}@o@?A?@YWCAe@zAABG^BfB??Dl@DL??HN}@`B??wAhC??sAxBg@n@??}@|@{@n@??gCnA??u@\\[Jo@L??m@D_AE??a@Gk@SQOO[??e@cBl@g@j@s@??j@aATk@f@aB??j@gCDY@WNeA??RcBTeD??LiC", + "color": "#228B22", + "type": "Linear", + "order": 5, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 0, + "useCustomShape": true, + "showVehicleCapacity": true + }, + { + "id": 16, + "name": "ITC - UCLUB", + "abbr": "IU", + "stops": [ + 61, + 63, + 64, + 65, + 109, + 66, + 67, + 68, + 134, + 69 + ], + "vType": "Bus", + "encLine": "ub{_GfbtnMYkBQaAe@gBe@qA??a@aAs@sAs@_Ag@[??]KOAU?UBe@Pg@Zc@t@Qd@??OdAIjB?lBJrC??Bl@gAl@c@\\m@z@e@|@??m@jAWXq@l@I@g@Te@L??c@JWLWDy@OkA]??uAe@uBi@A?{B_@wBK??OAe@_@M[Kq@J}F??P{L??FqE|CM??hBKh@Gb@Q^U??`A{@??e@qAUa@o@m@??QWEQ?a@n@yARoA??\\cCJBD_@??f@uD??BMa@D??[Be@C?B???Cc@ESBMH??ITSpA??CV@VFLLH??bAZ\\HRAGb@In@?AWfBK^??k@pA?N???PDPHNRR??b@`@Zl@??^dAu@n@??k@`@c@PYD??wBL??sAF??kADBqB??HqF??F}ANkC??PiBTaB??t@qE??v@mE??x@oE??x@mE??t@cE??t@eE??`@aCn@R??jA\\T@??`AZ??O~@??e@nC??g@xC??e@lC??QhATJ?AbC|@??lBr@??fA`@d@H??lC`@??lC\\`AX??zCjAXXBN??RbAFbAEx@o@bI??CVxE[??tDWdAOj@O??d@KzCcAn@O??h@Gv@@zBH??lBDr@AF|A??NfDmCR??[JKJUd@G\\?nADjCAt@??IjB]zBa@tAi@nA??e@x@]b@wAtAs@h@??y@f@y@\\o@R_@H??WBy@BaAQIB[T??UPPxA@H?DHpAH|@??????DdB??@bB??@rA@FXMHIBa@?}@???oAGcB??c@B??G@I}@Cw@??AW", + "color": "#CF9FFF", + "type": "INBOUND", + "order": 6, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 5, + "name": "UCLUB", + "abbr": "UC", + "stops": [ + 61, + 63, + 64, + 65, + 66, + 67, + 68, + 69, + 134, + 1 + ], + "vType": "Bus", + "encLine": "yb{_GxatnMS_BWkA??a@{Ae@oA??a@cAcAgB??c@k@GEg@Yi@I??a@@UFUJg@Z??c@t@Ut@MdAGrB???tAJlC??Br@{@b@c@XUVY`@??}AxC?AWZq@l@I@]N??}Ad@??MFWDg@Iy@S??mAc@??kBi@??cAWu@K??y@MiAG??}@E_@YIKGO??Mw@FaD??HyF??HwF??HyF??HwF??DoCJkB??NsBViC??T_Bl@gD??fAcG??bAqF??bAsF??`AsF?@b@kCn@R??jA\\N?~@X??FB_@|BC???B?m@jD??m@nD??YfBTH??lE`B??jBp@rAT??hDd@??bALXFpAd@??pBv@XXJ`@A?Lp@FbAQ`C??a@nF??Eb@~DY??rEY??`AOpA[??tCaA??~@S^Ev@@h@B??~DJr@AHlB??LvC}BNWDSHKJ??Ud@G\\?nADjCAjAItA[pB??c@~Ae@hAi@~@gAnAm@h@w@l@??qAr@mA`@g@Ji@D_@?a@G??[GI?u@f@RzAH`BH|@M`A", + "color": "#BF40BF", + "type": "INBOUND", + "order": 7, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 12, + "name": "University Downtown Center Outbound", + "abbr": "UDC O", + "stops": [ + 1, + 21, + 42 + ], + "vType": "Bus", + "encLine": "sb{_GnitnMF`@LZ@nCO~CSxCUjBM|@AVIb@??y@lDUp@o@rA}@lAWVa@Tc@J??SCy@?aAAc@G{Aa@g@WYWi@m@e@o@e@aAQMg@mB??c@qBc@mDCY@e@G_BS{AD]G[??MSOIWDy@Ok@OuBs@{Aa@kAU??kAQgCMe@_@M[Kq@HcE??ZgU??NiKPaD`@_E??TgBdCeN??zCoPtAeI??xBkMn@oEX{A??dAsFh@cCd@kBzAcF??l@aBdEuK??bGsOn@yB??fAkEl@mDT}ANuA\\iE??|A{Z??d@iJ@oAC}AC_AU_De@wC??o@eCkHaT??w@{Bq@yBk@aCc@qC]qCk@{D??mDuV??e@wCWoBSo@Wa@GG_@Qa@EY@kFp@??qDb@cCVI@eAISIQO[e@Oq@??Cm@Hw@Vs@d@a@F@b@E`@D\\P^l@??FPHf@t@pL??RfEG~@ERQb@y@d@w@O@?cCc@IIs@M", + "color": "#FF7F50", + "type": "INBOUND", + "order": 8, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 13, + "name": "University Downtown Center Inbound", + "abbr": "UDC I", + "stops": [ + 21, + 32, + 118, + 1, + 61 + ], + "vType": "Bus", + "encLine": "qx|_G~~inMD@??zAX??AyE??E}D@u@???AfAe@n@Ov@MN@~AS??xGw@??~Ca@\\BVJPNLN??N^Jl@bAlH??xA`K??hB`M@?x@bGh@tCNl@??XdA`DfJ??dEzL??l@jB^`Bb@bDRxC??B|BCvA_@hI??{@nP??c@vIa@~E??_@vCe@nCa@fBy@|C??w@dCgEzK??kHdRoAhE??q@hC{@~DcAtFcA|G??UzAsBrK_B~I??eF~Y??a@dCQvA]|DMpCSlI??Y|X??G|El@AlBLpAJl@H??nB^dBd@|@f@`At@??h@b@NTxAjEV`CRrA??b@nBb@`BFb@^`AVb@v@|@`An@??f@R^JzAJl@?h@CNERKb@KJE`@Y??hA{AXg@^_Ah@sBXoAJk@@WD[??\\mCRyCNyC?EZOHIBa@AgA??@eAG_B?Ck@D??Ij@Cd@", + "color": "#FF7F50", + "type": "INBOUND", + "order": 9, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 14, + "name": "Main Street Outbound", + "abbr": "MS O", + "stops": [ + 1, + 2, + 3, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 155, + 78, + 12, + 132, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 21 + ], + "vType": "Bus", + "encLine": "sb{_GfitnMFh@LZ@nCO~C[`E??[`CAVEX}@vDk@|Ak@`A??y@bA_@VUHYFSCy@?}@A??cAQs@Qa@Q[S??OOkA|Bg@z@WV??kAnAy@l@mAr@cA^??q@VmAXuCj@YTMV??GJo@Ka@Ek@@sBH??iADHsFRaA??\\}@~AwB??n@}@Ri@Fc@?YCg@??I[O[OS[QYGoBE??mGQ??uHW??qAIoC]_B_@??qA]aA[aE_B??eJ{D??kH_DSWo@YAJeAg@q@e@{@w@gAkAeA_A??m@]o@YeAW{@IeA?_@D??{@Ny@Vm@VsDjB??mBbAkB|@o@RyAX??yADqD?KK[GUKSQ??SYKUMk@UuBK]Wg@[Ya@S[Ei@F??}ARIi@Ay@EmH??GaP??EgFBY?e@OmJ??KaFtGYlHa@OmCIaCIsD?kBCkCcEsCr@oCNSb@yA??|@eDd@{AiD@gCJoFR}DT}C`@s@mBa@gAi@uBOmAAuB?y@f@WXFxEvCz@b@a@|BMz@Ct@FnABXpBKbCIxCMdHQh@AFSjBkG??lCsJ`@}AAMd@}A??x@qCrCiIt@iB??lI_R??fFgLlByD??rImR??zIsR??zIqR?@pCeGr@gBV}@hAoF??h@}BTuA\\mC~AuNJB??KCrA_MDy@@sE????FcIjCd@??RHL?`@IVMLOJUJWHc@??JsAvATxB`@??|AZ", + "color": "#6495ED", + "type": "INBOUND", + "order": 10, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 15, + "name": "Main Street Inbound", + "abbr": "MS I", + "stops": [ + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 79, + 155, + 80, + 81, + 82, + 83, + 84, + 85, + 32, + 61, + 1 + ], + "vType": "Bus", + "encLine": "wv|_G~~inMyCk@??KC_@SwB_@A?}@OSFKtAI`@Uf@UV??IDg@NQHmB]??_@IItL???`BEx@c@vDM~A??sAhLGAF@y@vH]zB?A}BpK??W~@Wr@eBvD??yCtG??{CtG??yCtG??mAjC??uAxC?@gDnH??gDpH??gDpH??uAnCuA|C??gDpH??gDrH??gDnH??]|@_C~G??{@jCw@lCGDW~@??wCjK??oBjH{IRuH^iD`@y@Hg@qAk@{Ac@}AQ{@IcAAmA@kA\\WNGd@RtD`Cd@Vh@TShA]dBAn@BjAHp@zEYtGU`FIs@vB??sA|EGZs@jC?AAHfEjC?T??@pCDhD??RzH??@t@}DP??yFX??}BJIF?fA??DjFJ~F??@x@FXFtH??DzL??@dGDxBKl@?H??BzCTlG??DlA@`GdA@??lBAf@QLIVYP]Po@VsA??TcAZq@RSRMTGZC??XCNGpCE@?t@Ij@KbA]\\Q??`EuB??hAk@lCqA??`@Op@Ql@IfAA|@F??t@LRFhAj@f@\\t@t@??rBrB\\V|Av@??r@\\NLfFvB??dHvC??rErB??pB|@lBr@??THfBVxAP??xCTjAB??vCD~AH??pFN??tCJTJPNLRJX??BTBh@Gf@GRU^MHYJUBOA??SGWSS_@Ig@AiA??CKPwK??JaL??@IPo@DIRMXGjCR??dBT|@RdBf@??|@d@nA`A??ZVNT~@nC??Xz@V`CXhB??`AzDFb@^|@??Vf@v@|@x@j@~@\\??b@HfAFl@?h@CNERK??n@Q^Wx@cAh@}@??Vo@Tq@\\uA^aBDY@WL}@??TkBRyCLqC??@M????`@UDM@U???oCCeAC]_@BK@M~@?Z", + "color": "#6495ED", + "type": "INBOUND", + "order": 11, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 9, + "name": "Riviera Ridge - Town Square Mall", + "abbr": "RRT", + "stops": [ + 118, + 2, + 3, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 126, + 127, + 128, + 32, + 61, + 1 + ], + "vType": "Bus", + "encLine": "me{_GbysnMX|@d@vBRzAFxA??JdAFvC@nCC^??K~BSxCUjBM|@AV??e@zBi@rB_@~@Yf@m@x@??]b@_@Vo@PSCy@?aAAq@M??aAUa@Q_@UKMeBbD??MTcBfBy@l@mAr@??uBv@mAXsB`@??g@JSRUb@o@Ka@Ek@@iBF??sAF_@?MjM??EzBe@rL??q@nM??q@vM??KfDGvE??CnI??CfI??EhN?AFvFLrF??D`AXD~BInGa@??rJg@??rCOBbB??VzHPjI??NbJRhD??ZrEyEZ??UBoAZiF~B??}GzC??yC|AwA~@??{AlANbC??bA`P??H~AD^f@fA??F\\m@\\SN??CBFj@Bf@Mf@Kf@EXJX??FZ\\|@??t@fB??RXFDf@GNCIsA??OaC??OcC??MsB??C_@bAO??~AK??|AO??dAKLAMuB??OaC??QgC??OgC??QeC??OgC??OeC?AQcC??OoB??OuB??UkC??U{C??W{C??U{C??U{C??W{C?@U{C??W{C??U{C??Q}C?@MyC??GqC??AmC??CmC??@mC??@oC??BmC???mC??@kC???_B??@qB??@oB??@}B??DaC?@F}B@?A?J_C??JaC??L_C??L_C??J_C??L_C??LaC??L_C??J_C??H_C??J}B??F_C??F}B??D_C??BaC??BmB`AE??jBIA?|@Ah@F??f@HTc@XU??fB]??bB_@??~Ag@??l@Wh@[??b@Wl@c@??jAmA??b@c@j@aA??v@}Ax@j@z@Z??f@Jj@D??h@Br@C??TANERK^I@?LG^Wn@u@??Zg@l@oA??Vu@\\sA?A^aBDg@??VmB??RyB??NwB??JsB??@Y`@UDM@U???cC??EyAAU[BM@A?????Ij@Cf@", + "color": "#E37383", + "type": "INBOUND", + "order": 12, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 10, + "name": "Oakdale Commons", + "abbr": "OC", + "stops": [ + 118, + 2, + 3, + 129, + 130, + 32, + 61, + 1 + ], + "vType": "Bus", + "encLine": "me{_GdysnMBFf@jBR~@NhAHz@Bv@H|@FpD??@tBO~CSxCUjB??M|@AVEX}@vDk@|AYf@k@x@??_@b@_@Vo@PSCy@?aAAgAS??mAa@_@UKMkA|Bc@r@??gBnBy@l@mAr@QH??cBl@mAXoB^??k@LSRUb@o@Ka@E{BF??mBHDuB??B}BTcAZ{@rBqC??Zc@L[FUDu@Ek@Og@W_@OKSIQCe@A??{FO??kGQ??{CM{@GsAQ??{@KmAYcBc@yAg@??iCcA{DaB??gIkD??mD}AqCqA??k@a@mDkDm@c@??kAk@eAW{@IeA???aANs@NmAd@qAp@??sGdD??g@To@Ru@Pw@HsAB??uG@??}DGyA???_CAyCDg@BA?iBHsARqAXo@R??q@TyB|@eClA??cHnD??kD`BuBz@??uExB]JYDG^EpA??EtB@tBA`E???hAaBB??Y@Ut@Uf@]n@??UZWXu@f@e@Py@NeER?O???qCEc@??ASEEe@???iBBED??CNCbA??B~B???DfDCz@E??hCMx@OJE??XKt@g@VYT[??\\o@Tg@Ts@??zBGNFv@@??N?r@RRBlAE??n@EE}B??M{G??G_CSa@WZ??y@dAKTEVB~@??J~F??DvBSCs@S??WOWUISKu@@mA??FkF??D}ATi@??d@w@xAo@??pCyA??vCwA??vCuA??vCuA??tCwA??lCoA??~@a@zAg@??x@Q~AS??pAKdCC??|DA??fE???dE???dE???z@Al@EfAU??|@YxBgA??nDkB??|BiAt@Y??l@Ol@IfAAn@D??bANZJ`Af@t@h@??zC|Cj@^??dBx@\\RNLnAh@??jDvA??xD`B??xD`B??bEhB??p@ZpBr@TD??pAPvBTA?|BPdBD??|BBvAH??dFN??~ABhAFTJRP??Tf@DXBh@Gf@Sd@WVYJ_@@??OAWOSWIQIg@?_AEU??HeF??HeF??DgF????DoCPo@DIRMXG\\B??rBNjAP??|Bf@`AZ??t@`@bBpA??V\\\\~@j@hBN`@BX??b@lDd@tB??d@hBBXHTb@bAV`@?Al@r@x@j@x@ZTFn@D??j@Dl@?h@Cl@U??d@MTOVW|@kA??n@uAf@cB??j@eCDY@WF]??ZkCLiB??ToE??ZOHIBa@?a@???kBCw@?@Cm@k@D????Ij@Ch@", + "color": "#FFC000", + "type": "INBOUND", + "order": 13, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + }, + { + "id": 17, + "name": "Downtown Southside Outbound", + "abbr": "DSO", + "stops": [ + 136, + 137, + 1, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 154, + 150, + 151, + 153, + 21 + ], + "vType": "Bus", + "encLine": "ub{_GbitnM@?@VDTLZ?X@tBQtD??QbCUjBM|@AVEX}@vDk@|AYj@A?{@hAWVa@Tc@JSCy@?aAA_AQ_AWA?e@WYW??i@m@e@o@e@aAQMc@aBg@}BYyB??MmA@e@G_B??QuA@M@UAQMWKI??IEWDg@I??}@U}@[??_Cs@{@SoBYgCMe@_@M[??Kq@JmF??ToP??R{M??DsATgDZuC^gC??xBuL??fAeG??pAeHfC{N?AfAsGNgA??^gCz@sE??`@yB@A\\[^gA??n@kB??r@wBVo@j@iA??|BmE??`BkE??|BmG??fCaH??t@sBbB{F??xBsH??V}@\\gBLmAJoB?@TuD`@cE??|A_Q?A`@mEj@gF??V}C?@HsBMyEKaAUgAiAkD??mB{Go@qB??mE{M??gBsF?@}@qC??EOwCK??aDEuAG??[Gi@Sg@_@Y[Sc@Qc@gAsE??gCyL??i@uCk@eF??a@qEUoG??]mNK_C??mAuJqAkG??UmB_AaN??WiDuAcL??_AqH??Ky@mBp@??uFrB??uFrB??yGbC??eBr@s@`@}BzA??uEbDOH[F??e@LsEx@?rC@hBh@lFd@xEb@hCn@`D`@bCf@tCj@pCThAz@bF??TbB??BPEf@PpAjAnG??R`AJHNt@??ZfBb@jG??Dn@vAX??nB^??lB\\@?n@DzE???z@ATNO|B??IrA??CXR@jBZ??hDn@@?j@L", + "color": "#CECECE", + "type": "INBOUND", + "order": 15, + "showDirection": false, + "showPlatform": false, + "showScheduleNumber": 1, + "useCustomShape": 0, + "showVehicleCapacity": true + } +] diff --git a/src/client/data/stops.json b/src/client/data/stops.json new file mode 100644 index 0000000..3422042 --- /dev/null +++ b/src/client/data/stops.json @@ -0,0 +1,2082 @@ +[ + { + "rid": 1, + "rsid": 65539, + "id": 3, + "name": "Denny's (OB)", + "lat": 42.0944709777832, + "lng": -75.9753036499023, + "extID": "", + "shortName": "003" + }, + { + "rid": 1, + "rsid": 65541, + "id": 5, + "name": "Floral & Ackley (OB)", + "lat": 42.1073417663574, + "lng": -75.9604721069336, + "extID": "", + "shortName": "005" + }, + { + "rid": 1, + "rsid": 65545, + "id": 9, + "name": "Floral & Burbank (OB)", + "lat": 42.1084480285645, + "lng": -75.9524078369141, + "extID": "", + "shortName": "009" + }, + { + "rid": 1, + "rsid": 65546, + "id": 10, + "name": "Floral & Cleveland (OB)", + "lat": 42.1089553833008, + "lng": -75.9489822387695, + "extID": "", + "shortName": "010" + }, + { + "rid": 1, + "rsid": 65542, + "id": 6, + "name": "Floral & Harrison (OB)", + "lat": 42.1075897216797, + "lng": -75.9584808349609, + "extID": "", + "shortName": "006" + }, + { + "rid": 1, + "rsid": 65547, + "id": 11, + "name": "Floral & Main (OB)", + "lat": 42.1110305786133, + "lng": -75.9451065063477, + "extID": "", + "shortName": "011" + }, + { + "rid": 1, + "rsid": 65540, + "id": 4, + "name": "Floral & New York (OB)", + "lat": 42.1070404052734, + "lng": -75.9631576538086, + "extID": "", + "shortName": "004" + }, + { + "rid": 1, + "rsid": 65543, + "id": 7, + "name": "Floral & Roberts (OB)", + "lat": 42.1078758239746, + "lng": -75.9561309814453, + "extID": "", + "shortName": "007" + }, + { + "rid": 1, + "rsid": 65544, + "id": 8, + "name": "Floral & Willow (OB)", + "lat": 42.1081123352051, + "lng": -75.9543304443359, + "extID": "", + "shortName": "008" + }, + { + "rid": 1, + "rsid": 65556, + "id": 20, + "name": "Hawley & Court (OB)", + "lat": 42.098560333252, + "lng": -75.9147033691406, + "extID": "", + "shortName": "020" + }, + { + "rid": 1, + "rsid": 65553, + "id": 17, + "name": "Main & Arthur (OB)", + "lat": 42.1003913879395, + "lng": -75.9249649047852, + "extID": "", + "shortName": "017" + }, + { + "rid": 1, + "rsid": 65552, + "id": 16, + "name": "Main & Cedar (OB)", + "lat": 42.1022415161133, + "lng": -75.9286117553711, + "extID": "", + "shortName": "016" + }, + { + "rid": 1, + "rsid": 65551, + "id": 15, + "name": "Main & Clarke (OB)", + "lat": 42.1031761169434, + "lng": -75.930305480957, + "extID": "", + "shortName": "015" + }, + { + "rid": 1, + "rsid": 65668, + "id": 132, + "name": "Main & Crestmont (OB)", + "lat": 42.1082992553711, + "lng": -75.9395065307617, + "extID": "", + "shortName": "131" + }, + { + "rid": 1, + "rsid": 65555, + "id": 19, + "name": "Main & Front (OB)", + "lat": 42.098762512207, + "lng": -75.9179306030273, + "extID": "", + "shortName": "019" + }, + { + "rid": 1, + "rsid": 65549, + "id": 13, + "name": "Main & Helen (OB)", + "lat": 42.10693359375, + "lng": -75.9371109008789, + "extID": "", + "shortName": "013" + }, + { + "rid": 1, + "rsid": 65548, + "id": 12, + "name": "Main & Matthews (OB)", + "lat": 42.1095199584961, + "lng": -75.9418029785156, + "extID": "", + "shortName": "012" + }, + { + "rid": 1, + "rsid": 65554, + "id": 18, + "name": "Main & Murray (OB)", + "lat": 42.0994873046875, + "lng": -75.9216384887695, + "extID": "", + "shortName": "018" + }, + { + "rid": 1, + "rsid": 65550, + "id": 14, + "name": "Main & Schiller (OB)", + "lat": 42.1053428649902, + "lng": -75.9342346191406, + "extID": "", + "shortName": "014" + }, + { + "rid": 1, + "rsid": 65538, + "id": 2, + "name": "Physical Facilities (OB)", + "lat": 42.0913124084473, + "lng": -75.9737396240234, + "extID": "", + "shortName": "002" + }, + { + "rid": 1, + "rsid": 65557, + "id": 21, + "name": "University Downtown Center (South)", + "lat": 42.0956192016602, + "lng": -75.9142837524414, + "extID": "", + "shortName": "021" + }, + { + "rid": 1, + "rsid": 65537, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 2, + "rsid": 131104, + "id": 32, + "name": "Academic A", + "lat": 42.0887184143066, + "lng": -75.9731826782227, + "extID": "", + "shortName": "032" + }, + { + "rid": 2, + "rsid": 131115, + "id": 43, + "name": "Court & Hawley (IB)", + "lat": 42.0988121032715, + "lng": -75.9152603149414, + "extID": "", + "shortName": "042" + }, + { + "rid": 2, + "rsid": 131127, + "id": 55, + "name": "Floral & Burbank (IB)", + "lat": 42.1086578369141, + "lng": -75.9521331787109, + "extID": "", + "shortName": "054" + }, + { + "rid": 2, + "rsid": 131126, + "id": 54, + "name": "Floral & Cleveland (IB)", + "lat": 42.1091613769531, + "lng": -75.9487075805664, + "extID": "", + "shortName": "053" + }, + { + "rid": 2, + "rsid": 131132, + "id": 60, + "name": "Floral & Cook (IB)", + "lat": 42.1071891784668, + "lng": -75.9633865356445, + "extID": "", + "shortName": "059" + }, + { + "rid": 2, + "rsid": 131130, + "id": 58, + "name": "Floral & Harrison (IB)", + "lat": 42.1078033447266, + "lng": -75.9582290649414, + "extID": "", + "shortName": "057" + }, + { + "rid": 2, + "rsid": 131125, + "id": 53, + "name": "Floral & Main (IB)", + "lat": 42.1107978820801, + "lng": -75.9454498291016, + "extID": "", + "shortName": "052" + }, + { + "rid": 2, + "rsid": 131129, + "id": 57, + "name": "Floral & Roberts (IB)", + "lat": 42.1080780029297, + "lng": -75.9560165405273, + "extID": "", + "shortName": "056" + }, + { + "rid": 2, + "rsid": 131131, + "id": 59, + "name": "Floral & St Charles (IB)", + "lat": 42.1075286865234, + "lng": -75.9603729248047, + "extID": "", + "shortName": "058" + }, + { + "rid": 2, + "rsid": 131128, + "id": 56, + "name": "Floral & Willow (IB)", + "lat": 42.1083488464356, + "lng": -75.9540023803711, + "extID": "", + "shortName": "055" + }, + { + "rid": 2, + "rsid": 131119, + "id": 47, + "name": "Main & Cedar (IB)", + "lat": 42.1024131774902, + "lng": -75.9286041259766, + "extID": "", + "shortName": "046" + }, + { + "rid": 2, + "rsid": 131120, + "id": 48, + "name": "Main & Clarke (IB)", + "lat": 42.1032600402832, + "lng": -75.9301300048828, + "extID": "", + "shortName": "047" + }, + { + "rid": 2, + "rsid": 131124, + "id": 52, + "name": "Main & Crary (IB)", + "lat": 42.1099548339844, + "lng": -75.9422988891602, + "extID": "", + "shortName": "051" + }, + { + "rid": 2, + "rsid": 131123, + "id": 51, + "name": "Main & Crestmont (IB)", + "lat": 42.1090469360352, + "lng": -75.9406204223633, + "extID": "", + "shortName": "050" + }, + { + "rid": 2, + "rsid": 131116, + "id": 44, + "name": "Main & Front (IB)", + "lat": 42.0989456176758, + "lng": -75.9179763793945, + "extID": "", + "shortName": "043" + }, + { + "rid": 2, + "rsid": 131122, + "id": 50, + "name": "Main & Helen (IB)", + "lat": 42.1074371337891, + "lng": -75.9376220703125, + "extID": "", + "shortName": "049" + }, + { + "rid": 2, + "rsid": 131118, + "id": 46, + "name": "Main & Mather (IB)", + "lat": 42.1005592346191, + "lng": -75.9251327514648, + "extID": "", + "shortName": "045" + }, + { + "rid": 2, + "rsid": 131117, + "id": 45, + "name": "Main & Murray (IB)", + "lat": 42.0996780395508, + "lng": -75.9217681884766, + "extID": "", + "shortName": "044" + }, + { + "rid": 2, + "rsid": 131121, + "id": 49, + "name": "Main & Schiller (IB)", + "lat": 42.1051940917969, + "lng": -75.9335021972656, + "extID": "", + "shortName": "048" + }, + { + "rid": 2, + "rsid": 131133, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 2, + "rsid": 131190, + "id": 118, + "name": "Rafuse", + "lat": 42.0874557495117, + "lng": -75.9645919799805, + "extID": "", + "shortName": "117" + }, + { + "rid": 2, + "rsid": 131114, + "id": 42, + "name": "University Downtown Center (North)", + "lat": 42.0952110290527, + "lng": -75.9141998291016, + "extID": "", + "shortName": "042" + }, + { + "rid": 2, + "rsid": 131073, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 3, + "rsid": 196611, + "id": 3, + "name": "Denny's (OB)", + "lat": 42.0944709777832, + "lng": -75.9753036499023, + "extID": "", + "shortName": "003" + }, + { + "rid": 3, + "rsid": 196647, + "id": 39, + "name": "Leroy & Chestnut (OB)", + "lat": 42.0956840515137, + "lng": -75.9268417358398, + "extID": "", + "shortName": "039" + }, + { + "rid": 3, + "rsid": 196646, + "id": 38, + "name": "Leroy & Laurel (OB)", + "lat": 42.0954780578613, + "lng": -75.9309844970703, + "extID": "", + "shortName": "038" + }, + { + "rid": 3, + "rsid": 196648, + "id": 40, + "name": "Leroy & Murray (OB)", + "lat": 42.0954551696777, + "lng": -75.9226379394531, + "extID": "", + "shortName": "040" + }, + { + "rid": 3, + "rsid": 196610, + "id": 2, + "name": "Physical Facilities (OB)", + "lat": 42.0913124084473, + "lng": -75.9737396240234, + "extID": "", + "shortName": "002" + }, + { + "rid": 3, + "rsid": 196645, + "id": 37, + "name": "Riverside & Beethoven (OB)", + "lat": 42.0927467346191, + "lng": -75.9363174438477, + "extID": "", + "shortName": "037" + }, + { + "rid": 3, + "rsid": 196643, + "id": 35, + "name": "Riverside & Columbus (OB)", + "lat": 42.099292755127, + "lng": -75.9546966552734, + "extID": "", + "shortName": "035" + }, + { + "rid": 3, + "rsid": 196642, + "id": 34, + "name": "Riverside & Elfred (OB)", + "lat": 42.1003227233887, + "lng": -75.958869934082, + "extID": "", + "shortName": "034" + }, + { + "rid": 3, + "rsid": 196641, + "id": 33, + "name": "Riverside & Ethel (OB)", + "lat": 42.1020736694336, + "lng": -75.9613723754883, + "extID": "", + "shortName": "033" + }, + { + "rid": 3, + "rsid": 196649, + "id": 41, + "name": "Riverside & Front (OB)", + "lat": 42.0928115844727, + "lng": -75.9200973510742, + "extID": "", + "shortName": "041" + }, + { + "rid": 3, + "rsid": 196644, + "id": 36, + "name": "Riverside & Margaret (OB)", + "lat": 42.0980491638184, + "lng": -75.9492721557617, + "extID": "", + "shortName": "036" + }, + { + "rid": 3, + "rsid": 196650, + "id": 42, + "name": "University Downtown Center (North)", + "lat": 42.0952110290527, + "lng": -75.9141998291016, + "extID": "", + "shortName": "042" + }, + { + "rid": 3, + "rsid": 196609, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 4, + "rsid": 262176, + "id": 32, + "name": "Academic A", + "lat": 42.0887184143066, + "lng": -75.9731826782227, + "extID": "", + "shortName": "032" + }, + { + "rid": 4, + "rsid": 262170, + "id": 26, + "name": "Leroy & Beethoven (IB)", + "lat": 42.0954360961914, + "lng": -75.9344100952148, + "extID": "", + "shortName": "026" + }, + { + "rid": 4, + "rsid": 262168, + "id": 24, + "name": "Leroy & Chestnut (IB)", + "lat": 42.095817565918, + "lng": -75.9265670776367, + "extID": "", + "shortName": "024" + }, + { + "rid": 4, + "rsid": 262166, + "id": 22, + "name": "Leroy & Front (IB)", + "lat": 42.0950965881348, + "lng": -75.9193115234375, + "extID": "", + "shortName": "022" + }, + { + "rid": 4, + "rsid": 262169, + "id": 25, + "name": "Leroy & Laurel (IB)", + "lat": 42.0956192016602, + "lng": -75.930549621582, + "extID": "", + "shortName": "025" + }, + { + "rid": 4, + "rsid": 262167, + "id": 23, + "name": "Leroy & Murray (IB)", + "lat": 42.0955696105957, + "lng": -75.9226837158203, + "extID": "", + "shortName": "023" + }, + { + "rid": 4, + "rsid": 262205, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 4, + "rsid": 262262, + "id": 118, + "name": "Rafuse", + "lat": 42.0874557495117, + "lng": -75.9645919799805, + "extID": "", + "shortName": "117" + }, + { + "rid": 4, + "rsid": 262171, + "id": 27, + "name": "Riverside & Beethoven (IB)", + "lat": 42.0925369262695, + "lng": -75.9346694946289, + "extID": "", + "shortName": "027" + }, + { + "rid": 4, + "rsid": 262173, + "id": 29, + "name": "Riverside & Columbus (IB)", + "lat": 42.0994644165039, + "lng": -75.9548645019531, + "extID": "", + "shortName": "029" + }, + { + "rid": 4, + "rsid": 262174, + "id": 30, + "name": "Riverside & Elfred (IB)", + "lat": 42.1005401611328, + "lng": -75.9588394165039, + "extID": "", + "shortName": "030" + }, + { + "rid": 4, + "rsid": 262175, + "id": 31, + "name": "Riverside & Ethel (IB)", + "lat": 42.102222442627, + "lng": -75.9612274169922, + "extID": "", + "shortName": "031" + }, + { + "rid": 4, + "rsid": 262172, + "id": 28, + "name": "Riverside & Margaret (IB)", + "lat": 42.0981483459473, + "lng": -75.9491500854492, + "extID": "", + "shortName": "028" + }, + { + "rid": 4, + "rsid": 262165, + "id": 21, + "name": "University Downtown Center (South)", + "lat": 42.0956192016602, + "lng": -75.9142837524414, + "extID": "", + "shortName": "021" + }, + { + "rid": 4, + "rsid": 262145, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 5, + "rsid": 327744, + "id": 64, + "name": "Couper Administration", + "lat": 42.0896911621094, + "lng": -75.9657592773438, + "extID": "", + "shortName": "063" + }, + { + "rid": 5, + "rsid": 327745, + "id": 65, + "name": "East Gym", + "lat": 42.0909729003906, + "lng": -75.9673309326172, + "extID": "", + "shortName": "064" + }, + { + "rid": 5, + "rsid": 327748, + "id": 68, + "name": "Hayes", + "lat": 42.0882949829102, + "lng": -75.9564208984375, + "extID": "", + "shortName": "067" + }, + { + "rid": 5, + "rsid": 327747, + "id": 67, + "name": "Meadows", + "lat": 42.0893135070801, + "lng": -75.9558868408203, + "extID": "", + "shortName": "066" + }, + { + "rid": 5, + "rsid": 327741, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 5, + "rsid": 327743, + "id": 63, + "name": "Newing", + "lat": 42.0884552001953, + "lng": -75.9628753662109, + "extID": "", + "shortName": "062" + }, + { + "rid": 5, + "rsid": 327814, + "id": 134, + "name": "Oxford & Murray Hill", + "lat": 42.0882606506348, + "lng": -75.959098815918, + "extID": "", + "shortName": "133" + }, + { + "rid": 5, + "rsid": 327746, + "id": 66, + "name": "UCLUB", + "lat": 42.0924949645996, + "lng": -75.9538421630859, + "extID": "", + "shortName": "065" + }, + { + "rid": 5, + "rsid": 327681, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 5, + "rsid": 327749, + "id": 69, + "name": "Washington & Lehigh", + "lat": 42.0825347900391, + "lng": -75.9595413208008, + "extID": "", + "shortName": "068" + }, + { + "rid": 8, + "rsid": 524400, + "id": 112, + "name": "Clearview", + "lat": 42.0890884399414, + "lng": -75.9744415283203, + "extID": "", + "shortName": "111" + }, + { + "rid": 8, + "rsid": 524352, + "id": 64, + "name": "Couper Administration", + "lat": 42.0896911621094, + "lng": -75.9657592773438, + "extID": "", + "shortName": "063" + }, + { + "rid": 8, + "rsid": 524350, + "id": 62, + "name": "Dickinson", + "lat": 42.0872459411621, + "lng": -75.9648284912109, + "extID": "", + "shortName": "061" + }, + { + "rid": 8, + "rsid": 524353, + "id": 65, + "name": "East Gym", + "lat": 42.0909729003906, + "lng": -75.9673309326172, + "extID": "", + "shortName": "064" + }, + { + "rid": 8, + "rsid": 524405, + "id": 117, + "name": "Engineering Building", + "lat": 42.0868263244629, + "lng": -75.96826171875, + "extID": "", + "shortName": "116" + }, + { + "rid": 8, + "rsid": 524402, + "id": 114, + "name": "Hillside", + "lat": 42.0871200561523, + "lng": -75.9782333374023, + "extID": "", + "shortName": "113" + }, + { + "rid": 8, + "rsid": 524404, + "id": 116, + "name": "Hinman", + "lat": 42.0883369445801, + "lng": -75.9731369018555, + "extID": "", + "shortName": "115" + }, + { + "rid": 8, + "rsid": 524349, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 8, + "rsid": 524403, + "id": 115, + "name": "Mountainview", + "lat": 42.0840263366699, + "lng": -75.9703369140625, + "extID": "", + "shortName": "114" + }, + { + "rid": 8, + "rsid": 524351, + "id": 63, + "name": "Newing", + "lat": 42.0884552001953, + "lng": -75.9628753662109, + "extID": "", + "shortName": "062" + }, + { + "rid": 8, + "rsid": 524399, + "id": 111, + "name": "Physical Facilities (CS)", + "lat": 42.0915908813477, + "lng": -75.9739151000977, + "extID": "", + "shortName": "110" + }, + { + "rid": 8, + "rsid": 524401, + "id": 113, + "name": "Susquehanna", + "lat": 42.0862503051758, + "lng": -75.9744262695313, + "extID": "", + "shortName": "112" + }, + { + "rid": 8, + "rsid": 524289, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 8, + "rsid": 524398, + "id": 110, + "name": "West Gym", + "lat": 42.091724395752, + "lng": -75.9711837768555, + "extID": "", + "shortName": "109" + }, + { + "rid": 9, + "rsid": 589856, + "id": 32, + "name": "Academic A", + "lat": 42.0887184143066, + "lng": -75.9731826782227, + "extID": "", + "shortName": "032" + }, + { + "rid": 9, + "rsid": 589949, + "id": 125, + "name": "Barnes & Noble", + "lat": 42.0970573425293, + "lng": -76.0077590942383, + "extID": "", + "shortName": "124" + }, + { + "rid": 9, + "rsid": 589947, + "id": 123, + "name": "Burris & Rano", + "lat": 42.0915031433106, + "lng": -76.0025329589844, + "extID": "", + "shortName": "122" + }, + { + "rid": 9, + "rsid": 589943, + "id": 119, + "name": "Chuck E. Cheese", + "lat": 42.0961303710938, + "lng": -75.9792327880859, + "extID": "", + "shortName": "118" + }, + { + "rid": 9, + "rsid": 589951, + "id": 127, + "name": "Denny's (IB)", + "lat": 42.0949859619141, + "lng": -75.9754943847656, + "extID": "", + "shortName": "126" + }, + { + "rid": 9, + "rsid": 589827, + "id": 3, + "name": "Denny's (OB)", + "lat": 42.0944709777832, + "lng": -75.9753036499023, + "extID": "", + "shortName": "003" + }, + { + "rid": 9, + "rsid": 589946, + "id": 122, + "name": "Hollybrook", + "lat": 42.0917320251465, + "lng": -76.0001907348633, + "extID": "", + "shortName": "121" + }, + { + "rid": 9, + "rsid": 589885, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 9, + "rsid": 589952, + "id": 128, + "name": "Physical Facilities (IB)", + "lat": 42.0917854309082, + "lng": -75.9744415283203, + "extID": "", + "shortName": "127" + }, + { + "rid": 9, + "rsid": 589826, + "id": 2, + "name": "Physical Facilities (OB)", + "lat": 42.0913124084473, + "lng": -75.9737396240234, + "extID": "", + "shortName": "002" + }, + { + "rid": 9, + "rsid": 589942, + "id": 118, + "name": "Rafuse", + "lat": 42.0874557495117, + "lng": -75.9645919799805, + "extID": "", + "shortName": "117" + }, + { + "rid": 9, + "rsid": 589944, + "id": 120, + "name": "Riviera Ridge 1", + "lat": 42.0938186645508, + "lng": -75.9955215454102, + "extID": "", + "shortName": "119" + }, + { + "rid": 9, + "rsid": 589945, + "id": 121, + "name": "Riviera Ridge 2", + "lat": 42.0919227600098, + "lng": -75.9965744018555, + "extID": "", + "shortName": "120" + }, + { + "rid": 9, + "rsid": 589948, + "id": 124, + "name": "Target", + "lat": 42.0932884216309, + "lng": -76.0030288696289, + "extID": "", + "shortName": "123" + }, + { + "rid": 9, + "rsid": 589825, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 9, + "rsid": 589950, + "id": 126, + "name": "Walmart", + "lat": 42.0965156555176, + "lng": -76.0124588012695, + "extID": "", + "shortName": "125" + }, + { + "rid": 10, + "rsid": 655392, + "id": 32, + "name": "Academic A", + "lat": 42.0887184143066, + "lng": -75.9731826782227, + "extID": "", + "shortName": "032" + }, + { + "rid": 10, + "rsid": 655363, + "id": 3, + "name": "Denny's (OB)", + "lat": 42.0944709777832, + "lng": -75.9753036499023, + "extID": "", + "shortName": "003" + }, + { + "rid": 10, + "rsid": 655421, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 10, + "rsid": 655489, + "id": 129, + "name": "Oakdale Commons", + "lat": 42.1278686523438, + "lng": -75.9751510620117, + "extID": "", + "shortName": "128" + }, + { + "rid": 10, + "rsid": 655362, + "id": 2, + "name": "Physical Facilities (OB)", + "lat": 42.0913124084473, + "lng": -75.9737396240234, + "extID": "", + "shortName": "002" + }, + { + "rid": 10, + "rsid": 655478, + "id": 118, + "name": "Rafuse", + "lat": 42.0874557495117, + "lng": -75.9645919799805, + "extID": "", + "shortName": "117" + }, + { + "rid": 10, + "rsid": 655361, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 10, + "rsid": 655490, + "id": 130, + "name": "Wegman's", + "lat": 42.1232643127441, + "lng": -75.9725646972656, + "extID": "", + "shortName": "129" + }, + { + "rid": 11, + "rsid": 720928, + "id": 32, + "name": "Academic A", + "lat": 42.0887184143066, + "lng": -75.9731826782227, + "extID": "", + "shortName": "032" + }, + { + "rid": 11, + "rsid": 720957, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 11, + "rsid": 721014, + "id": 118, + "name": "Rafuse", + "lat": 42.0874557495117, + "lng": -75.9645919799805, + "extID": "", + "shortName": "117" + }, + { + "rid": 11, + "rsid": 721029, + "id": 133, + "name": "Stone Fox Courtyard", + "lat": 42.0972938537598, + "lng": -75.913215637207, + "extID": "", + "shortName": "132" + }, + { + "rid": 11, + "rsid": 720962, + "id": 66, + "name": "UCLUB", + "lat": 42.0924949645996, + "lng": -75.9538421630859, + "extID": "", + "shortName": "065" + }, + { + "rid": 11, + "rsid": 720897, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 12, + "rsid": 786474, + "id": 42, + "name": "University Downtown Center (North)", + "lat": 42.0952110290527, + "lng": -75.9141998291016, + "extID": "", + "shortName": "042" + }, + { + "rid": 12, + "rsid": 786453, + "id": 21, + "name": "University Downtown Center (South)", + "lat": 42.0956192016602, + "lng": -75.9142837524414, + "extID": "", + "shortName": "021" + }, + { + "rid": 12, + "rsid": 786433, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 13, + "rsid": 852000, + "id": 32, + "name": "Academic A", + "lat": 42.0887184143066, + "lng": -75.9731826782227, + "extID": "", + "shortName": "032" + }, + { + "rid": 13, + "rsid": 852029, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 13, + "rsid": 852086, + "id": 118, + "name": "Rafuse", + "lat": 42.0874557495117, + "lng": -75.9645919799805, + "extID": "", + "shortName": "117" + }, + { + "rid": 13, + "rsid": 851989, + "id": 21, + "name": "University Downtown Center (South)", + "lat": 42.0956192016602, + "lng": -75.9142837524414, + "extID": "", + "shortName": "021" + }, + { + "rid": 13, + "rsid": 851969, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 14, + "rsid": 917507, + "id": 3, + "name": "Denny's (OB)", + "lat": 42.0944709777832, + "lng": -75.9753036499023, + "extID": "", + "shortName": "003" + }, + { + "rid": 14, + "rsid": 917659, + "id": 155, + "name": "Gannett Building", + "lat": 42.1168785095215, + "lng": -75.9485626220703, + "extID": "", + "shortName": "150" + }, + { + "rid": 14, + "rsid": 917580, + "id": 76, + "name": "Jennison & Main (OB)", + "lat": 42.1139984130859, + "lng": -75.9527130126953, + "extID": "", + "shortName": "075" + }, + { + "rid": 14, + "rsid": 917575, + "id": 71, + "name": "Main & Albert (OB)", + "lat": 42.115650177002, + "lng": -75.9637298583984, + "extID": "", + "shortName": "070" + }, + { + "rid": 14, + "rsid": 917521, + "id": 17, + "name": "Main & Arthur (OB)", + "lat": 42.1003913879395, + "lng": -75.9249649047852, + "extID": "", + "shortName": "017" + }, + { + "rid": 14, + "rsid": 917574, + "id": 70, + "name": "Main & Baker (OB)", + "lat": 42.1155662536621, + "lng": -75.9657745361328, + "extID": "", + "shortName": "069" + }, + { + "rid": 14, + "rsid": 917577, + "id": 73, + "name": "Main & Baldwin (OB)", + "lat": 42.1157684326172, + "lng": -75.9587860107422, + "extID": "", + "shortName": "072" + }, + { + "rid": 14, + "rsid": 917520, + "id": 16, + "name": "Main & Cedar (OB)", + "lat": 42.1022415161133, + "lng": -75.9286117553711, + "extID": "", + "shortName": "016" + }, + { + "rid": 14, + "rsid": 917519, + "id": 15, + "name": "Main & Clarke (OB)", + "lat": 42.1031761169434, + "lng": -75.930305480957, + "extID": "", + "shortName": "015" + }, + { + "rid": 14, + "rsid": 917636, + "id": 132, + "name": "Main & Crestmont (OB)", + "lat": 42.1082992553711, + "lng": -75.9395065307617, + "extID": "", + "shortName": "131" + }, + { + "rid": 14, + "rsid": 917582, + "id": 78, + "name": "Main & Floral (OB)", + "lat": 42.1114006042481, + "lng": -75.9456634521484, + "extID": "", + "shortName": "077" + }, + { + "rid": 14, + "rsid": 917523, + "id": 19, + "name": "Main & Front (OB)", + "lat": 42.098762512207, + "lng": -75.9179306030273, + "extID": "", + "shortName": "019" + }, + { + "rid": 14, + "rsid": 917517, + "id": 13, + "name": "Main & Helen (OB)", + "lat": 42.10693359375, + "lng": -75.9371109008789, + "extID": "", + "shortName": "013" + }, + { + "rid": 14, + "rsid": 917581, + "id": 77, + "name": "Main & Lester (OB)", + "lat": 42.113338470459, + "lng": -75.9506759643555, + "extID": "", + "shortName": "076" + }, + { + "rid": 14, + "rsid": 917516, + "id": 12, + "name": "Main & Matthews (OB)", + "lat": 42.1095199584961, + "lng": -75.9418029785156, + "extID": "", + "shortName": "012" + }, + { + "rid": 14, + "rsid": 917522, + "id": 18, + "name": "Main & Murray (OB)", + "lat": 42.0994873046875, + "lng": -75.9216384887695, + "extID": "", + "shortName": "018" + }, + { + "rid": 14, + "rsid": 917518, + "id": 14, + "name": "Main & Schiller (OB)", + "lat": 42.1053428649902, + "lng": -75.9342346191406, + "extID": "", + "shortName": "014" + }, + { + "rid": 14, + "rsid": 917576, + "id": 72, + "name": "Main & St Charles (OB)", + "lat": 42.1156997680664, + "lng": -75.9615707397461, + "extID": "", + "shortName": "071" + }, + { + "rid": 14, + "rsid": 917579, + "id": 75, + "name": "Nursing School", + "lat": 42.1131401062012, + "lng": -75.9540100097656, + "extID": "", + "shortName": "074" + }, + { + "rid": 14, + "rsid": 917578, + "id": 74, + "name": "Pharmacy School (OB)", + "lat": 42.1130180358887, + "lng": -75.9561386108398, + "extID": "", + "shortName": "073" + }, + { + "rid": 14, + "rsid": 917506, + "id": 2, + "name": "Physical Facilities (OB)", + "lat": 42.0913124084473, + "lng": -75.9737396240234, + "extID": "", + "shortName": "002" + }, + { + "rid": 14, + "rsid": 917525, + "id": 21, + "name": "University Downtown Center (South)", + "lat": 42.0956192016602, + "lng": -75.9142837524414, + "extID": "", + "shortName": "021" + }, + { + "rid": 14, + "rsid": 917505, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 15, + "rsid": 983072, + "id": 32, + "name": "Academic A", + "lat": 42.0887184143066, + "lng": -75.9731826782227, + "extID": "", + "shortName": "032" + }, + { + "rid": 15, + "rsid": 983083, + "id": 43, + "name": "Court & Hawley (IB)", + "lat": 42.0988121032715, + "lng": -75.9152603149414, + "extID": "", + "shortName": "042" + }, + { + "rid": 15, + "rsid": 983195, + "id": 155, + "name": "Gannett Building", + "lat": 42.1168785095215, + "lng": -75.9485626220703, + "extID": "", + "shortName": "150" + }, + { + "rid": 15, + "rsid": 983125, + "id": 85, + "name": "Main & 1st (IB)", + "lat": 42.1157722473145, + "lng": -75.9642333984375, + "extID": "", + "shortName": "084" + }, + { + "rid": 15, + "rsid": 983123, + "id": 83, + "name": "Main & Baldwin (IB)", + "lat": 42.1159133911133, + "lng": -75.9584121704102, + "extID": "", + "shortName": "082" + }, + { + "rid": 15, + "rsid": 983087, + "id": 47, + "name": "Main & Cedar (IB)", + "lat": 42.1024131774902, + "lng": -75.9286041259766, + "extID": "", + "shortName": "046" + }, + { + "rid": 15, + "rsid": 983088, + "id": 48, + "name": "Main & Clarke (IB)", + "lat": 42.1032600402832, + "lng": -75.9301300048828, + "extID": "", + "shortName": "047" + }, + { + "rid": 15, + "rsid": 983091, + "id": 51, + "name": "Main & Crestmont (IB)", + "lat": 42.1090469360352, + "lng": -75.9406204223633, + "extID": "", + "shortName": "050" + }, + { + "rid": 15, + "rsid": 983119, + "id": 79, + "name": "Main & Floral (IB)", + "lat": 42.1114387512207, + "lng": -75.9454345703125, + "extID": "", + "shortName": "078" + }, + { + "rid": 15, + "rsid": 983084, + "id": 44, + "name": "Main & Front (IB)", + "lat": 42.0989456176758, + "lng": -75.9179763793945, + "extID": "", + "shortName": "043" + }, + { + "rid": 15, + "rsid": 983090, + "id": 50, + "name": "Main & Helen (IB)", + "lat": 42.1074371337891, + "lng": -75.9376220703125, + "extID": "", + "shortName": "049" + }, + { + "rid": 15, + "rsid": 983120, + "id": 80, + "name": "Main & Lester (IB)", + "lat": 42.1134567260742, + "lng": -75.9506149291992, + "extID": "", + "shortName": "079" + }, + { + "rid": 15, + "rsid": 983086, + "id": 46, + "name": "Main & Mather (IB)", + "lat": 42.1005592346191, + "lng": -75.9251327514648, + "extID": "", + "shortName": "045" + }, + { + "rid": 15, + "rsid": 983085, + "id": 45, + "name": "Main & Murray (IB)", + "lat": 42.0996780395508, + "lng": -75.9217681884766, + "extID": "", + "shortName": "044" + }, + { + "rid": 15, + "rsid": 983089, + "id": 49, + "name": "Main & Schiller (IB)", + "lat": 42.1051940917969, + "lng": -75.9335021972656, + "extID": "", + "shortName": "048" + }, + { + "rid": 15, + "rsid": 983124, + "id": 84, + "name": "Main & St Charles (IB)", + "lat": 42.1158065795898, + "lng": -75.9617767333984, + "extID": "", + "shortName": "083" + }, + { + "rid": 15, + "rsid": 983101, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 15, + "rsid": 983121, + "id": 81, + "name": "Nursing School (IB)", + "lat": 42.1133270263672, + "lng": -75.953369140625, + "extID": "", + "shortName": "080" + }, + { + "rid": 15, + "rsid": 983122, + "id": 82, + "name": "Pharmacy School (IB)", + "lat": 42.113166809082, + "lng": -75.955680847168, + "extID": "", + "shortName": "081" + }, + { + "rid": 15, + "rsid": 983082, + "id": 42, + "name": "University Downtown Center (North)", + "lat": 42.0952110290527, + "lng": -75.9141998291016, + "extID": "", + "shortName": "042" + }, + { + "rid": 15, + "rsid": 983041, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 16, + "rsid": 1048640, + "id": 64, + "name": "Couper Administration", + "lat": 42.0896911621094, + "lng": -75.9657592773438, + "extID": "", + "shortName": "063" + }, + { + "rid": 16, + "rsid": 1048641, + "id": 65, + "name": "East Gym", + "lat": 42.0909729003906, + "lng": -75.9673309326172, + "extID": "", + "shortName": "064" + }, + { + "rid": 16, + "rsid": 1048644, + "id": 68, + "name": "Hayes", + "lat": 42.0882949829102, + "lng": -75.9564208984375, + "extID": "", + "shortName": "067" + }, + { + "rid": 16, + "rsid": 1048685, + "id": 109, + "name": "Innovative Technology Center", + "lat": 42.0933609008789, + "lng": -75.9588241577148, + "extID": "", + "shortName": "108" + }, + { + "rid": 16, + "rsid": 1048643, + "id": 67, + "name": "Meadows", + "lat": 42.0893135070801, + "lng": -75.9558868408203, + "extID": "", + "shortName": "066" + }, + { + "rid": 16, + "rsid": 1048637, + "id": 61, + "name": "Mohawk", + "lat": 42.0869369506836, + "lng": -75.965934753418, + "extID": "", + "shortName": "060" + }, + { + "rid": 16, + "rsid": 1048639, + "id": 63, + "name": "Newing", + "lat": 42.0884552001953, + "lng": -75.9628753662109, + "extID": "", + "shortName": "062" + }, + { + "rid": 16, + "rsid": 1048710, + "id": 134, + "name": "Oxford & Murray Hill", + "lat": 42.0882606506348, + "lng": -75.959098815918, + "extID": "", + "shortName": "133" + }, + { + "rid": 16, + "rsid": 1048642, + "id": 66, + "name": "UCLUB", + "lat": 42.0924949645996, + "lng": -75.9538421630859, + "extID": "", + "shortName": "065" + }, + { + "rid": 16, + "rsid": 1048645, + "id": 69, + "name": "Washington & Lehigh", + "lat": 42.0825347900391, + "lng": -75.9595413208008, + "extID": "", + "shortName": "068" + }, + { + "rid": 17, + "rsid": 1114263, + "id": 151, + "name": "BC Junction", + "lat": 42.100715637207, + "lng": -75.9108123779297, + "extID": "", + "shortName": "146" + }, + { + "rid": 17, + "rsid": 1114257, + "id": 145, + "name": "Conklin Ave & Alfred St", + "lat": 42.0942420959473, + "lng": -75.8978652954102, + "extID": "", + "shortName": "143" + }, + { + "rid": 17, + "rsid": 1114254, + "id": 142, + "name": "Conklin Ave & Livingston St", + "lat": 42.0926666259766, + "lng": -75.9086074829102, + "extID": "", + "shortName": "140" + }, + { + "rid": 17, + "rsid": 1114252, + "id": 140, + "name": "Conklin Ave & S Washington St", + "lat": 42.0913009643555, + "lng": -75.9144821166992, + "extID": "", + "shortName": "139" + }, + { + "rid": 17, + "rsid": 1114256, + "id": 144, + "name": "Conklin Ave & Telegraph St", + "lat": 42.0936088562012, + "lng": -75.9018707275391, + "extID": "", + "shortName": "142" + }, + { + "rid": 17, + "rsid": 1114253, + "id": 141, + "name": "Conklin Ave & Tremont Ave", + "lat": 42.0924530029297, + "lng": -75.9100799560547, + "extID": "", + "shortName": "139" + }, + { + "rid": 17, + "rsid": 1114260, + "id": 148, + "name": "Conklin Ave & Webster St", + "lat": 42.0991363525391, + "lng": -75.8955841064453, + "extID": "", + "shortName": "146" + }, + { + "rid": 17, + "rsid": 1114266, + "id": 154, + "name": "Henry St & Liberty St", + "lat": 42.1034736633301, + "lng": -75.8997039794922, + "extID": "", + "shortName": "149" + }, + { + "rid": 17, + "rsid": 1114262, + "id": 150, + "name": "Henry St & Mirabito Stadium", + "lat": 42.1019439697266, + "lng": -75.9059600830078, + "extID": "", + "shortName": "148" + }, + { + "rid": 17, + "rsid": 1114255, + "id": 143, + "name": "Park Diner East", + "lat": 42.0928993225098, + "lng": -75.9050369262695, + "extID": "", + "shortName": "141" + }, + { + "rid": 17, + "rsid": 1114265, + "id": 153, + "name": "State St & Court St", + "lat": 42.0988464355469, + "lng": -75.9125595092773, + "extID": "", + "shortName": "148" + }, + { + "rid": 17, + "rsid": 1114259, + "id": 147, + "name": "Tomkins St & Jackson St", + "lat": 42.0978393554688, + "lng": -75.8949890136719, + "extID": "", + "shortName": "145" + }, + { + "rid": 17, + "rsid": 1114258, + "id": 146, + "name": "Tompkins St & Conklin Ave", + "lat": 42.0953330993652, + "lng": -75.8938217163086, + "extID": "", + "shortName": "144" + }, + { + "rid": 17, + "rsid": 1114133, + "id": 21, + "name": "University Downtown Center (South)", + "lat": 42.0956192016602, + "lng": -75.9142837524414, + "extID": "", + "shortName": "021" + }, + { + "rid": 17, + "rsid": 1114113, + "id": 1, + "name": "University Union", + "lat": 42.0870208740234, + "lng": -75.9670791625977, + "extID": "", + "shortName": "001" + }, + { + "rid": 17, + "rsid": 1114250, + "id": 138, + "name": "Vestal Ave & Brookfield", + "lat": 42.0857315063477, + "lng": -75.921875, + "extID": "", + "shortName": "137" + }, + { + "rid": 17, + "rsid": 1114249, + "id": 137, + "name": "Vestal Ave & Hawthorne", + "lat": 42.0860786437988, + "lng": -75.933235168457, + "extID": "", + "shortName": "136" + }, + { + "rid": 17, + "rsid": 1114248, + "id": 136, + "name": "Vestal Ave & Larchmont", + "lat": 42.0891876220703, + "lng": -75.9416580200195, + "extID": "", + "shortName": "135" + }, + { + "rid": 17, + "rsid": 1114251, + "id": 139, + "name": "Vestal Ave & Rush Ave", + "lat": 42.0871887207031, + "lng": -75.9185256958008, + "extID": "", + "shortName": "138" + } +] diff --git a/src/client/lib/data.dart b/src/client/lib/data.dart new file mode 100644 index 0000000..4576903 --- /dev/null +++ b/src/client/lib/data.dart @@ -0,0 +1,4 @@ +export "src/data/utils.dart"; +export "src/data/trip.dart"; +export "src/data/path.dart"; +export "src/data/stop.dart"; diff --git a/src/client/lib/main.dart b/src/client/lib/main.dart new file mode 100644 index 0000000..00e0629 --- /dev/null +++ b/src/client/lib/main.dart @@ -0,0 +1,27 @@ +import "package:flutter/material.dart"; + +import "package:client/models.dart"; +import "package:client/pages.dart"; +import "package:client/services.dart"; + +Future main() async { + await services.init(); + await models.init(); + await models.initFromOthers(); + runApp(const ClientApp()); +} + +/// The main app widget. +class ClientApp extends StatelessWidget { + /// A const constructor. + const ClientApp(); + + @override + Widget build(BuildContext context) => MaterialApp.router( + title: "Flutter Demo", + theme: ThemeData( + useMaterial3: true, + ), + routerConfig: router, + ); +} diff --git a/src/client/lib/models.dart b/src/client/lib/models.dart new file mode 100644 index 0000000..913f4a3 --- /dev/null +++ b/src/client/lib/models.dart @@ -0,0 +1,31 @@ +import "src/models/model.dart"; + +export "src/models/model.dart"; + +/// A [DataModel] to manage all other data models. +class Models extends DataModel { + /// Prevents other instances of this class from being created. + Models._(); + + // List your models here + + /// A list of all models to manage. + List get models => []; + + @override + Future init() async { + for (final model in models) { + await model.init(); + } + } + + @override + Future initFromOthers() async { + for (final model in models) { + await model.initFromOthers(); + } + } +} + +/// The global data model singleton. +final models = Models._(); diff --git a/src/client/lib/pages.dart b/src/client/lib/pages.dart new file mode 100644 index 0000000..d7120d8 --- /dev/null +++ b/src/client/lib/pages.dart @@ -0,0 +1,22 @@ +import "package:go_router/go_router.dart"; +export "package:go_router/go_router.dart"; + +import "src/pages/home.dart"; + +/// Contains all the routes for this app. +class Routes { + /// The route for the home page. + static const home = "/"; +} + +/// The router for the app. +final router = GoRouter( + initialLocation: Routes.home, + routes: [ + GoRoute( + path: Routes.home, + name: Routes.home, + builder: (_, __) => HomePage(), + ), + ], +); diff --git a/src/client/lib/services.dart b/src/client/lib/services.dart new file mode 100644 index 0000000..dfb2dbe --- /dev/null +++ b/src/client/lib/services.dart @@ -0,0 +1,27 @@ +/// Defines and manages the different services used by the app. +library; + +import "src/services/api.dart"; +import "src/services/service.dart"; + +/// A [Service] that manages all other services used by the app. +class Services extends Service { + /// Prevents other instances of this class from being created. + Services._(); + + // Define your services here + final api = ApiService(); + + /// The different services to initialize, in this order. + List get services => [api]; + + @override + Future init() async { + for (final service in services) { + await service.init(); + } + } +} + +/// The global services object. +final services = Services._(); diff --git a/src/client/lib/src/data/path.dart b/src/client/lib/src/data/path.dart new file mode 100644 index 0000000..cd28af7 --- /dev/null +++ b/src/client/lib/src/data/path.dart @@ -0,0 +1,15 @@ +import "trip.dart"; +import "utils.dart"; + +class PathStep { + final Trip trip; + final TripStop enter; + final TripStop exit; + + PathStep.fromJson(Json json) : + trip = Trip.fromJson(json["trip"]), + enter = TripStop.fromJson(json["enter_bus"]), + exit = TripStop.fromJson(json["exit_bus"]); +} + +typedef Path = List; diff --git a/src/client/lib/src/data/stop.dart b/src/client/lib/src/data/stop.dart new file mode 100644 index 0000000..ccabbe3 --- /dev/null +++ b/src/client/lib/src/data/stop.dart @@ -0,0 +1,13 @@ +import "trip.dart"; +import "utils.dart"; + +class Stop { + final double latitude; + final double longitude; + final List trips; + + Stop.fromJson(Json json) : + latitude = json["latitude"], + longitude = json["longitude"], + trips = json["trips"]; +} diff --git a/src/client/lib/src/data/trip.dart b/src/client/lib/src/data/trip.dart new file mode 100644 index 0000000..434ed74 --- /dev/null +++ b/src/client/lib/src/data/trip.dart @@ -0,0 +1,71 @@ +import "utils.dart"; + +import "package:flutter/material.dart" show TimeOfDay; + +extension type TripID(String id) { } +extension type StopID(String id) { } + +class Trip { + final List stops; + final String path; + final String name; + final String abbrev; + final String polyline; + + const Trip({ + required this.stops, + required this.path, + required this.name, + required this.abbrev, + required this.polyline, + }); + + Trip.fromJson(Json json) : + stops = [ + for (final stop in json["stops"]) + TripStop.fromJson(stop), + ], + path = json["path"], + name = json["name"], + abbrev = json["abbrev"], + polyline = json["polyline"]; +} + +class TripStop { + final double lat; + final double long; + final List times; + + const TripStop({ + required this.lat, + required this.long, + required this.times, + }); + + TripStop.fromJson(Json json) : + lat = json["latitude"], + long = json["longitude"], + times = [ + for (final time in json["times"]) + ScheduledTime.fromJson(time), + ]; +} + +class ScheduledTime { + static const weekdays = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"]; + + final String weekday; + final TimeOfDay timeOfDay; + + const ScheduledTime({ + required this.weekday, + required this.timeOfDay, + }); + + factory ScheduledTime.fromJson(Json json) { + final weekday = json["dotw"]; + final [hour, minute] = (json["time"] as String).split(":"); + final timeOfDay = TimeOfDay(hour: int.parse(hour), minute: int.parse(minute)); + return ScheduledTime(weekday: weekday, timeOfDay: timeOfDay); + } +} diff --git a/src/client/lib/src/data/utils.dart b/src/client/lib/src/data/utils.dart new file mode 100644 index 0000000..9734124 --- /dev/null +++ b/src/client/lib/src/data/utils.dart @@ -0,0 +1,30 @@ +/// A JSON object +typedef Json = Map; + +typedef FromJson = T Function(Json); + +typedef Coordinates = ({double lat, double long}); + +/// Utils on [Map]. +extension MapUtils on Map { + /// Gets all the keys and values as 2-element records. + Iterable<(K, V)> get records => entries.map((entry) => (entry.key, entry.value)); +} + +/// Zips two lists, like Python +Iterable<(E1, E2)> zip(List list1, List list2) sync* { + if (list1.length != list2.length) throw ArgumentError("Trying to zip lists of different lengths"); + for (var index = 0; index < list1.length; index++) { + yield (list1[index], list2[index]); + } +} + +/// Extensions on lists +extension ListUtils on List { + /// Iterates over a pair of indexes and elements, like Python + Iterable<(int, E)> get enumerate sync* { + for (var i = 0; i < length; i++) { + yield (i, this[i]); + } + } +} diff --git a/src/client/lib/src/models/model.dart b/src/client/lib/src/models/model.dart new file mode 100644 index 0000000..e183eba --- /dev/null +++ b/src/client/lib/src/models/model.dart @@ -0,0 +1,17 @@ +import "package:flutter/foundation.dart"; + +/// A model containing data needed throughout the app. +/// +/// This model may need to be initialized, so [init] should be called before using it. This model +/// should also be held as a singleton in some global scope. +abstract class DataModel with ChangeNotifier { + /// Loads any data needed by the model. + /// + /// This function must not depend on any other model. + Future init(); + + /// Loads any data from other models. + /// + /// At this point, all models have run [init], so it is safe to use other models. + Future initFromOthers() async { } +} diff --git a/src/client/lib/src/pages/home.dart b/src/client/lib/src/pages/home.dart new file mode 100644 index 0000000..898f759 --- /dev/null +++ b/src/client/lib/src/pages/home.dart @@ -0,0 +1,86 @@ +import "package:client/data.dart"; +import "package:flutter/material.dart"; + +import "package:client/view_models.dart"; +import "package:client/widgets.dart"; + +/// The home page. +class HomePage extends ReactiveWidget { + @override + HomeModel createModel() => HomeModel(); + + @override + Widget build(BuildContext context, HomeModel model) => Scaffold( + appBar: AppBar(title: const Text("Counter")), + body: Center( + child: SizedBox( + width: 300, + child: Column( + children: [ + Row( + children: [ + Expanded( + child: TextField( + controller: model.startLatitudeController, + decoration: const InputDecoration( + hintText: "Start latitude", + border: OutlineInputBorder(), + ), + ), + ), + const SizedBox(width: 8), + Expanded( + child: TextField( + controller: model.startLongitudeController, + decoration: const InputDecoration( + hintText: "Start longitude", + border: OutlineInputBorder(), + ), + ), + ), + ], + ), + const SizedBox(height: 12), + Row( + children: [ + Expanded( + child: TextField( + controller: model.endLatitudeController, + decoration: const InputDecoration( + hintText: "End latitude", + border: OutlineInputBorder(), + ), + ), + ), + const SizedBox(width: 8), + Expanded( + child: TextField( + controller: model.endLongitudeController, + decoration: const InputDecoration( + hintText: "End Longitude", + border: OutlineInputBorder(), + ), + ), + ), + ], + ), + const SizedBox(height: 24), + FilledButton(onPressed: model.search, child: const Text("Search for a path")), + const SizedBox(height: 8), + const Divider(), + const SizedBox(height: 8), + if (model.isLoading) + const LinearProgressIndicator() + else if (model.isSearching && model.path == null) + const Text("Could not connect to API") + else + for (final step in model.path ?? []) Text( + "Get on at ${step.enter.lat}, ${step.enter.long}\n" + "Get off at ${step.exit.lat}, ${step.exit.long}", + ), + ], + ), + ), + ), + ); +} diff --git a/src/client/lib/src/services/api.dart b/src/client/lib/src/services/api.dart new file mode 100644 index 0000000..eedc4a0 --- /dev/null +++ b/src/client/lib/src/services/api.dart @@ -0,0 +1,53 @@ +import "dart:convert"; + +import "package:http/http.dart" as http; + +import "package:client/data.dart"; + +import "service.dart"; + +class ApiService extends Service { + final client = http.Client(); + + @override + Future init() async { } + + Uri get _base => Uri(scheme: "https", host: "localhost", port: 5000); + + Future?> _getAll(Uri uri, FromJson fromJson) async { + try { + final response = await client.get(uri); + if (response.statusCode != 200) return null; + final json = jsonDecode(response.body) as List; + return [ + for (final obj in json.cast()) + fromJson(obj), + ]; + } catch (error) { + return null; + } + } + + Future?> getTrips() => _getAll( + _base.replace(path: "/trips"), + Trip.fromJson, + ); + + Future getPath({ + required Coordinates start, + required Coordinates end, + }) => _getAll( + _base.replace( + path: "/path", + ).replace( + queryParameters: { + "start_lat": start.lat.toString(), + "start_lon": start.long.toString(), + "end_lat": end.lat.toString(), + "end_lon": end.long.toString(), + "time": DateTime.now().millisecondsSinceEpoch.toString(), + }, + ), + PathStep.fromJson, + ); +} diff --git a/src/client/lib/src/services/service.dart b/src/client/lib/src/services/service.dart new file mode 100644 index 0000000..bc97342 --- /dev/null +++ b/src/client/lib/src/services/service.dart @@ -0,0 +1,7 @@ +/// Defines a service: a singleton object to manage a resource. +abstract class Service { + /// Initializes any resources needed by the service. + /// + /// This is guaranteed to be called before any other methods. + Future init(); +} diff --git a/src/client/lib/src/view_models/home.dart b/src/client/lib/src/view_models/home.dart new file mode 100644 index 0000000..fab3c1f --- /dev/null +++ b/src/client/lib/src/view_models/home.dart @@ -0,0 +1,34 @@ +import "package:client/data.dart"; +import "package:client/services.dart"; +import "package:flutter/widgets.dart" hide Path; + +import "view_model.dart"; + +/// The view model for the home page. +class HomeModel extends ViewModel { + final startLatitudeController = TextEditingController(); + final startLongitudeController = TextEditingController(); + final endLatitudeController = TextEditingController(); + final endLongitudeController = TextEditingController(); + + Path? path; + + double? get startLatitude => double.tryParse(startLatitudeController.text); + double? get startLongitude => double.tryParse(startLongitudeController.text); + double? get endLatitude => double.tryParse(endLatitudeController.text); + double? get endLongitude => double.tryParse(endLongitudeController.text); + + bool isSearching = false; + + Future search() async { + final start = (lat: startLatitude, long: startLongitude); + final end = (lat: endLatitude, long: endLongitude); + if (start.lat == null || start.long == null) return; + if (end.lat == null || end.long == null) return; + isSearching = true; + isLoading = true; + path = await services.api.getPath(start: start as Coordinates, end: end as Coordinates); + if (path != null) isSearching = false; + isLoading = false; + } +} diff --git a/src/client/lib/src/view_models/view_model.dart b/src/client/lib/src/view_models/view_model.dart new file mode 100644 index 0000000..c3d97f0 --- /dev/null +++ b/src/client/lib/src/view_models/view_model.dart @@ -0,0 +1,54 @@ +import "package:flutter/foundation.dart"; + +/// A model to load and manage state needed by any piece of UI. +/// +/// [init] is called right away it is *not* awaited. Use [isLoading] and +/// [errorText] to convey progress to the user. This allows the UI to load immediately. +abstract class ViewModel with ChangeNotifier { + /// Calls [init] right away but does not await it. + ViewModel() { + init(); + } + + /// Override this method to initializes any data needed by the model. + Future init() async {} + + /// Whether this model is currently loading data. Setting this updates the UI. + bool _isLoading = false; + bool get isLoading => _isLoading; + set isLoading(bool value) { + _isLoading = value; + notifyListeners(); + } + + /// Whether this model has encountered an error. Setting this updates the UI. + String? _errorText; + String? get errorText => _errorText; + set errorText(String? value) { + _errorText = value; + notifyListeners(); + } + + /// Wether this model is still attached to a widget. + bool _isMounted = true; + + @override + void notifyListeners() { + if (_isMounted) super.notifyListeners(); + } + + @override + void dispose() { + _isMounted = false; + super.dispose(); + } +} + +/// A model to build a value from the UI. +abstract class BuilderModel extends ViewModel { + /// The value being edited. + T get value; + + /// Whether the [value] is ready to be accessed. + bool get isReady; +} diff --git a/src/client/lib/src/widgets/generic/reactive_widget.dart b/src/client/lib/src/widgets/generic/reactive_widget.dart new file mode 100644 index 0000000..319f57d --- /dev/null +++ b/src/client/lib/src/widgets/generic/reactive_widget.dart @@ -0,0 +1,80 @@ +import "package:flutter/material.dart"; + +abstract class ReactiveWidgetInterface extends StatefulWidget { + const ReactiveWidgetInterface(); + + /// A function to create or find the model. This function will only be called once. + T createModel(); + + /// Whether the view model should be disposed or not. + bool get shouldDispose; + + /// Builds the UI according to the state in [model]. + Widget build(BuildContext context, T model); + + @override + ReactiveWidgetState createState() => ReactiveWidgetState(); + + /// This function gives you an opportunity to update the view model when the widget updates. + /// + /// For more details, see [State.didUpdateWidget]. + void didUpdateWidget(covariant ReactiveWidgetInterface oldWidget, T model) { } +} + +/// A widget that creates, subscribes to, and disposes of a [ChangeNotifier]. +abstract class ReactiveWidget extends ReactiveWidgetInterface { + /// A const constructor. + const ReactiveWidget(); + + @override + T createModel(); + + @override + bool get shouldDispose => true; +} + +/// A [ReactiveWidget] that works with a reusable [ChangeNotifier]. +abstract class ReusableReactiveWidget extends ReactiveWidgetInterface { + /// The model to listen to. + final T model; + /// Creates a widget that listens to a view model. + const ReusableReactiveWidget(this.model); + + @override + T createModel() => model; + + @override + bool get shouldDispose => false; +} + +/// A state for [ReactiveWidget] that manages the [model]. +class ReactiveWidgetState extends State>{ + /// The model to listen to. + late final T model; + + @override + void initState() { + super.initState(); + model = widget.createModel(); + model.addListener(listener); + } + + @override + void dispose() { + model.removeListener(listener); + if (widget.shouldDispose) model.dispose(); + super.dispose(); + } + + @override + void didUpdateWidget(covariant ReactiveWidgetInterface oldWidget) { + widget.didUpdateWidget(oldWidget, model); + super.didUpdateWidget(oldWidget); + } + + /// Updates the UI when [model] updates. + void listener() => setState(() {}); + + @override + Widget build(BuildContext context) => widget.build(context, model); +} diff --git a/src/client/lib/view_models.dart b/src/client/lib/view_models.dart new file mode 100644 index 0000000..4e3b248 --- /dev/null +++ b/src/client/lib/view_models.dart @@ -0,0 +1,3 @@ +export "src/view_models/view_model.dart"; + +export "src/view_models/home.dart"; diff --git a/src/client/lib/widgets.dart b/src/client/lib/widgets.dart new file mode 100644 index 0000000..c24c152 --- /dev/null +++ b/src/client/lib/widgets.dart @@ -0,0 +1,20 @@ +import "package:flutter/material.dart"; + +export "package:go_router/go_router.dart"; + +export "src/widgets/generic/reactive_widget.dart"; + +/// Helpful methods on [BuildContext]. +extension ContextUtils on BuildContext { + /// Gets the app's color scheme. + ColorScheme get colorScheme => Theme.of(this).colorScheme; + + /// Gets the app's text theme. + TextTheme get textTheme => Theme.of(this).textTheme; + + /// Formats a date according to the user's locale. + String formatDate(DateTime date) => MaterialLocalizations.of(this).formatCompactDate(date); + + /// Formats a time according to the user's locale. + String formatTime(DateTime time) => MaterialLocalizations.of(this).formatTimeOfDay(TimeOfDay.fromDateTime(time)); +} diff --git a/src/client/pubspec.lock b/src/client/pubspec.lock new file mode 100644 index 0000000..cc39adc --- /dev/null +++ b/src/client/pubspec.lock @@ -0,0 +1,266 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + async: + dependency: transitive + description: + name: async + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" + url: "https://pub.dev" + source: hosted + version: "2.13.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + clock: + dependency: transitive + description: + name: clock + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" + source: hosted + version: "1.1.2" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + csslib: + dependency: transitive + description: + name: csslib + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" + url: "https://pub.dev" + source: hosted + version: "1.0.2" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + go_router: + dependency: "direct main" + description: + name: go_router + sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3 + url: "https://pub.dev" + source: hosted + version: "14.8.1" + html: + dependency: "direct main" + description: + name: html + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" + url: "https://pub.dev" + source: hosted + version: "0.15.5" + http: + dependency: "direct main" + description: + name: http + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f + url: "https://pub.dev" + source: hosted + version: "1.3.0" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" + url: "https://pub.dev" + source: hosted + version: "10.0.9" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 + url: "https://pub.dev" + source: hosted + version: "3.0.9" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + url: "https://pub.dev" + source: hosted + version: "0.12.17" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: transitive + description: + name: meta + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + url: "https://pub.dev" + source: hosted + version: "1.16.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" + url: "https://pub.dev" + source: hosted + version: "1.10.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" + source: hosted + version: "1.12.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + url: "https://pub.dev" + source: hosted + version: "0.7.4" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + very_good_analysis: + dependency: "direct dev" + description: + name: very_good_analysis + sha256: "1fb637c0022034b1f19ea2acb42a3603cbd8314a470646a59a2fb01f5f3a8629" + url: "https://pub.dev" + source: hosted + version: "6.0.0" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + url: "https://pub.dev" + source: hosted + version: "15.0.0" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" +sdks: + dart: ">=3.7.0-0 <4.0.0" + flutter: ">=3.22.0" diff --git a/src/client/pubspec.yaml b/src/client/pubspec.yaml new file mode 100644 index 0000000..6a313c7 --- /dev/null +++ b/src/client/pubspec.yaml @@ -0,0 +1,22 @@ +name: client +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +version: 0.1.0+1 + +environment: + sdk: ^3.5.0 + +dependencies: + flutter: + sdk: flutter + go_router: ^14.2.7 + html: ^0.15.5 + http: ^1.3.0 + +dev_dependencies: + flutter_test: + sdk: flutter + very_good_analysis: ^6.0.0 + +flutter: + uses-material-design: true diff --git a/src/client/test/widget_test.dart b/src/client/test/widget_test.dart new file mode 100644 index 0000000..1888d2a --- /dev/null +++ b/src/client/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:client/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/src/client/web/favicon.png b/src/client/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/src/client/web/icons/Icon-192.png b/src/client/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/src/client/web/icons/Icon-512.png b/src/client/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/src/client/web/icons/Icon-maskable-192.png b/src/client/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/src/client/web/icons/Icon-maskable-512.png b/src/client/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 zcmeFZ_gj-)&^4Nb2tlbLMU<{!p(#yjqEe+=0IA_oih%ScH9@5#MNp&}Y#;;(h=A0@ zh7{>lT2MkSQ344eAvrhici!td|HJuyvJm#Y_w1Q9Yu3!26dNlO-oxUDK_C#XnW^Co z5C{VN6#{~B0)K2j7}*1Xq(Nqemv23A-6&=ZpEijkVnSwVGqLv40?n0=p;k3-U5e5+ z+z3>aS`u9DS=!wg8ROu?X4TFoW6CFLL&{GzoVT)ldhLekLM|+j3tIxRd|*5=c{=s&*vfPdBr(Fyj(v@%eQj1Soy7m4^@VRl1~@-PV7y+c!xz$8436WBn$t{=}mEdK#k`aystimGgI{(IBx$!pAwFoE9Y`^t^;> zKAD)C(Dl^s%`?q5$P|fZf8Xymrtu^Pv(7D`rn>Z-w$Ahs!z9!94WNVxrJuXfHAaxg zC6s@|Z1$7R$(!#t%Jb{{s6(Y?NoQXDYq)!}X@jKPhe`{9KQ@sAU8y-5`xt?S9$jKH zoi}6m5PcG*^{kjvt+kwPpyQzVg4o)a>;LK`aaN2x4@itBD3Aq?yWTM20VRn1rrd+2 zKO=P0rMjEGq_UqpMa`~7B|p?xAN1SCoCp}QxAv8O`jLJ5CVh@umR%c%i^)6!o+~`F zaalSTQcl5iwOLC&H)efzd{8(88mo`GI(56T<(&p7>Qd^;R1hn1Y~jN~tApaL8>##U zd65bo8)79CplWxr#z4!6HvLz&N7_5AN#x;kLG?zQ(#p|lj<8VUlKY=Aw!ATqeL-VG z42gA!^cMNPj>(`ZMEbCrnkg*QTsn*u(nQPWI9pA{MQ=IsPTzd7q5E#7+z>Ch=fx$~ z;J|?(5jTo5UWGvsJa(Sx0?S#56+8SD!I^tftyeh_{5_31l6&Hywtn`bbqYDqGZXI( zCG7hBgvksX2ak8+)hB4jnxlO@A32C_RM&g&qDSb~3kM&)@A_j1*oTO@nicGUyv+%^ z=vB)4(q!ykzT==Z)3*3{atJ5}2PV*?Uw+HhN&+RvKvZL3p9E?gHjv{6zM!A|z|UHK z-r6jeLxbGn0D@q5aBzlco|nG2tr}N@m;CJX(4#Cn&p&sLKwzLFx1A5izu?X_X4x8r@K*d~7>t1~ zDW1Mv5O&WOxbzFC`DQ6yNJ(^u9vJdj$fl2dq`!Yba_0^vQHXV)vqv1gssZYzBct!j zHr9>ydtM8wIs}HI4=E}qAkv|BPWzh3^_yLH(|kdb?x56^BlDC)diWyPd*|f!`^12_U>TD^^94OCN0lVv~Sgvs94ecpE^}VY$w`qr_>Ue zTfH~;C<3H<0dS5Rkf_f@1x$Gms}gK#&k()IC0zb^QbR!YLoll)c$Agfi6MKI0dP_L z=Uou&u~~^2onea2%XZ@>`0x^L8CK6=I{ge;|HXMj)-@o~h&O{CuuwBX8pVqjJ*o}5 z#8&oF_p=uSo~8vn?R0!AMWvcbZmsrj{ZswRt(aEdbi~;HeVqIe)-6*1L%5u$Gbs}| zjFh?KL&U(rC2izSGtwP5FnsR@6$-1toz?RvLD^k~h9NfZgzHE7m!!7s6(;)RKo2z} zB$Ci@h({l?arO+vF;s35h=|WpefaOtKVx>l399}EsX@Oe3>>4MPy%h&^3N_`UTAHJ zI$u(|TYC~E4)|JwkWW3F!Tib=NzjHs5ii2uj0^m|Qlh-2VnB#+X~RZ|`SA*}}&8j9IDv?F;(Y^1=Z0?wWz;ikB zewU>MAXDi~O7a~?jx1x=&8GcR-fTp>{2Q`7#BE#N6D@FCp`?ht-<1|y(NArxE_WIu zP+GuG=Qq>SHWtS2M>34xwEw^uvo4|9)4s|Ac=ud?nHQ>ax@LvBqusFcjH0}{T3ZPQ zLO1l<@B_d-(IS682}5KA&qT1+{3jxKolW+1zL4inqBS-D>BohA!K5++41tM@ z@xe<-qz27}LnV#5lk&iC40M||JRmZ*A##K3+!j93eouU8@q-`W0r%7N`V$cR&JV;iX(@cS{#*5Q>~4BEDA)EikLSP@>Oo&Bt1Z~&0d5)COI%3$cLB_M?dK# z{yv2OqW!al-#AEs&QFd;WL5zCcp)JmCKJEdNsJlL9K@MnPegK23?G|O%v`@N{rIRa zi^7a}WBCD77@VQ-z_v{ZdRsWYrYgC$<^gRQwMCi6);%R~uIi31OMS}=gUTE(GKmCI z$zM>mytL{uNN+a&S38^ez(UT=iSw=l2f+a4)DyCA1Cs_N-r?Q@$3KTYosY!;pzQ0k zzh1G|kWCJjc(oZVBji@kN%)UBw(s{KaYGy=i{g3{)Z+&H8t2`^IuLLKWT6lL<-C(! zSF9K4xd-|VO;4}$s?Z7J_dYqD#Mt)WCDnsR{Kpjq275uUq6`v0y*!PHyS(}Zmv)_{>Vose9-$h8P0|y;YG)Bo}$(3Z%+Gs0RBmFiW!^5tBmDK-g zfe5%B*27ib+7|A*Fx5e)2%kIxh7xWoc3pZcXS2zik!63lAG1;sC1ja>BqH7D zODdi5lKW$$AFvxgC-l-)!c+9@YMC7a`w?G(P#MeEQ5xID#<}W$3bSmJ`8V*x2^3qz zVe<^^_8GHqYGF$nIQm0Xq2kAgYtm#UC1A(=&85w;rmg#v906 zT;RyMgbMpYOmS&S9c38^40oUp?!}#_84`aEVw;T;r%gTZkWeU;;FwM@0y0adt{-OK z(vGnPSlR=Nv2OUN!2=xazlnHPM9EWxXg2EKf0kI{iQb#FoP>xCB<)QY>OAM$Dcdbm zU6dU|%Mo(~avBYSjRc13@|s>axhrPl@Sr81{RSZUdz4(=|82XEbV*JAX6Lfbgqgz584lYgi0 z2-E{0XCVON$wHfvaLs;=dqhQJ&6aLn$D#0i(FkAVrXG9LGm3pSTf&f~RQb6|1_;W> z?n-;&hrq*~L=(;u#jS`*Yvh@3hU-33y_Kv1nxqrsf>pHVF&|OKkoC)4DWK%I!yq?P z=vXo8*_1iEWo8xCa{HJ4tzxOmqS0&$q+>LroMKI*V-rxhOc%3Y!)Y|N6p4PLE>Yek>Y(^KRECg8<|%g*nQib_Yc#A5q8Io z6Ig&V>k|~>B6KE%h4reAo*DfOH)_01tE0nWOxX0*YTJgyw7moaI^7gW*WBAeiLbD?FV9GSB zPv3`SX*^GRBM;zledO`!EbdBO_J@fEy)B{-XUTVQv}Qf~PSDpK9+@I`7G7|>Dgbbu z_7sX9%spVo$%qwRwgzq7!_N;#Td08m5HV#?^dF-EV1o)Q=Oa+rs2xH#g;ykLbwtCh znUnA^dW!XjspJ;otq$yV@I^s9Up(5k7rqhQd@OLMyyxVLj_+$#Vc*}Usevp^I(^vH zmDgHc0VMme|K&X?9&lkN{yq_(If)O`oUPW8X}1R5pSVBpfJe0t{sPA(F#`eONTh_) zxeLqHMfJX#?P(@6w4CqRE@Eiza; z;^5)Kk=^5)KDvd9Q<`=sJU8rjjxPmtWMTmzcH={o$U)j=QBuHarp?=}c??!`3d=H$nrJMyr3L-& zA#m?t(NqLM?I3mGgWA_C+0}BWy3-Gj7bR+d+U?n*mN$%5P`ugrB{PeV>jDUn;eVc- zzeMB1mI4?fVJatrNyq|+zn=!AiN~<}eoM#4uSx^K?Iw>P2*r=k`$<3kT00BE_1c(02MRz4(Hq`L^M&xt!pV2 zn+#U3@j~PUR>xIy+P>51iPayk-mqIK_5rlQMSe5&tDkKJk_$i(X&;K(11YGpEc-K= zq4Ln%^j>Zi_+Ae9eYEq_<`D+ddb8_aY!N;)(&EHFAk@Ekg&41ABmOXfWTo)Z&KotA zh*jgDGFYQ^y=m)<_LCWB+v48DTJw*5dwMm_YP0*_{@HANValf?kV-Ic3xsC}#x2h8 z`q5}d8IRmqWk%gR)s~M}(Qas5+`np^jW^oEd-pzERRPMXj$kS17g?H#4^trtKtq;C?;c ztd|%|WP2w2Nzg@)^V}!Gv++QF2!@FP9~DFVISRW6S?eP{H;;8EH;{>X_}NGj^0cg@ z!2@A>-CTcoN02^r6@c~^QUa={0xwK0v4i-tQ9wQq^=q*-{;zJ{Qe%7Qd!&X2>rV@4 z&wznCz*63_vw4>ZF8~%QCM?=vfzW0r_4O^>UA@otm_!N%mH)!ERy&b!n3*E*@?9d^ zu}s^By@FAhG(%?xgJMuMzuJw2&@$-oK>n z=UF}rt%vuaP9fzIFCYN-1&b#r^Cl6RDFIWsEsM|ROf`E?O(cy{BPO2Ie~kT+^kI^i zp>Kbc@C?}3vy-$ZFVX#-cx)Xj&G^ibX{pWggtr(%^?HeQL@Z( zM-430g<{>vT*)jK4aY9(a{lSy{8vxLbP~n1MXwM527ne#SHCC^F_2@o`>c>>KCq9c(4c$VSyMl*y3Nq1s+!DF| z^?d9PipQN(mw^j~{wJ^VOXDCaL$UtwwTpyv8IAwGOg<|NSghkAR1GSNLZ1JwdGJYm zP}t<=5=sNNUEjc=g(y)1n5)ynX(_$1-uGuDR*6Y^Wgg(LT)Jp><5X|}bt z_qMa&QP?l_n+iVS>v%s2Li_;AIeC=Ca^v1jX4*gvB$?H?2%ndnqOaK5-J%7a} zIF{qYa&NfVY}(fmS0OmXA70{znljBOiv5Yod!vFU{D~*3B3Ka{P8?^ zfhlF6o7aNT$qi8(w<}OPw5fqA7HUje*r*Oa(YV%*l0|9FP9KW@U&{VSW{&b0?@y)M zs%4k1Ax;TGYuZ9l;vP5@?3oQsp3)rjBeBvQQ>^B;z5pc=(yHhHtq6|0m(h4envn_j787fizY@V`o(!SSyE7vlMT zbo=Z1c=atz*G!kwzGB;*uPL$Ei|EbZLh8o+1BUMOpnU(uX&OG1MV@|!&HOOeU#t^x zr9=w2ow!SsTuJWT7%Wmt14U_M*3XiWBWHxqCVZI0_g0`}*^&yEG9RK9fHK8e+S^m? zfCNn$JTswUVbiC#>|=wS{t>-MI1aYPLtzO5y|LJ9nm>L6*wpr_m!)A2Fb1RceX&*|5|MwrvOk4+!0p99B9AgP*9D{Yt|x=X}O% zgIG$MrTB=n-!q%ROT|SzH#A$Xm;|ym)0>1KR}Yl0hr-KO&qMrV+0Ej3d@?FcgZ+B3 ztEk16g#2)@x=(ko8k7^Tq$*5pfZHC@O@}`SmzT1(V@x&NkZNM2F#Q-Go7-uf_zKC( zB(lHZ=3@dHaCOf6C!6i8rDL%~XM@rVTJbZL09?ht@r^Z_6x}}atLjvH^4Vk#Ibf(^LiBJFqorm?A=lE zzFmwvp4bT@Nv2V>YQT92X;t9<2s|Ru5#w?wCvlhcHLcsq0TaFLKy(?nzezJ>CECqj zggrI~Hd4LudM(m{L@ezfnpELsRFVFw>fx;CqZtie`$BXRn#Ns%AdoE$-Pf~{9A8rV zf7FbgpKmVzmvn-z(g+&+-ID=v`;6=)itq8oM*+Uz**SMm_{%eP_c0{<%1JGiZS19o z@Gj7$Se~0lsu}w!%;L%~mIAO;AY-2i`9A*ZfFs=X!LTd6nWOZ7BZH2M{l2*I>Xu)0 z`<=;ObglnXcVk!T>e$H?El}ra0WmPZ$YAN0#$?|1v26^(quQre8;k20*dpd4N{i=b zuN=y}_ew9SlE~R{2+Rh^7%PA1H5X(p8%0TpJ=cqa$65XL)$#ign-y!qij3;2>j}I; ziO@O|aYfn&up5F`YtjGw68rD3{OSGNYmBnl?zdwY$=RFsegTZ=kkzRQ`r7ZjQP!H( zp4>)&zf<*N!tI00xzm-ME_a{_I!TbDCr;8E;kCH4LlL-tqLxDuBn-+xgPk37S&S2^ z2QZumkIimwz!c@!r0)j3*(jPIs*V!iLTRl0Cpt_UVNUgGZzdvs0(-yUghJfKr7;=h zD~y?OJ-bWJg;VdZ^r@vlDoeGV&8^--!t1AsIMZ5S440HCVr%uk- z2wV>!W1WCvFB~p$P$$_}|H5>uBeAe>`N1FI8AxM|pq%oNs;ED8x+tb44E) zTj{^fbh@eLi%5AqT?;d>Es5D*Fi{Bpk)q$^iF!!U`r2hHAO_?#!aYmf>G+jHsES4W zgpTKY59d?hsb~F0WE&dUp6lPt;Pm zcbTUqRryw^%{ViNW%Z(o8}dd00H(H-MmQmOiTq{}_rnwOr*Ybo7*}3W-qBT!#s0Ie z-s<1rvvJx_W;ViUD`04%1pra*Yw0BcGe)fDKUK8aF#BwBwMPU;9`!6E(~!043?SZx z13K%z@$$#2%2ovVlgFIPp7Q6(vO)ud)=*%ZSucL2Dh~K4B|%q4KnSpj#n@(0B})!9 z8p*hY@5)NDn^&Pmo;|!>erSYg`LkO?0FB@PLqRvc>4IsUM5O&>rRv|IBRxi(RX(gJ ztQ2;??L~&Mv;aVr5Q@(?y^DGo%pO^~zijld41aA0KKsy_6FeHIn?fNHP-z>$OoWer zjZ5hFQTy*-f7KENRiCE$ZOp4|+Wah|2=n@|W=o}bFM}Y@0e62+_|#fND5cwa3;P{^pEzlJbF1Yq^}>=wy8^^^$I2M_MH(4Dw{F6hm+vrWV5!q;oX z;tTNhz5`-V={ew|bD$?qcF^WPR{L(E%~XG8eJx(DoGzt2G{l8r!QPJ>kpHeOvCv#w zr=SSwMDaUX^*~v%6K%O~i)<^6`{go>a3IdfZ8hFmz&;Y@P%ZygShQZ2DSHd`m5AR= zx$wWU06;GYwXOf(%MFyj{8rPFXD};JCe85Bdp4$YJ2$TzZ7Gr#+SwCvBI1o$QP0(c zy`P51FEBV2HTisM3bHqpmECT@H!Y2-bv2*SoSPoO?wLe{M#zDTy@ujAZ!Izzky~3k zRA1RQIIoC*Mej1PH!sUgtkR0VCNMX(_!b65mo66iM*KQ7xT8t2eev$v#&YdUXKwGm z7okYAqYF&bveHeu6M5p9xheRCTiU8PFeb1_Rht0VVSbm%|1cOVobc8mvqcw!RjrMRM#~=7xibH&Fa5Imc|lZ{eC|R__)OrFg4@X_ ze+kk*_sDNG5^ELmHnZ7Ue?)#6!O)#Nv*Dl2mr#2)w{#i-;}0*_h4A%HidnmclH#;Q zmQbq+P4DS%3}PpPm7K_K3d2s#k~x+PlTul7+kIKol0@`YN1NG=+&PYTS->AdzPv!> zQvzT=)9se*Jr1Yq+C{wbK82gAX`NkbXFZ)4==j4t51{|-v!!$H8@WKA={d>CWRW+g z*`L>9rRucS`vbXu0rzA1#AQ(W?6)}1+oJSF=80Kf_2r~Qm-EJ6bbB3k`80rCv(0d` zvCf3;L2ovYG_TES%6vSuoKfIHC6w;V31!oqHM8-I8AFzcd^+_86!EcCOX|Ta9k1!s z_Vh(EGIIsI3fb&dF$9V8v(sTBC%!#<&KIGF;R+;MyC0~}$gC}}= zR`DbUVc&Bx`lYykFZ4{R{xRaUQkWCGCQlEc;!mf=+nOk$RUg*7 z;kP7CVLEc$CA7@6VFpsp3_t~m)W0aPxjsA3e5U%SfY{tp5BV5jH-5n?YX7*+U+Zs%LGR>U- z!x4Y_|4{gx?ZPJobISy991O znrmrC3otC;#4^&Rg_iK}XH(XX+eUHN0@Oe06hJk}F?`$)KmH^eWz@@N%wEc)%>?Ft z#9QAroDeyfztQ5Qe{m*#R#T%-h*&XvSEn@N$hYRTCMXS|EPwzF3IIysD2waj`vQD{ zv_#^Pgr?s~I*NE=acf@dWVRNWTr(GN0wrL)Z2=`Dr>}&ZDNX|+^Anl{Di%v1Id$_p zK5_H5`RDjJx`BW7hc85|> zHMMsWJ4KTMRHGu+vy*kBEMjz*^K8VtU=bXJYdhdZ-?jTXa$&n)C?QQIZ7ln$qbGlr zS*TYE+ppOrI@AoPP=VI-OXm}FzgXRL)OPvR$a_=SsC<3Jb+>5makX|U!}3lx4tX&L z^C<{9TggZNoeX!P1jX_K5HkEVnQ#s2&c#umzV6s2U-Q;({l+j^?hi7JnQ7&&*oOy9 z(|0asVTWUCiCnjcOnB2pN0DpuTglKq;&SFOQ3pUdye*eT<2()7WKbXp1qq9=bhMWlF-7BHT|i3TEIT77AcjD(v=I207wi-=vyiw5mxgPdTVUC z&h^FEUrXwWs9en2C{ywZp;nvS(Mb$8sBEh-*_d-OEm%~p1b2EpcwUdf<~zmJmaSTO zSX&&GGCEz-M^)G$fBvLC2q@wM$;n4jp+mt0MJFLuJ%c`tSp8$xuP|G81GEd2ci$|M z4XmH{5$j?rqDWoL4vs!}W&!?!rtj=6WKJcE>)?NVske(p;|#>vL|M_$as=mi-n-()a*OU3Okmk0wC<9y7t^D(er-&jEEak2!NnDiOQ99Wx8{S8}=Ng!e0tzj*#T)+%7;aM$ z&H}|o|J1p{IK0Q7JggAwipvHvko6>Epmh4RFRUr}$*2K4dz85o7|3#Bec9SQ4Y*;> zXWjT~f+d)dp_J`sV*!w>B%)#GI_;USp7?0810&3S=WntGZ)+tzhZ+!|=XlQ&@G@~3 z-dw@I1>9n1{+!x^Hz|xC+P#Ab`E@=vY?3%Bc!Po~e&&&)Qp85!I|U<-fCXy*wMa&t zgDk!l;gk;$taOCV$&60z+}_$ykz=Ea*)wJQ3-M|p*EK(cvtIre0Pta~(95J7zoxBN zS(yE^3?>88AL0Wfuou$BM{lR1hkrRibz=+I9ccwd`ZC*{NNqL)3pCcw^ygMmrG^Yp zn5f}Xf>%gncC=Yq96;rnfp4FQL#{!Y*->e82rHgY4Zwy{`JH}b9*qr^VA{%~Z}jtp z_t$PlS6}5{NtTqXHN?uI8ut8rOaD#F1C^ls73S=b_yI#iZDOGz3#^L@YheGd>L;<( z)U=iYj;`{>VDNzIxcjbTk-X3keXR8Xbc`A$o5# zKGSk-7YcoBYuAFFSCjGi;7b<;n-*`USs)IX z=0q6WZ=L!)PkYtZE-6)azhXV|+?IVGTOmMCHjhkBjfy@k1>?yFO3u!)@cl{fFAXnRYsWk)kpT?X{_$J=|?g@Q}+kFw|%n!;Zo}|HE@j=SFMvT8v`6Y zNO;tXN^036nOB2%=KzxB?n~NQ1K8IO*UE{;Xy;N^ZNI#P+hRZOaHATz9(=)w=QwV# z`z3+P>9b?l-@$@P3<;w@O1BdKh+H;jo#_%rr!ute{|YX4g5}n?O7Mq^01S5;+lABE+7`&_?mR_z7k|Ja#8h{!~j)| zbBX;*fsbUak_!kXU%HfJ2J+G7;inu#uRjMb|8a){=^))y236LDZ$$q3LRlat1D)%7K0!q5hT5V1j3qHc7MG9 z_)Q=yQ>rs>3%l=vu$#VVd$&IgO}Za#?aN!xY>-<3PhzS&q!N<=1Q7VJBfHjug^4|) z*fW^;%3}P7X#W3d;tUs3;`O&>;NKZBMR8au6>7?QriJ@gBaorz-+`pUWOP73DJL=M z(33uT6Gz@Sv40F6bN|H=lpcO z^AJl}&=TIjdevuDQ!w0K*6oZ2JBOhb31q!XDArFyKpz!I$p4|;c}@^bX{>AXdt7Bm zaLTk?c%h@%xq02reu~;t@$bv`b3i(P=g}~ywgSFpM;}b$zAD+=I!7`V~}ARB(Wx0C(EAq@?GuxOL9X+ffbkn3+Op0*80TqmpAq~EXmv%cq36celXmRz z%0(!oMp&2?`W)ALA&#|fu)MFp{V~~zIIixOxY^YtO5^FSox8v$#d0*{qk0Z)pNTt0QVZ^$`4vImEB>;Lo2!7K05TpY-sl#sWBz_W-aDIV`Ksabi zvpa#93Svo!70W*Ydh)Qzm{0?CU`y;T^ITg-J9nfWeZ-sbw)G@W?$Eomf%Bg2frfh5 zRm1{|E0+(4zXy){$}uC3%Y-mSA2-^I>Tw|gQx|7TDli_hB>``)Q^aZ`LJC2V3U$SABP}T)%}9g2pF9dT}aC~!rFFgkl1J$ z`^z{Arn3On-m%}r}TGF8KQe*OjSJ=T|caa_E;v89A{t@$yT^(G9=N9F?^kT*#s3qhJq!IH5|AhnqFd z0B&^gm3w;YbMNUKU>naBAO@fbz zqw=n!@--}o5;k6DvTW9pw)IJVz;X}ncbPVrmH>4x);8cx;q3UyiML1PWp%bxSiS|^ zC5!kc4qw%NSOGQ*Kcd#&$30=lDvs#*4W4q0u8E02U)7d=!W7+NouEyuF1dyH$D@G& zaFaxo9Ex|ZXA5y{eZT*i*dP~INSMAi@mvEX@q5i<&o&#sM}Df?Og8n8Ku4vOux=T% zeuw~z1hR}ZNwTn8KsQHKLwe2>p^K`YWUJEdVEl|mO21Bov!D0D$qPoOv=vJJ`)|%_ z>l%`eexY7t{BlVKP!`a^U@nM?#9OC*t76My_E_<16vCz1x_#82qj2PkWiMWgF8bM9 z(1t4VdHcJ;B~;Q%x01k_gQ0>u2*OjuEWNOGX#4}+N?Gb5;+NQMqp}Puqw2HnkYuKA zzKFWGHc&K>gwVgI1Sc9OT1s6fq=>$gZU!!xsilA$fF`kLdGoX*^t}ao@+^WBpk>`8 z4v_~gK|c2rCq#DZ+H)$3v~Hoi=)=1D==e3P zpKrRQ+>O^cyTuWJ%2}__0Z9SM_z9rptd*;-9uC1tDw4+A!=+K%8~M&+Zk#13hY$Y$ zo-8$*8dD5@}XDi19RjK6T^J~DIXbF5w&l?JLHMrf0 zLv0{7*G!==o|B%$V!a=EtVHdMwXLtmO~vl}P6;S(R2Q>*kTJK~!}gloxj)m|_LYK{ zl(f1cB=EON&wVFwK?MGn^nWuh@f95SHatPs(jcwSY#Dnl1@_gkOJ5=f`%s$ZHljRH0 z+c%lrb=Gi&N&1>^L_}#m>=U=(oT^vTA&3!xXNyqi$pdW1BDJ#^{h|2tZc{t^vag3& zAD7*8C`chNF|27itjBUo^CCDyEpJLX3&u+(L;YeeMwnXEoyN(ytoEabcl$lSgx~Ltatn}b$@j_yyMrBb03)shJE*$;Mw=;mZd&8e>IzE+4WIoH zCSZE7WthNUL$|Y#m!Hn?x7V1CK}V`KwW2D$-7&ODy5Cj;!_tTOOo1Mm%(RUt)#$@3 zhurA)t<7qik%%1Et+N1?R#hdBB#LdQ7{%-C zn$(`5e0eFh(#c*hvF>WT*07fk$N_631?W>kfjySN8^XC9diiOd#s?4tybICF;wBjp zIPzilX3{j%4u7blhq)tnaOBZ_`h_JqHXuI7SuIlNTgBk9{HIS&3|SEPfrvcE<@}E` zKk$y*nzsqZ{J{uWW9;#n=de&&h>m#A#q)#zRonr(?mDOYU&h&aQWD;?Z(22wY?t$U3qo`?{+amA$^TkxL+Ex2dh`q7iR&TPd0Ymwzo#b? zP$#t=elB5?k$#uE$K>C$YZbYUX_JgnXA`oF_Ifz4H7LEOW~{Gww&3s=wH4+j8*TU| zSX%LtJWqhr-xGNSe{;(16kxnak6RnZ{0qZ^kJI5X*It_YuynSpi(^-}Lolr{)#z_~ zw!(J-8%7Ybo^c3(mED`Xz8xecP35a6M8HarxRn%+NJBE;dw>>Y2T&;jzRd4FSDO3T zt*y+zXCtZQ0bP0yf6HRpD|WmzP;DR^-g^}{z~0x~z4j8m zucTe%k&S9Nt-?Jb^gYW1w6!Y3AUZ0Jcq;pJ)Exz%7k+mUOm6%ApjjSmflfKwBo6`B zhNb@$NHTJ>guaj9S{@DX)!6)b-Shav=DNKWy(V00k(D!v?PAR0f0vDNq*#mYmUp6> z76KxbFDw5U{{qx{BRj(>?|C`82ICKbfLxoldov-M?4Xl+3;I4GzLHyPOzYw7{WQST zPNYcx5onA%MAO9??41Po*1zW(Y%Zzn06-lUp{s<3!_9vv9HBjT02On0Hf$}NP;wF) zP<`2p3}A^~1YbvOh{ePMx$!JGUPX-tbBzp3mDZMY;}h;sQ->!p97GA)9a|tF(Gh{1$xk7 zUw?ELkT({Xw!KIr);kTRb1b|UL`r2_`a+&UFVCdJ)1T#fdh;71EQl9790Br0m_`$x z9|ZANuchFci8GNZ{XbP=+uXSJRe(;V5laQz$u18#?X*9}x7cIEbnr%<=1cX3EIu7$ zhHW6pe5M(&qEtsqRa>?)*{O;OJT+YUhG5{km|YI7I@JL_3Hwao9aXneiSA~a* z|Lp@c-oMNyeAEuUz{F?kuou3x#C*gU?lon!RC1s37gW^0Frc`lqQWH&(J4NoZg3m8 z;Lin#8Q+cFPD7MCzj}#|ws7b@?D9Q4dVjS4dpco=4yX5SSH=A@U@yqPdp@?g?qeia zH=Tt_9)G=6C2QIPsi-QipnK(mc0xXIN;j$WLf@n8eYvMk;*H-Q4tK%(3$CN}NGgO8n}fD~+>?<3UzvsrMf*J~%i;VKQHbF%TPalFi=#sgj)(P#SM^0Q=Tr>4kJVw8X3iWsP|e8tj}NjlMdWp z@2+M4HQu~3!=bZpjh;;DIDk&X}=c8~kn)FWWH z2KL1w^rA5&1@@^X%MjZ7;u(kH=YhH2pJPFQe=hn>tZd5RC5cfGYis8s9PKaxi*}-s6*W zRA^PwR=y^5Z){!(4D9-KC;0~;b*ploznFOaU`bJ_7U?qAi#mTo!&rIECRL$_y@yI27x2?W+zqDBD5~KCVYKFZLK+>ABC(Kj zeAll)KMgIlAG`r^rS{loBrGLtzhHY8$)<_S<(Dpkr(Ym@@vnQ&rS@FC*>2@XCH}M+an74WcRDcoQ+a3@A z9tYhl5$z7bMdTvD2r&jztBuo37?*k~wcU9GK2-)MTFS-lux-mIRYUuGUCI~V$?s#< z?1qAWb(?ZLm(N>%S%y10COdaq_Tm5c^%ooIxpR=`3e4C|@O5wY+eLik&XVi5oT7oe zmxH)Jd*5eo@!7t`x8!K=-+zJ-Sz)B_V$)s1pW~CDU$=q^&ABvf6S|?TOMB-RIm@CoFg>mjIQE)?+A1_3s6zmFU_oW&BqyMz1mY*IcP_2knjq5 zqw~JK(cVsmzc7*EvTT2rvpeqhg)W=%TOZ^>f`rD4|7Z5fq*2D^lpCttIg#ictgqZ$P@ru6P#f$x#KfnfTZj~LG6U_d-kE~`;kU_X)`H5so@?C zWmb!7x|xk@0L~0JFall*@ltyiL^)@3m4MqC7(7H0sH!WidId1#f#6R{Q&A!XzO1IAcIx;$k66dumt6lpUw@nL2MvqJ5^kbOVZ<^2jt5-njy|2@`07}0w z;M%I1$FCoLy`8xp8Tk)bFr;7aJeQ9KK6p=O$U0-&JYYy8woV*>b+FB?xLX`=pirYM z5K$BA(u)+jR{?O2r$c_Qvl?M{=Ar{yQ!UVsVn4k@0!b?_lA;dVz9uaQUgBH8Oz(Sb zrEs;&Ey>_ex8&!N{PmQjp+-Hlh|OA&wvDai#GpU=^-B70V0*LF=^bi+Nhe_o|azZ%~ZZ1$}LTmWt4aoB1 zPgccm$EwYU+jrdBaQFxQfn5gd(gM`Y*Ro1n&Zi?j=(>T3kmf94vdhf?AuS8>$Va#P zGL5F+VHpxdsCUa}+RqavXCobI-@B;WJbMphpK2%6t=XvKWWE|ruvREgM+|V=i6;;O zx$g=7^`$XWn0fu!gF=Xe9cMB8Z_SelD>&o&{1XFS`|nInK3BXlaeD*rc;R-#osyIS zWv&>~^TLIyBB6oDX+#>3<_0+2C4u2zK^wmHXXDD9_)kmLYJ!0SzM|%G9{pi)`X$uf zW}|%%#LgyK7m(4{V&?x_0KEDq56tk|0YNY~B(Sr|>WVz-pO3A##}$JCT}5P7DY+@W z#gJv>pA5>$|E3WO2tV7G^SuymB?tY`ooKcN3!vaQMnBNk-WATF{-$#}FyzgtJ8M^; zUK6KWSG)}6**+rZ&?o@PK3??uN{Q)#+bDP9i1W&j)oaU5d0bIWJ_9T5ac!qc?x66Q z$KUSZ`nYY94qfN_dpTFr8OW~A?}LD;Yty-BA)-be5Z3S#t2Io%q+cAbnGj1t$|qFR z9o?8B7OA^KjCYL=-!p}w(dkC^G6Nd%_I=1))PC0w5}ZZGJxfK)jP4Fwa@b-SYBw?% zdz9B-<`*B2dOn(N;mcTm%Do)rIvfXRNFX&1h`?>Rzuj~Wx)$p13nrDlS8-jwq@e@n zNIj_|8or==8~1h*Ih?w*8K7rYkGlwlTWAwLKc5}~dfz3y`kM&^Q|@C%1VAp_$wnw6zG~W4O+^ z>i?NY?oXf^Puc~+fDM$VgRNBpOZj{2cMP~gCqWAX4 z7>%$ux8@a&_B(pt``KSt;r+sR-$N;jdpY>|pyvPiN)9ohd*>mVST3wMo)){`B(&eX z1?zZJ-4u9NZ|~j1rdZYq4R$?swf}<6(#ex%7r{kh%U@kT)&kWuAszS%oJts=*OcL9 zaZwK<5DZw%1IFHXgFplP6JiL^dk8+SgM$D?8X+gE4172hXh!WeqIO>}$I9?Nry$*S zQ#f)RuH{P7RwA3v9f<-w>{PSzom;>(i&^l{E0(&Xp4A-*q-@{W1oE3K;1zb{&n28dSC2$N+6auXe0}e4b z)KLJ?5c*>@9K#I^)W;uU_Z`enquTUxr>mNq z1{0_puF-M7j${rs!dxxo3EelGodF1TvjV;Zpo;s{5f1pyCuRp=HDZ?s#IA4f?h|-p zGd|Mq^4hDa@Bh!c4ZE?O&x&XZ_ptZGYK4$9F4~{%R!}G1leCBx`dtNUS|K zL-7J5s4W@%mhXg1!}a4PD%!t&Qn%f_oquRajn3@C*)`o&K9o7V6DwzVMEhjVdDJ1fjhr#@=lp#@4EBqi=CCQ>73>R(>QKPNM&_Jpe5G`n4wegeC`FYEPJ{|vwS>$-`fuRSp3927qOv|NC3T3G-0 zA{K`|+tQy1yqE$ShWt8ny&5~)%ITb@^+x$w0)f&om;P8B)@}=Wzy59BwUfZ1vqw87 za2lB8J(&*l#(V}Id8SyQ0C(2amzkz3EqG&Ed0Jq1)$|&>4_|NIe=5|n=3?siFV0fI z{As5DLW^gs|B-b4C;Hd(SM-S~GQhzb>HgF2|2Usww0nL^;x@1eaB)=+Clj+$fF@H( z-fqP??~QMT$KI-#m;QC*&6vkp&8699G3)Bq0*kFZXINw=b9OVaed(3(3kS|IZ)CM? zJdnW&%t8MveBuK21uiYj)_a{Fnw0OErMzMN?d$QoPwkhOwcP&p+t>P)4tHlYw-pPN z^oJ=uc$Sl>pv@fZH~ZqxSvdhF@F1s=oZawpr^-#l{IIOGG=T%QXjtwPhIg-F@k@uIlr?J->Ia zpEUQ*=4g|XYn4Gez&aHr*;t$u3oODPmc2Ku)2Og|xjc%w;q!Zz+zY)*3{7V8bK4;& zYV82FZ+8?v)`J|G1w4I0fWdKg|2b#iaazCv;|?(W-q}$o&Y}Q5d@BRk^jL7#{kbCK zSgkyu;=DV+or2)AxCBgq-nj5=@n^`%T#V+xBGEkW4lCqrE)LMv#f;AvD__cQ@Eg3`~x| zW+h9mofSXCq5|M)9|ez(#X?-sxB%Go8};sJ?2abp(Y!lyi>k)|{M*Z$c{e1-K4ky` MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/src/client/web/index.html b/src/client/web/index.html new file mode 100644 index 0000000..f999f1f --- /dev/null +++ b/src/client/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + client + + + + + + diff --git a/src/client/web/manifest.json b/src/client/web/manifest.json new file mode 100644 index 0000000..554b75e --- /dev/null +++ b/src/client/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "client", + "short_name": "client", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/src/client/windows/.gitignore b/src/client/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/src/client/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/src/client/windows/CMakeLists.txt b/src/client/windows/CMakeLists.txt new file mode 100644 index 0000000..c56e824 --- /dev/null +++ b/src/client/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(client LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "client") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/src/client/windows/flutter/CMakeLists.txt b/src/client/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/src/client/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/src/client/windows/flutter/generated_plugin_registrant.cc b/src/client/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..8b6d468 --- /dev/null +++ b/src/client/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/src/client/windows/flutter/generated_plugin_registrant.h b/src/client/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/src/client/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/src/client/windows/flutter/generated_plugins.cmake b/src/client/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..b93c4c3 --- /dev/null +++ b/src/client/windows/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/src/client/windows/runner/CMakeLists.txt b/src/client/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/src/client/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/src/client/windows/runner/Runner.rc b/src/client/windows/runner/Runner.rc new file mode 100644 index 0000000..00295fa --- /dev/null +++ b/src/client/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "client" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "client" "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "client.exe" "\0" + VALUE "ProductName", "client" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/src/client/windows/runner/flutter_window.cpp b/src/client/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/src/client/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/src/client/windows/runner/flutter_window.h b/src/client/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/src/client/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/src/client/windows/runner/main.cpp b/src/client/windows/runner/main.cpp new file mode 100644 index 0000000..01431dd --- /dev/null +++ b/src/client/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"client", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/src/client/windows/runner/resource.h b/src/client/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/src/client/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/client/windows/runner/resources/app_icon.ico b/src/client/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/src/client/windows/runner/runner.exe.manifest b/src/client/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/src/client/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/src/client/windows/runner/utils.cpp b/src/client/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/src/client/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + unsigned int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/src/client/windows/runner/utils.h b/src/client/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/src/client/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/src/client/windows/runner/win32_window.cpp b/src/client/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/src/client/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/src/client/windows/runner/win32_window.h b/src/client/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/src/client/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_