fix turf mod bug and migrate sync to service

sharedstreets · Feb 25, 2021 · e70ba9f · e70ba9f
1 parent 61952a0
commit e70ba9f
Show file tree

Hide file tree

Showing 13 changed files with 355 additions and 266 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -31,9 +31,9 @@ PODS:
     - MTBBarcodeScanner
   - shared_preferences (0.0.1):
     - Flutter
-  - sqflite (0.0.1):
+  - sqflite (0.0.2):
     - Flutter
-    - FMDB (~> 2.7.2)
+    - FMDB (>= 2.7.5)
 
 DEPENDENCIES:
   - camera (from `.symlinks/plugins/camera/ios`)
@@ -90,7 +90,7 @@ SPEC CHECKSUMS:
   Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
-  sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0
+  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
 
 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
 

diff --git a/lib/database/database.dart b/lib/database/database.dart
@@ -88,8 +88,8 @@ class FeatureTypes extends Table {
   TextColumn get projectId => text()();
   TextColumn get geometryType => text()(); // 'point' or 'line'
   TextColumn get color => text()(); // string of color hex code
-  TextColumn get name => text()(); // label to be displayed in app
   TextColumn get label => text()(); // label to be displayed in app
+  TextColumn get value => text()(); // value to use in export feed
 
   @override
   Set<Column> get primaryKey => {id};
@@ -199,7 +199,7 @@ class CurbWheelDatabase extends _$CurbWheelDatabase {
               geometryType: surveyItem.feature.geometryType,
               featureId: surveyItem.feature.id,
               color: surveyItem.feature.color,
-              name: surveyItem.feature.name,
+              name: surveyItem.feature.label,
               span: span[0],
               points: points);
           return listItem;
@@ -210,7 +210,7 @@ class CurbWheelDatabase extends _$CurbWheelDatabase {
               geometryType: surveyItem.feature.geometryType,
               featureId: surveyItem.feature.id,
               color: surveyItem.feature.color,
-              name: surveyItem.feature.name,
+              name: surveyItem.feature.label,
               points: points);
           return listItem;
         }

diff --git a/lib/database/database.g.dart b/lib/database/database.g.dart
diff --git a/lib/database/survey_span_dao.dart b/lib/database/survey_span_dao.dart
@@ -16,7 +16,8 @@ class SurveySpanDao extends DatabaseAccessor<CurbWheelDatabase>
       (select(surveySpans)..where((s) => s.id.equals(id))).getSingle();
 
   Future<List<SurveySpan>> getSpansBySurveyItemId(String surveyItemId) =>
-      select(surveySpans).get();
+      (select(surveySpans)..where((s) => s.surveyItemId.equals(surveyItemId)))
+          .get();
 
   Future insertSpan(SurveySpansCompanion surveySpan) =>
       into(surveySpans).insert(surveySpan);

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,3 +1,4 @@
+import 'package:curbwheel/service/sync.dart';
 import 'package:curbwheel/ui/camera/camera_screen.dart';
 import 'package:curbwheel/ui/camera/gallery_screen.dart';
 import 'package:curbwheel/ui/camera/image_view_screen.dart';
@@ -18,6 +19,8 @@ import 'database/database.dart';
 void main() => runApp(MultiProvider(providers: [
       Provider<CurbWheelDatabase>(create: (_) => CurbWheelDatabase()),
       Provider<ProjectMapDatastores>(create: (_) => ProjectMapDatastores()),
+      ChangeNotifierProvider(
+          create: (BuildContext context) => ProjectSyncService(context)),
       ChangeNotifierProvider(create: (BuildContext context) => BleConnection()),
       ChangeNotifierProxyProvider<BleConnection, WheelCounter>(
         create: (BuildContext context) => WheelCounter(),